Move to /usr prefix.

- This is much more standard and replaces /image in sysa and is the standard in sysc (avoids many issues). - GCC needs to have a file created for some unknown reason. - Checksums updated.
2026-03-17 00:35:25 +01:00 · 2021-07-26 15:25:15 +10:00 · 2021-07-26 15:25:15 +10:00 · b93a931a53
commit b93a931a53
parent ddd4f1bc81
104 changed files with 659 additions and 722 deletions
--- a/sysa/after.kaem
+++ b/sysa/after.kaem
@ -12,7 +12,7 @@ PATH=/bin

 # Set commonly used variables
 sources=/after
-prefix=/image
+prefix=/usr
 bindir=${prefix}/bin
 libdir=${prefix}/lib
 incdir=${prefix}/include
@ -23,8 +23,7 @@ NYACC_PKG=nyacc-1.00.2
 MES_PKG=mes
 MES_PREFIX=${sources}/${MES_PKG}/src/mes-m2-a7522f26ee020dc498219d0122ea1b7d345bcdd5
 GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sources}/${MES_PKG}/src/${NYACC_PKG}/module
-
-mkdir ${bindir} ${libdir} ${incdir} ${tmpdir}
+mkdir ${prefix} ${bindir} ${libdir} ${incdir} ${tmpdir}
 cd ${prefix}

 # Remove remaining dependencies on /bin (stage0-posix directory)
@ -33,15 +32,14 @@ cp /bin/catm bin/catm
 cp /bin/chmod bin/chmod
 cp /bin/get_machine bin/get_machine
 cp /bin/hex2 bin/hex2
-cp /bin/kaem bin/kaem
+cp /bin/kaem ${bindir}/kaem
 cp /bin/M1 bin/M1
 cp /bin/M2-Planet bin/M2-Planet
 cp /bin/mkdir bin/mkdir
 cp /bin/sha256sum bin/sha256sum
 cp /bin/ungz bin/ungz
 cp /bin/untar bin/untar
-
-cp /bin/cp ${prefix}/bin/cp
+cp /bin/cp bin/cp

 chmod 755 bin/blood-elf
 chmod 755 bin/catm
@ -57,7 +55,7 @@ chmod 755 bin/sha256sum
 chmod 755 bin/ungz
 chmod 755 bin/untar

-PATH=${prefix}/bin
+PATH=${bindir}

 cd ${sources}

--- a/sysa/automake-1.16.3/automake-1.16.3.sh
+++ b/sysa/automake-1.16.3/automake-1.16.3.sh
@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    ./bootstrap
-
-    rm doc/automake-history.info doc/automake.info*
-}
-
-src_configure() {
-    ./configure --prefix="${PREFIX}"
-}
-
-src_compile() {
-    make MAKEINFO=true
-}
-
-src_install() {
-    make install MAKEINFO=true DESTDIR="${DESTDIR}"
-}
--- a/sysa/bash-2.05b/checksums
+++ b/sysa/bash-2.05b/checksums
@ -1 +1 @@
-af075793e3992c4da992814641e92f8dd5e7d0454f1ace58bcd6ed54fb86cfa9  /image/bin/bash
+4605c6f97ea53889b5b7bbdebbd8209f29142f1c8ec25c759ef8500b0501ca5e  /usr/bin/bash
--- a/sysa/binutils-2.14/checksums
+++ b/sysa/binutils-2.14/checksums
@ -1,19 +1,19 @@
-a64dd48319724c048a7523b030068b6d82d231c9e993e936b9dda784bc59287d  /image/bin/ar
-396a7acf5eb4c4a52acb61671979c3d7f3168e05498684a6a4e933e96776929d  /image/bin/as
-3898cc265c6818f65e1ce84eb555d2b67e5ea68c717f08e216f22fa7b53d1304  /image/bin/c++filt
-a79a4a95e394e5521fe8ba426c1d9ffb7965f20767a7a25123072fc1056ffc4c  /image/bin/gprof
-8e8c53332d444c4810631a0a304118878eacb1fd730aa978ef24d81a72cfa723  /image/bin/ld
-b1d0920558097413c45da60ac2e7210b8eaf97090d28211593b929a8e8ac56b7  /image/bin/nm
-3816b868f47e1812b50c2a887ff8fbebcf51eb143f78e79427750b097d1c6360  /image/bin/objcopy
-5ae33d450c5f9b993b979ff298ffd57b20cb316e21c16dfbca473dcc1a3dac24  /image/bin/objdump
-e49bba1ea6a61fb90f754e8de4692ed0810e7c68429f0b22fbf37670607a7807  /image/bin/od
-f909e690a1256861252c389a978e7561bba317415ae0805735a12ee1a92c16c2  /image/bin/ranlib
-e8dbc4ff1642541d0789a3accbe52c7b71888cd85ec9a9e82f50dc0b6bf8346f  /image/bin/readelf
-c61846e74119fd105684cdcbc2f5e31aa47cf090dfe6bf4d1ba6101e75f5fe8c  /image/bin/size
-d26d4b1fc92dbd16da852598caee35981283b52a00c0a9df5dadf3f91c75d2de  /image/bin/strings
-015587bd00f9451a58e1fb26e38e52ab08e016da44e577276045742a1be76d71  /image/bin/strip
-a5d224d76b8604550917b0c5e17473054b175a0dc9ecd7055a4522ab3a06f2a1  /image/lib/musl/libbfd.a
-4e2bb9a8d3c4b377112f1299b1954764e5db63b83586a95d072ffd5e2efb45ae  /image/lib/musl/libbfd.la
-2d1dba5dd076ebf57c68e4a7ae759d4ba50ca34d4f2731c6cfec914cfa923a44  /image/lib/musl/libiberty.a
-cf374d1cb063913333f586b1b51f865671e5527a9991db022739d2b9fe47a0f7  /image/lib/musl/libopcodes.a
-8f1fd8389fe5e28d20d91c50fd10ae210afe5730a8ae39d0cec600aca1fe614a  /image/lib/musl/libopcodes.la
+85de1f0626450cf9002855c06be0e0da6bb55989f370e7ebd2054449bf53a0df  /usr/bin/ar
+e1949d4d9fad1330bd0db1185aed915c4261d81f59d825208b77cfc7ef53a5d9  /usr/bin/as
+eb43f2a231a680bd8a41baaa766b23fdc98c33359b18271708b61dba12b39575  /usr/bin/c++filt
+54136ec4a3e957639e26b443acdda6a1b41da511ac44e8126c429b5be8b3137c  /usr/bin/gprof
+a2f6c731542c5bbe554d369661be33f37d5017c2145d6848f33e43d80604ae93  /usr/bin/ld
+00d840cd3b0d5a4ec5a577b0ccd796ba42e569117f9827bcdbc388dcd2c04169  /usr/bin/nm
+893f9742bc2002c8175f33cdb9fb1e963faef74196bd68d9239f1de2b0211927  /usr/bin/objcopy
+997747e8321155d96a090f56f85aea1ef456c5f58d0a5f38a6a7021bfaea2379  /usr/bin/objdump
+e49bba1ea6a61fb90f754e8de4692ed0810e7c68429f0b22fbf37670607a7807  /usr/bin/od
+06e5089e14fa1b5413892b0f4ecc6fb9734ba0f59f6ba9506877d31b1c4ac653  /usr/bin/ranlib
+a24dd433dfad44c3045b512d8e4170e2fec309bbf66ddd6ac501709749d19920  /usr/bin/readelf
+ca55356ddddd58ac146a5073f114019354eccbfb761fd800265717c986b57d87  /usr/bin/size
+856a22fda1db00fb3ab785fd7255ba5e1d3389ae691327304ded03f19bb1af9e  /usr/bin/strings
+66a92ba55f92b3db2b1229ced0144192ac4f3b36ba3d4fd0a2011c2fbd8127a2  /usr/bin/strip
+97ed2674127a3ff1201ee2b69bcd336a3e7f9396b58f0264d6cd6f08e3908e43  /usr/lib/musl/libbfd.a
+e1636c430ebe933462df742d9eec18e0e8ba73dafde763429a6b63ff70612afc  /usr/lib/musl/libbfd.la
+8bfe163be82996810f105bcd158f9a207c61438db7a7c58306cfd80f2462c35a  /usr/lib/musl/libiberty.a
+d39bbca00ea43af8a80d0b3f7e2aaabee1e571dd976d17ded01c5972fb5b4ff8  /usr/lib/musl/libopcodes.a
+3cb39a86c59f72affc6defe90d4e3c585ffedeb47a8f9bfc015be9b85a04ff7a  /usr/lib/musl/libopcodes.la
--- a/sysa/bison-3.4.1/checksums/stage1
+++ b/sysa/bison-3.4.1/checksums/stage1
@ -1 +1 @@
-375c28f9c28072578cf423cb7e090a083beb142759ab5ea2e22a6f8c196e23c6  /image/bin/bison
+bf1386d70d56dd169e97bdeaa6282592de830d0e262db59de0451adfd0f9125b  /usr/bin/bison
--- a/sysa/bison-3.4.1/checksums/stage2
+++ b/sysa/bison-3.4.1/checksums/stage2
@ -1 +1 @@
-6045f624843821108ebaf808e7e6abebb17a7353562e41c2514422035b8bd7c7  /image/bin/bison
+253ee303e001ee8faa25066e8259595e5dd85209aa1ec947c58a6880d7d86e1b  /usr/bin/bison
--- a/sysa/bison-3.4.1/checksums/stage3
+++ b/sysa/bison-3.4.1/checksums/stage3
@ -1 +1 @@
-48f41785497a059ae4a565161f4b7226016055803a7c19bbe7600c67d3085550  /image/bin/bison
+dd14d6c43beb638a389e91d967589b193d0faf80572db044464440835f1040c6  /usr/bin/bison
--- a/sysa/bison-3.4.1/files/config.h
+++ b/sysa/bison-3.4.1/files/config.h
@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2020 Andrius Štikonas <andrius@stikonas.eu>
+// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 // SPDX-License-Identifier: GPL-3.0-or-later

@ -9,7 +10,7 @@
 #define HAVE_SNPRINTF 1
 #define HAVE_STDINT_H 1
 #define HAVE_UNISTD_H 1
-#define M4 "/image/bin/m4"
+#define M4 "/usr/bin/m4"
 #define M4_GNU_OPTION ""
 #define PACKAGE "bison"
 #define PACKAGE_BUGREPORT "bug-bison@gnu.org"
--- a/sysa/bison-3.4.1/files/configmake.h
+++ b/sysa/bison-3.4.1/files/configmake.h
@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2020 Andrius Štikonas <andrius@stikonas.eu>
+// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 // SPDX-License-Identifier: GPL-3.0-or-later

-#define LOCALEDIR "/image/share/locale"
-#define PKGDATADIR "/image/share/bison"
+#define LOCALEDIR "/usr/share/locale"
+#define PKGDATADIR "/usr/share/bison"
--- a/sysa/bzip2-1.0.8/checksums/bzip2-pass1
+++ b/sysa/bzip2-1.0.8/checksums/bzip2-pass1
@ -1 +1 @@
-053a7c3080ab19303bc6610ee6d7af2acd69c19d7d74554cfa3d912fa7feb537  /image/bin/bzip2
+6e93edb69a8089d5f0bd20ac29acf2ed1454c0bcb97e9aed085757b02f0f3756  /usr/bin/bzip2
--- a/sysa/bzip2-1.0.8/checksums/bzip2-pass2
+++ b/sysa/bzip2-1.0.8/checksums/bzip2-pass2
@ -1 +1 @@
-9bf6c960e7862cbe451e07fc80fc63b802962d981d39842c84ee133dc441bf08  /image/bin/bzip2
+9275f8bbefcb9ac683663c9eeaf575f1fe8c2a354de69791a039164807c1a436  /usr/bin/bzip2
--- a/sysa/coreutils-5.0/checksums/pass1
+++ b/sysa/coreutils-5.0/checksums/pass1
@ -1,54 +1,54 @@
-113a08baeaaaafd87295806756a5b5eee73a55347e86b4930e01c15d7220f74b  /image/bin/install
-f6dd08d95b1ecdd32c7804afa226d734fb4efbe54e67532023deb3a95df2899d  /image/bin/basename
-8bf26dadc87990c5ec5fe6551145049d52ded48640ce7ac47b05b458ff870cfa  /image/bin/cat
-3cfdf2a0f1db912f1daa3015ceb99689f51970196c85a049a3e098bd96271b20  /image/bin/chmod
-994197dd07610b44608b388242c70adb9ec49bb2a643dcfdfb1e105529c2e379  /image/bin/cksum
-78c1187c2ce90fe24acc739eeb159363de70e06e239bac3ea096ee1cf3f9d273  /image/bin/cp
-a09aeffc07c868076aa034fd1650f8faca703379aa31d5b5fd911adf98901c82  /image/bin/csplit
-e3149e91b206a83b4e7341b5df6ddefddfe04be4b9859642b23e2ee684de0e2d  /image/bin/cut
-39713a15ea9b4a46d01f8d0a2ca99fe83acab34980442cf4e26d0c495e63acd3  /image/bin/echo
-b9b229f0cfe7c2077c7f1ce30b91d07ae02794bb52520367053e4c5dae815617  /image/bin/expand
-79f91e16249f8f595fb4dd68a05413c8f28bd3a15f25ed07d602b504f745b33f  /image/bin/factor
-a7071f0800ed49164535244ac82e6288ca7f4c9ef119ce722e809c965feba43e  /image/bin/false
-c7c581160a28eaea971e1333b19e07b81e98897a251f05f8fe5fd1fd2c89ad2a  /image/bin/fmt
-bfdeeba7192725dc6f5b4084f73e42d518a05900af05a062b4862fcb3b7a5a0d  /image/bin/fold
-b914fce359292bd4134af0d0086c4d5920a6482e784c60483c60daa86ba3e2ca  /image/bin/head
-142cd716a75921fc3d4f824c75515147f12b53e83f0a89a09f17aaaeaa9b1543  /image/bin/id
-890bd5186317a1da5309881ad12426e45144b059436b7045a18ab670ac34585b  /image/bin/join
-c8d87edb84146d2c536be5cea326b5fe456eb9fb39511f535312e52577d1c229  /image/bin/kill
-5c827dc96610836ec41ced32fdff18584dfa7380431cf5f99960effcec16b6da  /image/bin/link
-75da5a77d612a6c9ab2c63f52e0c53613917b46f243a6ca78a15edc1ab2322d2  /image/bin/ln
-e74bc32191c7f53b659c7b1937d9799e7e56a71f0d68a00a085df99d900ac71a  /image/bin/logname
-fc1b745d7b10d84445fe6f4a42cb1893827f13029eb5ba93568c4668182ef0c3  /image/bin/mkfifo
-2aaba60b28b63c8fe0199202a364327bb235fb628424c70d85ddf1b011a603b9  /image/bin/mkdir
-541dfb8cddfc66fe7e2628012c6557d34eb071312af6ad9178c14ab374970ea0  /image/bin/mknod
-95cf6269ae7608960bf1eb1062cd8f1f9981534b8e66449c3076c2b270f02970  /image/bin/nl
-82109de6321e241128763333ba7e32db91d6fd07124dd3198fdd80f5c8679cf5  /image/bin/od
-89537a3ff8d001059b2875e49b02e64f5cc9e70ee0053b1407c9e13a949097cf  /image/bin/paste
-876bf7b6743fb7a8b9967f9f8ae0ce7deabe9a109b5d8655e2042435c8dc9141  /image/bin/pathchk
-249eb2c58d2e82bc38a008c3fa6da4ece2c56f198396901ffb4667cd55bd6d29  /image/bin/printf
-0c7b355b1b81093b740efd5afdec417f1902edb3c4c7335320ad371aa67e66a5  /image/bin/ptx
-a5a7d59c3daddcd12a5a1f69710f970fba40f319baa6e8a2d7ee6da55936d046  /image/bin/pwd
-bb5be58fc44331fedc405f28d6bf9014105376db48ab6921de4468c26868b0cd  /image/bin/readlink
-cf83e7cf46b52440d593d08c03859bf2354affd3d184d4975fb4d1ba0a9b5260  /image/bin/rmdir
-ed0e8f05df2f9a757a783a783d4d5efc4fc85d5f5ade8b61b6c32bd64047eaaf  /image/bin/seq
-3a839fe7e32dff6a2597390660beb10ee15eabd2d1fe4531a58eed035fa0db5f  /image/bin/sleep
-978bab078ddc398c8617697143265b5c0791d74730895243e11f30f208389095  /image/bin/split
-ee8532ca989f75ec263121c20f13474ad73aafa503bb2ae2f785708b0244c329  /image/bin/sum
-40d71b38897a5ceacd45a4c49a2d84dab4d175fff4e7fcf98785c31d2ec715f2  /image/bin/tail
-cb8ff79e7566d6fbfe0c5d384163585306a9ef7e9e525fea0bf0c8a5c2af8238  /image/bin/tee
-6ab10d4a009e2b134c7e854f2561da93d74b95701d538659284d5035bc88ff89  /image/bin/tr
-062e387534cc7661b11346524f84e38f5e64a4326819377b9bc3aa675fb6a409  /image/bin/tsort
-07103fb0d194c01576894c800eecc3be9588103e93c6e8b9c0e6063fb9dde5af  /image/bin/unexpand
-054c7b8ef262065dc965b885baa858602165609322196515a6e9415b0f9a21e5  /image/bin/unlink
-545d17edd4994ab9d405b27b0ebd5d9ef1e3d4c1c172bc5c47112a740ce88e15  /image/bin/wc
-9464990ed84759efab8bc3b5b67cf6f77c03ccf988bbe6e571a12ea3d6b01cd9  /image/bin/whoami
-060e30b58112feba89aa3b90506d7c8f532837ab339b45f351ebe4a39aa36049  /image/bin/test
-0d1e615de04e3d99b5cfd9b86eac332113227eb87707e025748ddde134720596  /image/bin/touch
-af3a6577c63e79cd2bbabd3c966790ef006c2d5d2584573ba91667d45f80fec3  /image/bin/true
-0321a3302b2883914612d9e3dad00e5f338e5c9541651ef293bb38503a9ae39c  /image/bin/yes
-84dd2d7cb8216eceaa3d53886832034c1b68f174239fe51adb68e2ec45901610  /image/bin/ls
-acb87cf7d9c1be94dde273bf3f9ab21115ff86a1cc783963dd7571729c4a82e8  /image/bin/md5sum
-039aa7005ce1280641e9828ea407e1e80994176a5c546d3bc6f88fd8d34f79c5  /image/bin/mv
-ba5655e1ae7be5b5655513b19d03d385840c707528bd0baa907dc2b117d35d97  /image/bin/rm
-330d475015d0d78af61789f44d636b14082d64a64dd7faf481677c014fb5a606  /image/bin/sha1sum
+113a08baeaaaafd87295806756a5b5eee73a55347e86b4930e01c15d7220f74b  /usr/bin/install
+f6dd08d95b1ecdd32c7804afa226d734fb4efbe54e67532023deb3a95df2899d  /usr/bin/basename
+8bf26dadc87990c5ec5fe6551145049d52ded48640ce7ac47b05b458ff870cfa  /usr/bin/cat
+3cfdf2a0f1db912f1daa3015ceb99689f51970196c85a049a3e098bd96271b20  /usr/bin/chmod
+994197dd07610b44608b388242c70adb9ec49bb2a643dcfdfb1e105529c2e379  /usr/bin/cksum
+78c1187c2ce90fe24acc739eeb159363de70e06e239bac3ea096ee1cf3f9d273  /usr/bin/cp
+a09aeffc07c868076aa034fd1650f8faca703379aa31d5b5fd911adf98901c82  /usr/bin/csplit
+e3149e91b206a83b4e7341b5df6ddefddfe04be4b9859642b23e2ee684de0e2d  /usr/bin/cut
+39713a15ea9b4a46d01f8d0a2ca99fe83acab34980442cf4e26d0c495e63acd3  /usr/bin/echo
+b9b229f0cfe7c2077c7f1ce30b91d07ae02794bb52520367053e4c5dae815617  /usr/bin/expand
+79f91e16249f8f595fb4dd68a05413c8f28bd3a15f25ed07d602b504f745b33f  /usr/bin/factor
+a7071f0800ed49164535244ac82e6288ca7f4c9ef119ce722e809c965feba43e  /usr/bin/false
+c7c581160a28eaea971e1333b19e07b81e98897a251f05f8fe5fd1fd2c89ad2a  /usr/bin/fmt
+bfdeeba7192725dc6f5b4084f73e42d518a05900af05a062b4862fcb3b7a5a0d  /usr/bin/fold
+b914fce359292bd4134af0d0086c4d5920a6482e784c60483c60daa86ba3e2ca  /usr/bin/head
+142cd716a75921fc3d4f824c75515147f12b53e83f0a89a09f17aaaeaa9b1543  /usr/bin/id
+890bd5186317a1da5309881ad12426e45144b059436b7045a18ab670ac34585b  /usr/bin/join
+c8d87edb84146d2c536be5cea326b5fe456eb9fb39511f535312e52577d1c229  /usr/bin/kill
+5c827dc96610836ec41ced32fdff18584dfa7380431cf5f99960effcec16b6da  /usr/bin/link
+75da5a77d612a6c9ab2c63f52e0c53613917b46f243a6ca78a15edc1ab2322d2  /usr/bin/ln
+e74bc32191c7f53b659c7b1937d9799e7e56a71f0d68a00a085df99d900ac71a  /usr/bin/logname
+fc1b745d7b10d84445fe6f4a42cb1893827f13029eb5ba93568c4668182ef0c3  /usr/bin/mkfifo
+2aaba60b28b63c8fe0199202a364327bb235fb628424c70d85ddf1b011a603b9  /usr/bin/mkdir
+541dfb8cddfc66fe7e2628012c6557d34eb071312af6ad9178c14ab374970ea0  /usr/bin/mknod
+95cf6269ae7608960bf1eb1062cd8f1f9981534b8e66449c3076c2b270f02970  /usr/bin/nl
+82109de6321e241128763333ba7e32db91d6fd07124dd3198fdd80f5c8679cf5  /usr/bin/od
+89537a3ff8d001059b2875e49b02e64f5cc9e70ee0053b1407c9e13a949097cf  /usr/bin/paste
+876bf7b6743fb7a8b9967f9f8ae0ce7deabe9a109b5d8655e2042435c8dc9141  /usr/bin/pathchk
+0eb7a6d22a2a1daccd547e4f61090bf7a19ed63a3aec64076d9b6b14ad5ac873  /usr/bin/printf
+0c7b355b1b81093b740efd5afdec417f1902edb3c4c7335320ad371aa67e66a5  /usr/bin/ptx
+a5a7d59c3daddcd12a5a1f69710f970fba40f319baa6e8a2d7ee6da55936d046  /usr/bin/pwd
+bb5be58fc44331fedc405f28d6bf9014105376db48ab6921de4468c26868b0cd  /usr/bin/readlink
+cf83e7cf46b52440d593d08c03859bf2354affd3d184d4975fb4d1ba0a9b5260  /usr/bin/rmdir
+ed0e8f05df2f9a757a783a783d4d5efc4fc85d5f5ade8b61b6c32bd64047eaaf  /usr/bin/seq
+3a839fe7e32dff6a2597390660beb10ee15eabd2d1fe4531a58eed035fa0db5f  /usr/bin/sleep
+978bab078ddc398c8617697143265b5c0791d74730895243e11f30f208389095  /usr/bin/split
+ee8532ca989f75ec263121c20f13474ad73aafa503bb2ae2f785708b0244c329  /usr/bin/sum
+40d71b38897a5ceacd45a4c49a2d84dab4d175fff4e7fcf98785c31d2ec715f2  /usr/bin/tail
+cb8ff79e7566d6fbfe0c5d384163585306a9ef7e9e525fea0bf0c8a5c2af8238  /usr/bin/tee
+6ab10d4a009e2b134c7e854f2561da93d74b95701d538659284d5035bc88ff89  /usr/bin/tr
+062e387534cc7661b11346524f84e38f5e64a4326819377b9bc3aa675fb6a409  /usr/bin/tsort
+07103fb0d194c01576894c800eecc3be9588103e93c6e8b9c0e6063fb9dde5af  /usr/bin/unexpand
+054c7b8ef262065dc965b885baa858602165609322196515a6e9415b0f9a21e5  /usr/bin/unlink
+545d17edd4994ab9d405b27b0ebd5d9ef1e3d4c1c172bc5c47112a740ce88e15  /usr/bin/wc
+9464990ed84759efab8bc3b5b67cf6f77c03ccf988bbe6e571a12ea3d6b01cd9  /usr/bin/whoami
+060e30b58112feba89aa3b90506d7c8f532837ab339b45f351ebe4a39aa36049  /usr/bin/test
+0d1e615de04e3d99b5cfd9b86eac332113227eb87707e025748ddde134720596  /usr/bin/touch
+af3a6577c63e79cd2bbabd3c966790ef006c2d5d2584573ba91667d45f80fec3  /usr/bin/true
+0321a3302b2883914612d9e3dad00e5f338e5c9541651ef293bb38503a9ae39c  /usr/bin/yes
+84dd2d7cb8216eceaa3d53886832034c1b68f174239fe51adb68e2ec45901610  /usr/bin/ls
+acb87cf7d9c1be94dde273bf3f9ab21115ff86a1cc783963dd7571729c4a82e8  /usr/bin/md5sum
+039aa7005ce1280641e9828ea407e1e80994176a5c546d3bc6f88fd8d34f79c5  /usr/bin/mv
+ba5655e1ae7be5b5655513b19d03d385840c707528bd0baa907dc2b117d35d97  /usr/bin/rm
+330d475015d0d78af61789f44d636b14082d64a64dd7faf481677c014fb5a606  /usr/bin/sha1sum
--- a/sysa/coreutils-5.0/checksums/pass2
+++ b/sysa/coreutils-5.0/checksums/pass2
@ -1,60 +1,60 @@
-fafa676fe85f662f753bb5257ba6575086c6d4d7b8b27a952624db08e136b1ac  /image/bin/basename
-8b4e2b1ea346298b6534894e85cfa3ac4ee9bd1900da1d044a45c366d143dbf0  /image/bin/cat
-24b11f735c4dcbd28e0defcef6208f419ebb3a7f33a5f7addb41d7df9e021bc1  /image/bin/chmod
-8dd096b3a2973c4e3652e6bfffc30d2d85e8cb9b7f6cbbb2079cdb00a465589f  /image/bin/cksum
-6e9c29ae39dc9cc13925fe4066ab1867d0623bc704b2b1be6e242dc27b6c8ea1  /image/bin/cp
-220ee0e1e19ad52403794872fd879619c25e2bf6b22d9616799250f76f8b9960  /image/bin/csplit
-15eea66971190c390da91bd8537c01b689e1cf24cc96cd256607ef437f07f41d  /image/bin/cut
-567d079e9c0122410284414c0f2db2248e78686b403dabd9c7abd12c20ad9f89  /image/bin/dd
-c033f4ae4ca47c1ae267d9f983c35366f5bf803b53422a073fbdd60dd3c745a8  /image/bin/dirname
-0884b23703671535b882cffe99720d18f0f915b9323184dc20c0b7ef1af9ec4b  /image/bin/echo
-4bb7dca4382da61d02331c6785f254e04789e9a26e034fd4bbc40b969bdc81a5  /image/bin/env
-76932efb69bc33a101a0a72424fc9dd50036b5f3fa09101d2d776a2e8aad7f3d  /image/bin/expand
-aea616aaf5c8c63f564a77d4469cbc49088531920dc927db24c70e8c5872c97b  /image/bin/expr
-6e082caf5494d14d8e8eb0c8284942389198ac0fff8646c08b3136039a8a1579  /image/bin/factor
-94132ca47c73ec70cc5f817a7d4c3de8ec37f7664564028c6daf27a1f2a75f37  /image/bin/false
-ee5f43940b667026f2152ccde76f8d09cb99eb8adbea29be782876d236ce3797  /image/bin/fmt
-5b4b347107c9eea9e984652ab9ebb8ed95a349a717fedc3e523195b69d7383ae  /image/bin/fold
-1b49cc4b6f706c6da74831223c57251298c494b09ebf0e513df9b6536cfa84ab  /image/bin/head
-c2af52d735a708ad30b7d493c19e2ef8a059bfc617af26a1e877077c7a25bf58  /image/bin/id
-3e9b0e09d1da2ce9f6a2d0f212f6211e9ff53767a60f5fac040488da97da43b7  /image/bin/join
-3aa7096a22e4056c7ae5329e71965a6e1f5eeb10c471cffd4b86f9de91684588  /image/bin/kill
-f6d99b9010578b4e3112c70131083c27bfcf731862b021df2995fd5738c52b99  /image/bin/link
-ae6e4cdad0a792a72674c487f3874f356a49a25d0d11ea0f9b2abdb466494a50  /image/bin/ln
-576ddcdde28a5d21b953976134f4b89dc0380e5ccfd8c9c489faf44db6d0506f  /image/bin/logname
-cc82a9771ebfc62a744b3b5f8b05d7fe86944ff0e02d1a20ac959421238e19e4  /image/bin/mkfifo
-20d933c6787e1edfe47c30601e713fd9e6199852c55bb7af608722516aaaf699  /image/bin/mkdir
-e173f74b72fcfc6b17ae0653a5a88fc36f6ce42bf99e70de4245701bf2a45a50  /image/bin/mknod
-f98ea6c094c9fda45204d228a58bc52ceba02a8bf6e778e855d434387a43e1cb  /image/bin/nl
-e49bba1ea6a61fb90f754e8de4692ed0810e7c68429f0b22fbf37670607a7807  /image/bin/od
-9ed0744237c4025a83ee4cc1d4fdf1135e6435899284c6e070b1ceb9b74e0203  /image/bin/paste
-8b03fcd11aba79282d571d1f8ac3ce8839051e3c059e1895cb05cf660901102b  /image/bin/pathchk
-fda53239b3172ffdcd7989a79dcde19ed27c393c4cc82ba85315ed1a872d2654  /image/bin/printf
-293e7a730d7f746731deb9614b3afab805a097f9acf917d53e44acc3acd9cb4b  /image/bin/ptx
-fa7ff4f943ca592c623e41a303e697114a420c0a3e5d91c779dfd57ab39b7053  /image/bin/pwd
-3550aefb0eee8a35b4aa46ac31322687e478cb0f03c833e6924e462963e2b0f5  /image/bin/readlink
-1543d06fdbe7fe2a28d6f2aa0a4d8ef69d4c06f6fe8ba605933fed51eda8c7fa  /image/bin/rmdir
-291f7fdd7d43fc55da4a50d7c7ba9945568b31602e74fbb3ab94a8b25a039595  /image/bin/seq
-4b7609bd5da6de314b418be80f1be1a525bb4756efb1e9925f0ae7814c6eedef  /image/bin/sleep
-c40dac27f90c5f793a1ed37e78bd1015e44688dc2179da209b1065d02ed0c6e3  /image/bin/sort
-5087a0f86f238062a85f2f6ca3e6b33ba6b3c8dd9700e314c1ae3b2af3331409  /image/bin/split
-533d8a75e4460e37714c50eed989a643dffe08e3ab4f7400b966f2241e28a60f  /image/bin/sync
-35f681f7cc31a895f5c5e0db8b6a3c203b2ed9ce1771503f198614302e42c600  /image/bin/sum
-7272d4fb3313ad3e19c79393d8785d4b343a915e605332eebbc8f5ac5338e071  /image/bin/tail
-c2c6fae2cad8e29a75ff3f793ca7d059cc50ea4ee7d55f659e8f2d371f7763d6  /image/bin/tee
-643d2912f2055e70284ab036d6d154e4667120726486c3a3329fdb5115b452f2  /image/bin/tr
-75d4e74c03ad027b1b7738e6049ec5c01cfdd7a665ec82e0ecdf921d440e71a0  /image/bin/tsort
-c7d92d8291578de76afa58f1a1160f3373b5935b6b6f1dca63bd0d3d210ea161  /image/bin/uname
-0a51c8f6dc3ea15fd439e11a14d7c13d7094457e17129e7f5de51d886ed8f54e  /image/bin/unexpand
-abda7abe33205cda90734216bd3f2cc1dcf859db166d2d6297665a4d178e6bac  /image/bin/unlink
-f033207cf5de1eac8f4726b1926a33759b294050090932a6f7de6a6d98a8f9e8  /image/bin/wc
-46f35124f00bcee7ec557406228da3abd04239be7b0ef0c10403139f1e0f0dd7  /image/bin/whoami
-b8942c4ecd012efd53b74a8c5fec424020a7099356c4db017115499016237876  /image/bin/test
-8bc7be81630efacca243feb8ecdaa97bc1d0b5a4060e0decf96af49875a06b00  /image/bin/true
-84109c279ed6445c896fe04a397bf66e1f73f74200f8e58477e828aad7e43c92  /image/bin/yes
-6c2c4baa6e75c00896b01ceb4e2f0ef62b59a7f27184ac1c5bf85f6da2983ae5  /image/bin/install
-0f5fe59d628457041d4cb66ba6dfa27dd25c959aa65298db914c2524c9927d52  /image/bin/ls
-3f43cf65e4ea8b713096607ce7b28c835dacaa0d18bb27fd664156b43b02639a  /image/bin/md5sum
-7fbafb8ac8aded995076404ea8c35392c3287a4ae92f7683baf445e321ba1a0c  /image/bin/mv
-5bb0d9ac5acc086b1bbcbd9c2f77f124efcc93e5802194a6aabce05c368b86c4  /image/bin/rm
-c086a3b03be0da5fb7ffc5d3d666b9b8a340bc74c9d7c208123c55887c371147  /image/bin/sha1sum
+fafa676fe85f662f753bb5257ba6575086c6d4d7b8b27a952624db08e136b1ac  /usr/bin/basename
+8b4e2b1ea346298b6534894e85cfa3ac4ee9bd1900da1d044a45c366d143dbf0  /usr/bin/cat
+24b11f735c4dcbd28e0defcef6208f419ebb3a7f33a5f7addb41d7df9e021bc1  /usr/bin/chmod
+8dd096b3a2973c4e3652e6bfffc30d2d85e8cb9b7f6cbbb2079cdb00a465589f  /usr/bin/cksum
+6e9c29ae39dc9cc13925fe4066ab1867d0623bc704b2b1be6e242dc27b6c8ea1  /usr/bin/cp
+220ee0e1e19ad52403794872fd879619c25e2bf6b22d9616799250f76f8b9960  /usr/bin/csplit
+15eea66971190c390da91bd8537c01b689e1cf24cc96cd256607ef437f07f41d  /usr/bin/cut
+567d079e9c0122410284414c0f2db2248e78686b403dabd9c7abd12c20ad9f89  /usr/bin/dd
+c033f4ae4ca47c1ae267d9f983c35366f5bf803b53422a073fbdd60dd3c745a8  /usr/bin/dirname
+0884b23703671535b882cffe99720d18f0f915b9323184dc20c0b7ef1af9ec4b  /usr/bin/echo
+4bb7dca4382da61d02331c6785f254e04789e9a26e034fd4bbc40b969bdc81a5  /usr/bin/env
+76932efb69bc33a101a0a72424fc9dd50036b5f3fa09101d2d776a2e8aad7f3d  /usr/bin/expand
+aea616aaf5c8c63f564a77d4469cbc49088531920dc927db24c70e8c5872c97b  /usr/bin/expr
+6e082caf5494d14d8e8eb0c8284942389198ac0fff8646c08b3136039a8a1579  /usr/bin/factor
+94132ca47c73ec70cc5f817a7d4c3de8ec37f7664564028c6daf27a1f2a75f37  /usr/bin/false
+ee5f43940b667026f2152ccde76f8d09cb99eb8adbea29be782876d236ce3797  /usr/bin/fmt
+5b4b347107c9eea9e984652ab9ebb8ed95a349a717fedc3e523195b69d7383ae  /usr/bin/fold
+1b49cc4b6f706c6da74831223c57251298c494b09ebf0e513df9b6536cfa84ab  /usr/bin/head
+c2af52d735a708ad30b7d493c19e2ef8a059bfc617af26a1e877077c7a25bf58  /usr/bin/id
+3e9b0e09d1da2ce9f6a2d0f212f6211e9ff53767a60f5fac040488da97da43b7  /usr/bin/join
+3aa7096a22e4056c7ae5329e71965a6e1f5eeb10c471cffd4b86f9de91684588  /usr/bin/kill
+f6d99b9010578b4e3112c70131083c27bfcf731862b021df2995fd5738c52b99  /usr/bin/link
+ae6e4cdad0a792a72674c487f3874f356a49a25d0d11ea0f9b2abdb466494a50  /usr/bin/ln
+576ddcdde28a5d21b953976134f4b89dc0380e5ccfd8c9c489faf44db6d0506f  /usr/bin/logname
+cc82a9771ebfc62a744b3b5f8b05d7fe86944ff0e02d1a20ac959421238e19e4  /usr/bin/mkfifo
+20d933c6787e1edfe47c30601e713fd9e6199852c55bb7af608722516aaaf699  /usr/bin/mkdir
+e173f74b72fcfc6b17ae0653a5a88fc36f6ce42bf99e70de4245701bf2a45a50  /usr/bin/mknod
+f98ea6c094c9fda45204d228a58bc52ceba02a8bf6e778e855d434387a43e1cb  /usr/bin/nl
+e49bba1ea6a61fb90f754e8de4692ed0810e7c68429f0b22fbf37670607a7807  /usr/bin/od
+9ed0744237c4025a83ee4cc1d4fdf1135e6435899284c6e070b1ceb9b74e0203  /usr/bin/paste
+8b03fcd11aba79282d571d1f8ac3ce8839051e3c059e1895cb05cf660901102b  /usr/bin/pathchk
+39c2d96e779d76562fcee782d82488310fa2c4daaaa54b1811f41ac1879d3009  /usr/bin/printf
+293e7a730d7f746731deb9614b3afab805a097f9acf917d53e44acc3acd9cb4b  /usr/bin/ptx
+fa7ff4f943ca592c623e41a303e697114a420c0a3e5d91c779dfd57ab39b7053  /usr/bin/pwd
+3550aefb0eee8a35b4aa46ac31322687e478cb0f03c833e6924e462963e2b0f5  /usr/bin/readlink
+1543d06fdbe7fe2a28d6f2aa0a4d8ef69d4c06f6fe8ba605933fed51eda8c7fa  /usr/bin/rmdir
+291f7fdd7d43fc55da4a50d7c7ba9945568b31602e74fbb3ab94a8b25a039595  /usr/bin/seq
+4b7609bd5da6de314b418be80f1be1a525bb4756efb1e9925f0ae7814c6eedef  /usr/bin/sleep
+c40dac27f90c5f793a1ed37e78bd1015e44688dc2179da209b1065d02ed0c6e3  /usr/bin/sort
+5087a0f86f238062a85f2f6ca3e6b33ba6b3c8dd9700e314c1ae3b2af3331409  /usr/bin/split
+533d8a75e4460e37714c50eed989a643dffe08e3ab4f7400b966f2241e28a60f  /usr/bin/sync
+35f681f7cc31a895f5c5e0db8b6a3c203b2ed9ce1771503f198614302e42c600  /usr/bin/sum
+7272d4fb3313ad3e19c79393d8785d4b343a915e605332eebbc8f5ac5338e071  /usr/bin/tail
+c2c6fae2cad8e29a75ff3f793ca7d059cc50ea4ee7d55f659e8f2d371f7763d6  /usr/bin/tee
+643d2912f2055e70284ab036d6d154e4667120726486c3a3329fdb5115b452f2  /usr/bin/tr
+75d4e74c03ad027b1b7738e6049ec5c01cfdd7a665ec82e0ecdf921d440e71a0  /usr/bin/tsort
+c7d92d8291578de76afa58f1a1160f3373b5935b6b6f1dca63bd0d3d210ea161  /usr/bin/uname
+0a51c8f6dc3ea15fd439e11a14d7c13d7094457e17129e7f5de51d886ed8f54e  /usr/bin/unexpand
+abda7abe33205cda90734216bd3f2cc1dcf859db166d2d6297665a4d178e6bac  /usr/bin/unlink
+f033207cf5de1eac8f4726b1926a33759b294050090932a6f7de6a6d98a8f9e8  /usr/bin/wc
+46f35124f00bcee7ec557406228da3abd04239be7b0ef0c10403139f1e0f0dd7  /usr/bin/whoami
+b8942c4ecd012efd53b74a8c5fec424020a7099356c4db017115499016237876  /usr/bin/test
+8bc7be81630efacca243feb8ecdaa97bc1d0b5a4060e0decf96af49875a06b00  /usr/bin/true
+84109c279ed6445c896fe04a397bf66e1f73f74200f8e58477e828aad7e43c92  /usr/bin/yes
+6c2c4baa6e75c00896b01ceb4e2f0ef62b59a7f27184ac1c5bf85f6da2983ae5  /usr/bin/install
+0f5fe59d628457041d4cb66ba6dfa27dd25c959aa65298db914c2524c9927d52  /usr/bin/ls
+3f43cf65e4ea8b713096607ce7b28c835dacaa0d18bb27fd664156b43b02639a  /usr/bin/md5sum
+7fbafb8ac8aded995076404ea8c35392c3287a4ae92f7683baf445e321ba1a0c  /usr/bin/mv
+5bb0d9ac5acc086b1bbcbd9c2f77f124efcc93e5802194a6aabce05c368b86c4  /usr/bin/rm
+c086a3b03be0da5fb7ffc5d3d666b9b8a340bc74c9d7c208123c55887c371147  /usr/bin/sha1sum
--- a/sysa/coreutils-6.10/checksums
+++ b/sysa/coreutils-6.10/checksums
@ -1,3 +1,3 @@
-98124acfaf5cd8c1795d9557455607fb157a514867de5b908a9a3c8d00d88717  /image/bin/date
-fe8a8a6d39e35ca2d980ac0dfb57204f34c34aa2ec543bc15f93ff80bcbbd38a  /image/bin/mktemp
-40289b9aae91f72a7d44bbc93616dcf2397b60d2532b549d053f3ce9b1040119  /image/bin/sha256sum
+98124acfaf5cd8c1795d9557455607fb157a514867de5b908a9a3c8d00d88717  /usr/bin/date
+fe8a8a6d39e35ca2d980ac0dfb57204f34c34aa2ec543bc15f93ff80bcbbd38a  /usr/bin/mktemp
+40289b9aae91f72a7d44bbc93616dcf2397b60d2532b549d053f3ce9b1040119  /usr/bin/sha256sum
--- a/sysa/coreutils-6.10/mk/main.mk
+++ b/sysa/coreutils-6.10/mk/main.mk
@ -1,5 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

@ -48,7 +49,7 @@ CFLAGS  = -I . -I lib \
          -DHAVE_LOCALE_H=1 \
          -DTIME_WITH_SYS_TIME=1 \
          -DHAVE_STDINT_H=1 \
-          -DLIBDIR=\"/image/lib\" \
+          -DLIBDIR=\"/usr/lib\" \
          -DHAVE_DECL_WCWIDTH=0 \
          -DHAVE_SYS_STAT_H=1 \
          -DHAVE_INTTYPES_H=1 \
--- a/sysa/diffutils-2.7/checksums
+++ b/sysa/diffutils-2.7/checksums
@ -1,2 +1,2 @@
-c3d87abbcc66ac9db7c7c52c808632cefb1ed5b2c7a779f1f1413247e5e2677c  /image/bin/cmp
-3ebd884138bdec61da56ab063ec1ef8f1913fe8a7d2ef3a12c79fb25064a983c  /image/bin/diff
+c3d87abbcc66ac9db7c7c52c808632cefb1ed5b2c7a779f1f1413247e5e2677c  /usr/bin/cmp
+3ebd884138bdec61da56ab063ec1ef8f1913fe8a7d2ef3a12c79fb25064a983c  /usr/bin/diff
--- a/sysa/findutils-4.2.33/checksums
+++ b/sysa/findutils-4.2.33/checksums
@ -1,7 +1,7 @@
-588f6093f4fac94d2ae5f789e6dd13d369e53df59944886a4b7ff7c3338099a7  /image/bin/find
-4c9886d56b60643f2e24789b55dab3a144edb07b84f7a416e28545a79c28cbe2  /image/bin/locate
-f0af84f40d7bde1c44979b41f5a9f2bef81b6380f93f72aa155c1da5548392f6  /image/bin/updatedb
-4da0dc2bf7f5e595b232640086ba2dfb250becdf91ef024b5b58aa1d85690196  /image/bin/xargs
-2d9e79a71b1088b9e14db3bbf5863e1e6b3041db45f6e5d1fe92f521e8d6f47b  /image/libexec/bigram
-84af6726c9c28c2498d57f716e0f992530231b85e7371dee33271540424c0842  /image/libexec/code
-858f3de34c8f68e39f00b6ffd3117e71f769e59516a038fea8461b7ed778318a  /image/libexec/frcode
+5a7e6f477bbbf2389a810f8884b9788970e713cdbfe36bc0ecef3596717ad2ad  /usr/bin/find
+7e01af08333f7770de7fdafaa120730bb4daca68521df8fa543bae60b71f1789  /usr/bin/locate
+47ef19441f01b383d8cb42092111f738b230dd37128ddc763042f9cabfdc6770  /usr/bin/updatedb
+656f6f5d0070dfdf08f5d5819b30062bd4e31bf7cde876a49fc526896e36f3a7  /usr/bin/xargs
+a7597dbc322c5985e51599d343eb2b98bf4e6092ce06595a6efc9ec82646fc4a  /usr/libexec/bigram
+9e9195c230e36f5f000d967231d3a4c76f286dbc02a71f47d7c669f1c4f8ee75  /usr/libexec/code
+60f76f247a99d167744c94bfba1d0ffef29cb4e2652e838d34cd514020ce474e  /usr/libexec/frcode
--- a/sysa/flex-2.5.11/checksums
+++ b/sysa/flex-2.5.11/checksums
@ -1 +1 @@
-1e6280bcd57c357ad60c687ad5fab6597b9e6ef5f0a1186fcfef6383b76a3242  /image/bin/flex
+1e6280bcd57c357ad60c687ad5fab6597b9e6ef5f0a1186fcfef6383b76a3242  /usr/bin/flex
--- a/sysa/flex-2.6.4/checksums
+++ b/sysa/flex-2.6.4/checksums
@ -1 +1 @@
-3507fe902492ff1ffab5b5b74efecda17cac3b66d45b49e1d05ba9cfe5f7f65b  /image/bin/flex
+3507fe902492ff1ffab5b5b74efecda17cac3b66d45b49e1d05ba9cfe5f7f65b  /usr/bin/flex
--- a/sysa/gawk-3.0.4/checksums
+++ b/sysa/gawk-3.0.4/checksums
@ -1 +1 @@
-434826443327bc1f4fee62073d4dd621fc9e3039c8a66a5134a790fccd1b162a  /image/bin/gawk
+64436284acb7498d8371ff4aef7bcaa5070b91dc0c280e8f3f6cb56a9cdb9ea2  /usr/bin/gawk
--- a/sysa/gcc-4.0.4/checksums/pass1
+++ b/sysa/gcc-4.0.4/checksums/pass1
@ -1,11 +1,13 @@
-6a823c735a93d933975311e49650c6b3f4747eba297b88243dbb0fcfd854a468  /image/bin/cpp
-9d2c973a77b3d537608b874cd3ce4959b6e3ed6d8c68801fb988e440c3708632  /image/bin/gcc
-51c2625cca2b5f3a5ff65d98c148ba2e1b713c678aa383588cf86fbd302ce0af  /image/libexec/gcc/i386-unknown-linux-musl/4.0.4/cc1
-74c4c8aa626a5924681cbf6fb2a41b69a8809f4220ab6f4bdb91389bccbc075f  /image/libexec/gcc/i386-unknown-linux-musl/4.0.4/collect2
-de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbegin.o
-c7eea5e845fe2ee5538704d59c6e777d4f72b7100e78d5f86f8d95d96ab2ec20  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginS.o
-de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginT.o
-342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtend.o
-2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtendS.o
-309f29be0d8193574a6f83f5a2f2494261fb4d61af651760ae135e011a7ade89  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcc.a
-0783eac6604619cbfeb35ee4d5b34b288d9ab3fd337b91ff1555d594e3e6ed54  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcov.a
+29a5815774cf7d45427f9e24acfeeae876a97b5fed0337f96dfdc736ff86a0cf  /usr/bin/cpp
+32c7d1cf7a2a7b8fbde1cec356a9b3bff66dd17ffbb7568f14c6c4467779190b  /usr/bin/gcc
+32c7d1cf7a2a7b8fbde1cec356a9b3bff66dd17ffbb7568f14c6c4467779190b  /usr/bin/i386-unknown-linux-musl-gcc
+32c7d1cf7a2a7b8fbde1cec356a9b3bff66dd17ffbb7568f14c6c4467779190b  /usr/bin/i386-unknown-linux-musl-gcc-4.0.4
+a3d53c1ddfe54c1705d0b815ff8584935c05bbaeced0da9e4b4bf9668875d579  /usr/libexec/gcc/i386-unknown-linux-musl/4.0.4/cc1
+b047b869a377ca346eb0338772f35b5444bc0f89bc0e7747e2822971d9b5d250  /usr/libexec/gcc/i386-unknown-linux-musl/4.0.4/collect2
+de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbegin.o
+c7eea5e845fe2ee5538704d59c6e777d4f72b7100e78d5f86f8d95d96ab2ec20  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginS.o
+de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginT.o
+342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtend.o
+2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtendS.o
+e44dd75064575efbe42099945a9154789a33935def80a07b0c7c4a761eac7c10  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcc.a
+2af47fa10fd49ceb8c93c2179a348089f39203391499c8833fadfd730149cd38  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcov.a
--- a/sysa/gcc-4.0.4/checksums/pass2
+++ b/sysa/gcc-4.0.4/checksums/pass2
@ -1,11 +1,13 @@
-524b38b725a747c2f438b642db2473613d77979b0300c9f3be719370a4b4512d  /image/bin/cpp
-ecd3d55e077c5a90ae7bc51343e85a5de1b6237de5ddcb2a6e0f05b04b1bf914  /image/bin/gcc
-114fab68114a523a7dc3ff47702e6bcce0276590ffdad8dbb507af8b957f5934  /image/libexec/gcc/i386-unknown-linux-musl/4.0.4/cc1
-93ec879d4b2f5957b9964be2f6c8d486278c1959f9337d084c3ce840ba683dd5  /image/libexec/gcc/i386-unknown-linux-musl/4.0.4/collect2
-a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbegin.o
-20a3bbbd5cd59b91660628d416d489437463b651fa15b5ea5f026b45c9e35b65  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginS.o
-a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginT.o
-342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtend.o
-2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtendS.o
-2ed41b013573928bf7ce3cf594f0be0eb82cfb61c70cb2b317fe4e1c691a594f  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcc.a
-7ba9351278fe100c09dd7c8baad3dceca8a3f4c6d56541fd471b49ffb66ff887  /image/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcov.a
+a46669c4d22fa0415e10abd6572db4b99c32b35a8fe6a5f158ac77a38636f461  /usr/bin/cpp
+8b9b4c5a539ebd380533b75aa2de276c555da09b4fcfb2087cc2ef8a2ce000ba  /usr/bin/gcc
+8b9b4c5a539ebd380533b75aa2de276c555da09b4fcfb2087cc2ef8a2ce000ba  /usr/bin/i386-unknown-linux-musl-gcc
+8b9b4c5a539ebd380533b75aa2de276c555da09b4fcfb2087cc2ef8a2ce000ba  /usr/bin/i386-unknown-linux-musl-gcc-4.0.4
+6a756aaa35b6755456917ab736244956efdfe3c72c68b303c2d4e858e04a0d45  /usr/libexec/gcc/i386-unknown-linux-musl/4.0.4/cc1
+7e13583f6ca8bd13df552282a46874c1f9e6ad080f3d543076d98e0410aa41ef  /usr/libexec/gcc/i386-unknown-linux-musl/4.0.4/collect2
+a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbegin.o
+20a3bbbd5cd59b91660628d416d489437463b651fa15b5ea5f026b45c9e35b65  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginS.o
+a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtbeginT.o
+342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtend.o
+2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/crtendS.o
+480e0b4c1ec4888f1665b85f46ba15db61d057ab326599883e8960ae46c2e998  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcc.a
+68d257330d35c0ab81ab948983eb7fb91c1ec821a2abad9046e9aa0fe9cbf342  /usr/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/libgcov.a
--- a/sysa/gcc-4.0.4/pass1.sh
+++ b/sysa/gcc-4.0.4/pass1.sh
@ -3,11 +3,6 @@

 # SPDX-License-Identifier: GPL-3.0-or-later

-src_unpack() {
-    default
-    tar xzf ${SOURCES}/automake-1.16.3/src/automake-1.16.3.tar.gz
-}
-
 src_prepare() {
    default
    # This is needed for building with TCC
--- a/sysa/gcc-4.0.4/pass2.sh
+++ b/sysa/gcc-4.0.4/pass2.sh
@ -1,13 +1,9 @@
 # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 # SPDX-License-Identifier: GPL-3.0-or-later

-src_unpack() {
-    default
-    tar xzf ${SOURCES}/automake-1.16.3/src/automake-1.16.3.tar.gz
-}
-
 src_prepare() {
    default

@ -92,4 +88,5 @@ src_compile() {

 src_install() {
    make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}"
+    cp gcc/gsyslimits.h ${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h
 }
--- a/sysa/gcc-4.7.4/checksums
+++ b/sysa/gcc-4.7.4/checksums
@ -1,25 +0,0 @@
-8f4b1c859ad99f4ef17970dafb4c7b818a4e01744c4a1e7d632c09598bea737d  /image/bin/cpp
-4b522a12cdc654809e796e41062de1d48458626060ec0fac492f9a4757df38da  /image/bin/gcc
-8e7bde329795793d2d2f71c5d011376ab93a7673645ea44c0d9aee7e8bb9f058  /image/bin/gcc-ar
-ede1d40ad93ab8daf788b1362ce1deb4946865398e991725487f25af66a42bed  /image/bin/gcc-nm
-d93e0b44788e1111073f9ced886e9b41b906075ddcdf73a1cf911cc72b1bcbde  /image/bin/gcc-ranlib
-1657ba8afdac845ddfa8842efa5e7bf3cfc9be23aa31f6265e3f43eead1316d4  /image/bin/gcov
-77adc8cb0648cd8b3546254e7277d16a04b18fe643b889352717c361cc8a4309  /image/libexec/gcc/i386-unknown-linux-musl/4.7.4/cc1
-a96e1cd5eff7904cfcd260e859a65bf38c45eafe3f81b7df537e0bb68543e856  /image/libexec/gcc/i386-unknown-linux-musl/4.7.4/collect2
-4dd787d729d8d57434fb7cfaf2a7a42dfca2bdf665e6e5246fb56e4cee0f10fd  /image/libexec/gcc/i386-unknown-linux-musl/4.7.4/lto-wrapper
-b85d6aabe0ffa30cc2fa1f6a1c899256b4051086c566d9c75299c6b2f6cbd618  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtbegin.o
-db6caa96b09785d820b2b5a6fc0e2c49dc1980a18b6a6472aa2ccdb5f38fef57  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtbeginS.o
-b85d6aabe0ffa30cc2fa1f6a1c899256b4051086c566d9c75299c6b2f6cbd618  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtbeginT.o
-42a533b816b6c060f4269a310112bde2e07329cb3c2fa5b21bbad6d2d03e90b5  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtend.o
-e5059cb3aaec30653dfb2cbc09ee555218d276d6b49b1ddc05ba8c4d63e3edfb  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtendS.o
-042ed2a9c7c8ea05291f79d30ad6f2bb61a9d1a58494ee835e1cb5473b5b5b4b  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtfastmath.o
-135b6793737d181031ac9042fd42c38f7c627468447f9c90f687156968282c6f  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtprec32.o
-67ea5a6dc10582c4b4c3f53763c7408874c625e054dc4f7137206a1c927bc0b5  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtprec64.o
-412c06a772f2bceaef31514685c7634358b9d7a5e01b30c3b1aef2dd24ad68f9  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/crtprec80.o
-65082b00fb62e18e816e99a533835a5025794907b8f4d8b5075d3a607249ab08  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/libgcc.a
-af7c0180e5f5854947414ff8f4dac6dcc8b853cb56e592be367760fd4869829d  /image/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/libgcov.a
-f0b8f0639b0d596a6028b2eb4f1b738d2ef41243a652083bbb59ade32d0e5a7f  /image/lib/musl/libstdc++.a
-9ed64bd654c3a9be96e4d60637a9e65183cd94c32f946d5a88370ee9228f280a  /image/lib/musl/libstdc++.a-gdb.py
-b82cbc46d5977ba01330dc2091656f13df5391a14afcecc729269ceab7fa7706  /image/lib/musl/libstdc++.la
-f209ea28cf192f18817724f462402d5d7c307ed2c5256ffe462e93478b751d4d  /image/lib/musl/libsupc++.a
-963b895bf80dccc967cde0a03e9de439cad6f25fd912e0e7765cd2924768a5ac  /image/lib/musl/libsupc++.la
--- a/sysa/gcc-4.7.4/gcc-4.7.4.sh
+++ b/sysa/gcc-4.7.4/gcc-4.7.4.sh
@ -1,127 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    default
-
-    # Generated using gperf
-    rm gcc/cp/cfns.h
-
-    # Regenerating top level Makefile requires GNU Autogen and hence Guile,
-    # but it is not essential for building gcc.
-    rm configure Makefile.in fixincludes/fixincl.x
-
-    # Regenerate aclocal.m4 files
-    # grep "generated automatically by aclocal" */aclocal.m4  -l | sed -e 's#/aclocal.m4##'  | tr "\n" " " | sed -e 's/ $/\n/'
-    for dir in intl libcpp libdecnumber; do
-        cd $dir
-        rm aclocal.m4
-        AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 aclocal-1.11 --acdir=../config
-        cd ..
-    done
-    cd gcc
-    rm aclocal.m4
-    AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 aclocal-1.11 --acdir=../config
-    cd ..
-    cd fixincludes
-    rm aclocal.m4
-    AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 aclocal-1.11 --acdir=../gcc
-    cd ..
-    for dir in boehm-gc libffi libgfortran libgo libgomp libitm libjava libmudflap libobjc libquadmath libssp lto-plugin zlib; do
-        cd $dir
-        rm aclocal.m4
-        AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 aclocal-1.11
-        cd ..
-    done
-    cd libstdc++-v3
-    ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
-    cd ..
-    # Regenerate configure scripts
-    # Find all folders with configure script and rebuild them. At the moment we exclude boehm-gc folder due to
-    # an error but we don't use that directory anyway (it's only needed for Objective C)
-    for dir in $(ls */configure | sed 's#/configure##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
-        cd $dir
-        rm configure
-        autoconf-2.64 || autoconf-2.64
-        cd ..
-    done
-
-    # Regenerate Makefile.in
-    # Find all folders with Makefile.am and rebuild them. At the moment we exclude boehm-gc folder.
-    for dir in $(ls */Makefile.am | sed 's#/Makefile.am##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
-        cd $dir
-        rm Makefile.in
-        AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 automake-1.11
-        cd ..
-    done
-
-    for dir in libdecnumber libcpp libiberty gcc; do
-        cd $dir
-        rm -f config.in
-        autoheader-2.64
-        cd ..
-    done
-
-    # Rebuild libtool files
-    rm config.guess config.sub ltmain.sh
-    libtoolize
-    cp "${PREFIX}/"/share/automake-1.15/config.sub .
-
-    # Workaround for bison being too new
-    rm intl/plural.c
-
-    # Rebuild flex generated files
-    rm gcc/gengtype-lex.c
-
-    # Remove translation catalogs
-    find . -name '*.gmo' -delete
-
-    # Pre-built texinfo files
-    find . -name '*.info' -delete
-}
-
-src_configure() {
-    mkdir build
-    cd build
-
-    for dir in libiberty libcpp libdecnumber gcc libgcc libstdc++-v3; do
-        mkdir $dir
-        cd $dir
-        ../../$dir/configure \
-            --prefix="${PREFIX}" \
-            --libdir="${PREFIX}"/lib/musl \
-            --build=i386-unknown-linux-musl \
-            --target=i386-unknown-linux-musl \
-            --host=i386-unknown-linux-musl \
-            --disable-shared \
-            --program-transform-name= \
-            --enable-languages=c,c++ \
-            --disable-sjlj-exceptions
-        cd ..
-    done
-    cd ..
-}
-
-src_compile() {
-    ln -s . build/build-i386-unknown-linux-musl
-    for dir in libiberty libcpp libdecnumber gcc; do
-        # We have makeinfo now but it is not happy with gcc .info files, so skip it
-        make -C build/$dir LIBGCC2_INCLUDES=-I"${PREFIX}/include" \
-	     STMP_FIXINC= GMPLIBS="-lmpc -lmpfr -lgmp" MAKEINFO=true
-    done
-
-    # host_subdir is necessary because we have slightly different build directory layout
-    make -C build/libgcc PATH="${PATH}:../gcc" CC=../gcc/xgcc \
-	 host_subdir=build CFLAGS="-I../gcc/include -I/${PREFIX}/include"
-
-    make -C build/libstdc++-v3 PATH="${PATH}:${PWD}/build/gcc" \
-	 CXXFLAGS="-I${PWD}/build/gcc/include -I ${PREFIX}/include"
-}
-
-src_install() {
-    make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" MAKEINFO=true
-    make -C build/libgcc install DESTDIR="${DESTDIR}" host_subdir=build
-    make -C build/libstdc++-v3 install DESTDIR="${DESTDIR}"
-}
--- a/sysa/gcc-4.7.4/patches/libstdc++-v3_musl.patch
+++ b/sysa/gcc-4.7.4/patches/libstdc++-v3_musl.patch
@ -1,17 +0,0 @@
-SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-SPDX-License-Identifier: GPL-3.0-or-later
-
-Add support for *-linux-musl triplet.
-
--- libstdc++-v3/configure.host 2021-07-07 10:00:23.934848223 +0100
-+++ libstdc++-v3/configure.host 2021-07-07 10:00:36.295195348 +0100
-@@ -242,6 +242,9 @@
-   freebsd*)
-     os_include_dir="os/bsd/freebsd"
-     ;;
-+  linux-musl*)
-+    os_include_dir="os/generic"
-+    ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
--- a/sysa/gcc-4.7.4/patches/remove_gperf_dependency.patch
+++ b/sysa/gcc-4.7.4/patches/remove_gperf_dependency.patch
@ -1,36 +0,0 @@
-SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-SPDX-License-Identifier: GPL-3.0-or-later
-
-Remove dependency on gperf.
-
--- gcc/cp/except.c	2021-07-07 18:24:36.561530121 +0100
-+++ gcc/cp/except.c	2021-07-07 18:27:18.035681929 +0100
-@@ -987,8 +987,6 @@
-    exception, unless it calls a program-supplied function that
-    throws an exception.  */
- 
-#include "cfns.h"
-
- int
- nothrow_libfn_p (const_tree fn)
- {
-@@ -1007,7 +1005,7 @@
-      unless the system headers are playing rename tricks, and if
-      they are, we don't want to be confused by them.  */
-   id = DECL_NAME (fn);
-  return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
-+  return 0;
- }
- 
- /* Returns nonzero if an exception of type FROM will be caught by a
--- gcc/cp/Make-lang.in	2021-07-07 18:24:36.571530380 +0100
-+++ gcc/cp/Make-lang.in	2021-07-07 18:26:47.154887799 +0100
-@@ -313,7 +313,7 @@
- cp/rtti.o: cp/rtti.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) convert.h \
-   $(TARGET_H) $(C_PRAGMA_H) gt-cp-rtti.h intl.h
- cp/except.o: cp/except.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) \
-  cp/cfns.h $(TREE_INLINE_H) $(TARGET_H) gt-cp-except.h
-+  $(TREE_INLINE_H) $(TARGET_H) gt-cp-except.h
- cp/expr.o: cp/expr.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(TM_P_H)
- cp/pt.o: cp/pt.c $(CXX_TREE_H) $(TM_H) cp/decl.h cp/cp-objcp-common.h \
-   toplev.h $(TREE_INLINE_H) pointer-set.h gt-cp-pt.h vecprim.h intl.h \
--- a/sysa/gettext-0.21/checksums
+++ b/sysa/gettext-0.21/checksums
@ -1,33 +0,0 @@
-0b49887ba15ae4c28c9801a3456f6344a24aacaeee54d35514348de1b43a0f8e  /image/bin/autopoint
-de3829ef981879ad69a5871627e5279d8dd41e0a9c2a2267f8f97c29db08bb8f  /image/bin/gettextize
-7509a6d251647b4c6e9e4a565e59131bcf04790ddf7ae217593e443548658f3c  /image/bin/recode-sr-latin
-779d697ce3f75620f976fd74c6fc94cb385bb4c5341d88499e50dd3c94871f2c  /image/bin/msguniq
-8de43fec98e71ef617c63b8ef33281059b1c80f21ae6ebc2c916f66eaa4d5dd4  /image/bin/msginit
-e3ce76a27c5817e4bb67c7f5bed48443e21cd236cd512817bc52154e42f08a5b  /image/bin/msggrep
-bf9f1b9ba9462cdf661060c16286b7bb7963548f522d18a0283bdb82a0afe234  /image/bin/msgfilter
-4ec559f229421478b9b990ed2440673b216b8804f51e0142ca2fb04e9ba15b9f  /image/bin/msgexec
-4c5fa0d74bbf3cb0fba5fc0b5808aa8f5096a8acef1e3de19867044b044f3f3a  /image/bin/msgen
-d0d36b2fdbe0603e357107076ffa28e8c1b1082aec9cd0aeabdf8ad9a8350cdf  /image/bin/msgconv
-cf51994289d1a000c4f046a897f5870d91c4e13f08fdb6356f8746f7d944d979  /image/bin/msgcomm
-9866a5a8882e4a1335009b53c0078a9c2d60c004a4fa0bfd9015bc2a22eca657  /image/bin/msgcat
-7dc26dfc1fc63514902378d9169bd394554d13102b5d28890a58df501b14d89e  /image/bin/msgattrib
-306e34cb106f5bcdd10470fa2447c6fe2b12a3bed368266ecea2222a54041cc2  /image/bin/xgettext
-140f5fa0e205f8fe98f9363eced4549eb9548f18481cbd2f1b413c0e84c6310d  /image/bin/msgunfmt
-260dd447ced109d54231dede7af3a0334aed6bc59e14aa00a8d6805a0760656d  /image/bin/msgmerge
-1d3a8a60a282606414eefb6c4864e6a7aa8dcf027694ef665a053454586b3133  /image/bin/msgfmt
-2098c9d7de2e371b1126888bc0e2082f9867cc04abc180067d9095f8c4751ab2  /image/bin/msgcmp
-b1c70a26633d0096404a6cd40a78ea61fba5d2d2b49359950241613ed29561db  /image/bin/gettext.sh
-72900e493569e30a9fd24cb60219e8f6ebbd95d1983a78fe3b0f332831cd5b33  /image/bin/envsubst
-e6facf97d489693a75a13172e66ca966ea99e5fd63424dc3589d8af6a0b60b60  /image/bin/ngettext
-2ffc5bb3cd1f1d1003f396c2f4de971b6f7c2f00abbbff3475e10bfe2cd03679  /image/bin/gettext
-c35c35a6ec47cb39fdb28a4e937100fb54b6c8a9526b990a16ad6b18bfe2f220  /image/lib/libgettextpo.a
-ce01691a07cde9641280ba3e519754acf9c138bf222f827c381f9f90382f8245  /image/lib/libgettextpo.la
-d6ae3f511cc498740005918e41b64517c7cc69fb0259ac3ecd88919f0eae0173  /image/lib/gettext/project-id
-647e15c1984950fb6565842fb0f230e80a581e3222eef6f1171f9847e356acf1  /image/lib/gettext/user-email
-b069aab7140675d22d8f911a4e81f0ed3b59671d072032a2c66dea8d55d910a8  /image/lib/gettext/cldr-plurals
-a743f596b1ad2ee382bb39c27e0f52dbf50680127c1436d279b08be592ca1121  /image/lib/gettext/urlget
-aa477fba3b3e509d7d1ba241bda85550b3444445a5484264a09be99f99f15ebb  /image/lib/gettext/hostname
-3a87cea1eff091def343084ceef113598d84e1a6591dd98ab88c2197f24215c0  /image/lib/libgettextsrc.la
-7e2804b5a97a509d72dcd6e2a93a6439f78a3675f79d5f976e043b0706f3f7d5  /image/lib/libgettextlib.la
-24957e93b8d64e81368fbcd58e55fabb0bab283bee23a0911297d9588d75cafe  /image/lib/libtextstyle.a
-fc57ae9b0c7c796cd21ac6391319bfe47e2015aff7296d644015c11086024203  /image/lib/libtextstyle.la
--- a/sysa/gettext-0.21/gettext-0.21.sh
+++ b/sysa/gettext-0.21/gettext-0.21.sh
@ -1,24 +0,0 @@
-# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    find . -name '*.info*' -delete
-    find . -name '*.gmo' -delete
-
-    # bison
-    rm gettext-runtime/intl/plural.c gettext-tools/src/{po-gram-gen,cldr-plural}.{c,h}
-    GNULIB_SRCDIR=$(realpath ../gnulib-7daa86f) ./autogen.sh
-}
-
-src_configure() {
-    ./configure --prefix="${PREFIX}" --enable-static --disable-shared
-}
-
-src_compile() {
-    make MAKEINFO=true
-}
-
-src_install() {
-    make MAKEINFO=true DESTDIR="${DESTDIR}" install
-}
--- a/sysa/gperf-3.1/checksums
+++ b/sysa/gperf-3.1/checksums
@ -1 +0,0 @@
-1f2a11dd9afd812a40ab44e5297ef375daddeda589c79d08be65958430c4ef82  /image/bin/gperf
--- a/sysa/gperf-3.1/gperf-3.1.sh
+++ b/sysa/gperf-3.1/gperf-3.1.sh
@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    find . -name '*.info*' -delete
-
-    for d in doc tests lib src; do
-        cd $d
-        ln -s ../aclocal.m4 aclocal.m4
-        autoreconf-2.69 -fi
-        cd ..
-    done
-    autoreconf-2.69 -fi
-}
-
-src_configure() {
-    ./configure --prefix="${PREFIX}"
-}
--- a/sysa/grep-2.4/checksums
+++ b/sysa/grep-2.4/checksums
@ -1 +1 @@
-107f1df091f5d1d7ad19def977135361836755eaab2120548afab7b23c582370  /image/bin/grep
+107f1df091f5d1d7ad19def977135361836755eaab2120548afab7b23c582370  /usr/bin/grep
--- a/sysa/gzip-1.2.4/checksums
+++ b/sysa/gzip-1.2.4/checksums
@ -1 +1 @@
-304cead634e6766db915155d422049269f66b2ff34a20a7f20819a0c69193d33  /image/bin/gzip
+304cead634e6766db915155d422049269f66b2ff34a20a7f20819a0c69193d33  /usr/bin/gzip
--- a/sysa/heirloom-devtools-070527/checksums
+++ b/sysa/heirloom-devtools-070527/checksums
@ -1,5 +1,5 @@
-d1a3da2e1199a8a11e97d5b2b201d49452be4403c37b5af070c1001cf0a932a2  /image/bin/yacc
-fe3bf155e60efebc7a4018bf55e228ee7b98b2c9da0588a8c89fd358b1530a66  /image/bin/lex
-ffe696afc1bda32a5f4035e29b3275cab73a27df7635ccbe02ed49a30374ccdd  /image/lib/mes/libl.a
+d1a3da2e1199a8a11e97d5b2b201d49452be4403c37b5af070c1001cf0a932a2  /usr/bin/yacc
+fe3bf155e60efebc7a4018bf55e228ee7b98b2c9da0588a8c89fd358b1530a66  /usr/bin/lex
+ffe696afc1bda32a5f4035e29b3275cab73a27df7635ccbe02ed49a30374ccdd  /usr/lib/mes/libl.a
 bf3fb293f1ff89ee3dbcb08166c64b7a6793b49a12673d7633e3353ebea80d4d  /yaccpar
 ee0f187b844f50d64c912bfcb5d73706662846d6d8a90b8b1fb20dda60464734  /lex/ncform
--- a/sysa/kexec-tools-2.0.22/checksums
+++ b/sysa/kexec-tools-2.0.22/checksums
@ -1,2 +1,2 @@
-55636ab04343262e257e2559074e36358b292491a90ff50f2a6ad2f94eb29b28  /after/lib/kexec-tools/kexec_test
-a5aa102f82e88b027d6343f1676fd85cf920d7fc541dafb8e9ebc68a8931eaba  /after/sbin/kexec
+55636ab04343262e257e2559074e36358b292491a90ff50f2a6ad2f94eb29b28  /usr/lib/kexec-tools/kexec_test
+d36b4078cc2bfb3fb6c659982ad2356a985fea8290650992e4f023f495e4ec1e  /usr/sbin/kexec
--- a/sysa/libtool-1.4/checksums
+++ b/sysa/libtool-1.4/checksums
@ -1,2 +1,2 @@
-394e908c57c289a688190bc2be99bab32d32c67e7e592a678f75b47045468c99  /image/lib/musl/libltdl.a
-5c47c033eac4df421432309089c95ea794f8e9cf275dcab2fc120dbab94e36f0  /image/lib/musl/libltdl.la
+7dbd82c34610847bbd7fbfce7b5797671a2ab2fdce83ec7375f2fed8692096d4  /usr/lib/musl/libltdl.a
+d1dc943c5b262b96cf159f902eabd2f40aaa8e722fa80949296761d725e2176e  /usr/lib/musl/libltdl.la
--- a/sysa/libtool-2.2.4/checksums
+++ b/sysa/libtool-2.2.4/checksums
@ -1,2 +1,2 @@
-688cc9a68dfb360171169b95ac4f1e9c02151a4c857f50e8d49ee611d8041338  /image/lib/musl/libltdl.a
-6432256a940d6ccb7affb273f93bdd72351d90c8329bab927962c06ac90a26bc  /image/lib/musl/libltdl.la
+203e6f11acbacd7bbfbff24be4ee91dfe6b6ea5f6978998eac0e24f648007297  /usr/lib/musl/libltdl.a
+4418ede5a8b651e1c28bd40d74b8006f604057ac55e2877724d41ea3b5aa26e6  /usr/lib/musl/libltdl.la
--- a/sysa/libunistring-0.9.10/checksums
+++ b/sysa/libunistring-0.9.10/checksums
@ -1,2 +0,0 @@
-b7681405b71f47d605fe5d17aeb26425b5f3269d11fc95e72a281d90934bec48  /image/lib/musl/libunistring.a
-92fdc350d4141210cf1d01d271dd5a564ff6b4337b4de2f1f135a91a6541e0c2  /image/lib/musl/libunistring.la
--- a/sysa/libunistring-0.9.10/libunistring-0.9.10.sh
+++ b/sysa/libunistring-0.9.10/libunistring-0.9.10.sh
@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    find . -name '*.info*' -delete
-
-    # libunistring does not specify which gnulib snapshot was used,
-    # pick a random one that works
-    GNULIB_TOOL=../gnulib-52a06cb3/gnulib-tool ./autogen.sh
-
-    # autogen.sh does not regenerate libtool files
-    autoreconf-2.69 -fi
-}
-
-src_configure() {
-    ./configure \
-	--prefix="${PREFIX}" \
-	--libdir="${PREFIX}/lib/musl" \
-	--disable-shared
-}
--- a/sysa/linux-2.6.16.62/checksums.bak
+++ b/sysa/linux-2.6.16.62/checksums.bak
@ -1 +0,0 @@
-0254b0de266d8dd8de847315c5ee9602e0ae7875c75e762bf043bb13510e628f  /after/boot/linux-2.6.16.62
--- a/sysa/m4-1.4.7/checksums
+++ b/sysa/m4-1.4.7/checksums
@ -1 +1 @@
-f5f6c78bf8aa179ded5eba5601132761968eda627463c418e8e1daa2e84defba  /image/bin/m4
+f5f6c78bf8aa179ded5eba5601132761968eda627463c418e8e1daa2e84defba  /usr/bin/m4
--- a/sysa/make-3.80/checksums
+++ b/sysa/make-3.80/checksums
@ -1 +1 @@
-8e0d4cc1e9c25a927b17bf07aaae57c4f6779d42a659140a736c65d6a71b456c  /image/bin/make
+178ecd6f29f93270356b46b18e472bfcddeee187c92c9ebeb818d62f2bf4a6b3  /usr/bin/make
--- a/sysa/make-3.80/make-3.80.kaem
+++ b/sysa/make-3.80/make-3.80.kaem
@ -16,7 +16,6 @@ cd ${pkg}

 # Create .h files
 catm config.h
-catm /after/include/mes/config.h

 # Patch
 patch -Np0 -i ../../patches/mes-libc.patch
@ -36,8 +35,8 @@ tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART implicit.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DUP2 -Dvfork=fork job.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DLOCALEDIR=\"/fake-locale\" -DPACKAGE=\"fake-make\" -DHAVE_MKTEMP -DHAVE_GETCWD main.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STRERROR -DHAVE_VPRINTF misc.c
-tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DINCLUDEDIR=\"/after/include\" read.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 -DHAVE_FCNTL_H -DLIBDIR=\"/after/lib\" remake.c
+tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DINCLUDEDIR=\"${PREFIX}/include\" read.c
+tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 -DHAVE_FCNTL_H -DLIBDIR=\"${PREFIX}/lib\" remake.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART rule.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART signame.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART variable.c
--- a/sysa/mes-0.23/checksums
+++ b/sysa/mes-0.23/checksums
@ -1,5 +1,5 @@
-920b35eb5ae2fda55348a30aafed7f006a5b86cbe05093df2c75e5d169bd9cb0  /image/lib/mes/libc.a
-12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /image/lib/mes/libgetopt.a
-d1168ee9b528e39f0b40e8d51fb7fa3619c4a5ee928137f7faf6d0879b0916b0  /image/lib/mes/crt1.o
-461ca1494737fab86fe1c1d3addeaf9d0ece413e353abcdea8674db3f700cda3  /image/lib/mes/crtn.o
-09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /image/lib/mes/crti.o
+920b35eb5ae2fda55348a30aafed7f006a5b86cbe05093df2c75e5d169bd9cb0  /usr/lib/mes/libc.a
+12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /usr/lib/mes/libgetopt.a
+d1168ee9b528e39f0b40e8d51fb7fa3619c4a5ee928137f7faf6d0879b0916b0  /usr/lib/mes/crt1.o
+461ca1494737fab86fe1c1d3addeaf9d0ece413e353abcdea8674db3f700cda3  /usr/lib/mes/crtn.o
+09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /usr/lib/mes/crti.o
--- a/sysa/mes/checksums
+++ b/sysa/mes/checksums
@ -1,13 +1,13 @@
-e835fdb1cd8c7852e8c879f1efdea6f7392bdd04938f5a01a6199ab2730fac4b  /image/bin/mes-m2
-78f7a9e45cf8a90c35f2191e5ec5de115e3f5f2f0922c22d949ae8c56c54f615  /image/bin/mescc.scm
-90811dafd33ad56b8e4b0adcc04263f9329b9047b7cc337abe8151a75017172c  /image/lib/x86-mes/crt1.s
-e065af5f73d40b20029e9ba23143660f99c6abacb82d1b4c8f2067a4e395d553  /image/lib/x86-mes/crt1.o
-c9944a799d584abfa76f385c14ac0caf6f46d03b34bf2712493602b12826c6b2  /image/lib/x86-mes/x86.M1
-d8646707db6aa2a76fdc5dbb3521376439e357f9f1de1d67f02a1afeefd342ac  /image/lib/x86-mes/libmescc.s
-aaf89a9d6818cdb8ece73454631b1a1ae83503e5eb7777d38cdaf141cba0e530  /image/lib/x86-mes/libc+tcc.s
-b5ce4e1288a27864156d74268090c13aea6b5a261fa81c75bfbe844d0689d03d  /image/lib/x86-mes/libc.s
-52f697278ccdff5e457f27e10f465a91ab9858f0c6cee0683831cadb3109bbb7  /image/lib/x86-mes/libmescc.a
-3156e619dbd85c471e2a8d053ba536eaaa8f91da657003777b8e87e7bab4266d  /image/lib/x86-mes/libc+tcc.a
-400615ca47339a3149680748b319f089ca5cb7ff2fdb42cce252f8c408445c1b  /image/lib/x86-mes/libc.a
-b16ab368bc4c7b8bd896d03cba565a60e97760dea4da9f5c8a1a3d2902a79df6  /image/lib/linux/x86-mes/elf32-header.hex2
-f9873d9aab12e70f24d97f8319e17a1e698ca60779ae9a6ab3ede648cd60fc61  /image/lib/linux/x86-mes/elf32-footer-single-main.hex2
+e835fdb1cd8c7852e8c879f1efdea6f7392bdd04938f5a01a6199ab2730fac4b  /usr/bin/mes-m2
+2337a7eb4431ad2e9161e82d0ff918e0821f56ee27469d8d18d3d7dbbcc99dc3  /usr/bin/mescc.scm
+90811dafd33ad56b8e4b0adcc04263f9329b9047b7cc337abe8151a75017172c  /usr/lib/x86-mes/crt1.s
+e065af5f73d40b20029e9ba23143660f99c6abacb82d1b4c8f2067a4e395d553  /usr/lib/x86-mes/crt1.o
+c9944a799d584abfa76f385c14ac0caf6f46d03b34bf2712493602b12826c6b2  /usr/lib/x86-mes/x86.M1
+d8646707db6aa2a76fdc5dbb3521376439e357f9f1de1d67f02a1afeefd342ac  /usr/lib/x86-mes/libmescc.s
+aaf89a9d6818cdb8ece73454631b1a1ae83503e5eb7777d38cdaf141cba0e530  /usr/lib/x86-mes/libc+tcc.s
+b5ce4e1288a27864156d74268090c13aea6b5a261fa81c75bfbe844d0689d03d  /usr/lib/x86-mes/libc.s
+52f697278ccdff5e457f27e10f465a91ab9858f0c6cee0683831cadb3109bbb7  /usr/lib/x86-mes/libmescc.a
+3156e619dbd85c471e2a8d053ba536eaaa8f91da657003777b8e87e7bab4266d  /usr/lib/x86-mes/libc+tcc.a
+400615ca47339a3149680748b319f089ca5cb7ff2fdb42cce252f8c408445c1b  /usr/lib/x86-mes/libc.a
+b16ab368bc4c7b8bd896d03cba565a60e97760dea4da9f5c8a1a3d2902a79df6  /usr/lib/linux/x86-mes/elf32-header.hex2
+f9873d9aab12e70f24d97f8319e17a1e698ca60779ae9a6ab3ede648cd60fc61  /usr/lib/linux/x86-mes/elf32-footer-single-main.hex2
--- a/sysa/mes/files/mescc.scm
+++ b/sysa/mes/files/mescc.scm
@ -1,4 +1,5 @@
 ; SPDX-FileCopyrightText: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+; SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
 ;
 ; SPDX-License-Identifier: GPL-3.0-or-later

@ -12,9 +13,9 @@
                        (cdr (string-split %host-type #\-)))))))

 (define %prefix (or (getenv "MES_PREFIX")
-                      (if (string-prefix? "@prefix" "/image")
+                      (if (string-prefix? "@prefix" "/usr")
                          ""
-                          "/image")))
+                          "/usr")))

 (define %includedir (or (getenv "includedir")
                        (string-append %prefix "/include")))
--- a/sysa/musl-1.1.24/checksums/pass1
+++ b/sysa/musl-1.1.24/checksums/pass1
@ -1,14 +1,14 @@
-457fff81b3188b82621f3ae49847ebc60128017fcbdba012245169af76cf122a  /image/lib/musl/crt1.o
-e3560c563125643467b29842db7984ccd1ecd3a6010358f9096674e199e36e05  /image/lib/musl/crti.o
-b3a8cf971e9870bc3b2aa8fb8fc082b6a222cc0540a70f122a76ac6ced9151d0  /image/lib/musl/crtn.o
-2e667973f709298b7c1e7dd2c873e067526dd9a324d58c8c45ef3fc0a4e5acd8  /image/lib/musl/libc.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libcrypt.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libdl.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libm.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libpthread.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libresolv.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/librt.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libutil.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libxnet.a
-b60b59a94f10f039977cea2cea6f15b55b402b25df2e1b2a4e83fa84ccf2fd43  /image/lib/musl/rcrt1.o
-a50500329680bed4dcc5ec3891fd50f65af9cae7de0b8e8fe925c37f1c6bb16b  /image/lib/musl/Scrt1.o
+457fff81b3188b82621f3ae49847ebc60128017fcbdba012245169af76cf122a  /usr/lib/musl/crt1.o
+e3560c563125643467b29842db7984ccd1ecd3a6010358f9096674e199e36e05  /usr/lib/musl/crti.o
+b3a8cf971e9870bc3b2aa8fb8fc082b6a222cc0540a70f122a76ac6ced9151d0  /usr/lib/musl/crtn.o
+2e667973f709298b7c1e7dd2c873e067526dd9a324d58c8c45ef3fc0a4e5acd8  /usr/lib/musl/libc.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libcrypt.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libdl.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libm.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libpthread.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libresolv.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/librt.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libutil.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libxnet.a
+b60b59a94f10f039977cea2cea6f15b55b402b25df2e1b2a4e83fa84ccf2fd43  /usr/lib/musl/rcrt1.o
+a50500329680bed4dcc5ec3891fd50f65af9cae7de0b8e8fe925c37f1c6bb16b  /usr/lib/musl/Scrt1.o
--- a/sysa/musl-1.1.24/checksums/pass2
+++ b/sysa/musl-1.1.24/checksums/pass2
@ -1,14 +1,14 @@
-457fff81b3188b82621f3ae49847ebc60128017fcbdba012245169af76cf122a  /image/lib/musl/crt1.o
-e3560c563125643467b29842db7984ccd1ecd3a6010358f9096674e199e36e05  /image/lib/musl/crti.o
-b3a8cf971e9870bc3b2aa8fb8fc082b6a222cc0540a70f122a76ac6ced9151d0  /image/lib/musl/crtn.o
-0133b7b3bade753db585f743fa82391afc8ab45e55f883acbe051d764bf4d6f7  /image/lib/musl/libc.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libcrypt.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libdl.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libm.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libpthread.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libresolv.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/librt.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libutil.a
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /image/lib/musl/libxnet.a
-b60b59a94f10f039977cea2cea6f15b55b402b25df2e1b2a4e83fa84ccf2fd43  /image/lib/musl/rcrt1.o
-a50500329680bed4dcc5ec3891fd50f65af9cae7de0b8e8fe925c37f1c6bb16b  /image/lib/musl/Scrt1.o
+457fff81b3188b82621f3ae49847ebc60128017fcbdba012245169af76cf122a  /usr/lib/musl/crt1.o
+e3560c563125643467b29842db7984ccd1ecd3a6010358f9096674e199e36e05  /usr/lib/musl/crti.o
+b3a8cf971e9870bc3b2aa8fb8fc082b6a222cc0540a70f122a76ac6ced9151d0  /usr/lib/musl/crtn.o
+0133b7b3bade753db585f743fa82391afc8ab45e55f883acbe051d764bf4d6f7  /usr/lib/musl/libc.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libcrypt.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libdl.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libm.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libpthread.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libresolv.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/librt.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libutil.a
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  /usr/lib/musl/libxnet.a
+b60b59a94f10f039977cea2cea6f15b55b402b25df2e1b2a4e83fa84ccf2fd43  /usr/lib/musl/rcrt1.o
+a50500329680bed4dcc5ec3891fd50f65af9cae7de0b8e8fe925c37f1c6bb16b  /usr/lib/musl/Scrt1.o
--- a/sysa/musl-1.1.24/checksums/pass3
+++ b/sysa/musl-1.1.24/checksums/pass3
@ -1,14 +1,14 @@
-a50500329680bed4dcc5ec3891fd50f65af9cae7de0b8e8fe925c37f1c6bb16b  /image/lib/musl/Scrt1.o
-457fff81b3188b82621f3ae49847ebc60128017fcbdba012245169af76cf122a  /image/lib/musl/crt1.o
-73f64b61e6e9ae83726ab4cc909a7b549b06b6df2b087aedddbcd39cb7146f69  /image/lib/musl/crti.o
-f5e325819d86fb381574692b8f9ea24f88f44f185a75adfe461705ecf2619c6e  /image/lib/musl/crtn.o
-d249175c8ac3187b0ac264fa282c325cf4877e635409fd7944d6943a257d1732  /image/lib/musl/libc.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libcrypt.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libdl.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libm.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libpthread.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libresolv.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/librt.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libutil.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libxnet.a
-b60b59a94f10f039977cea2cea6f15b55b402b25df2e1b2a4e83fa84ccf2fd43  /image/lib/musl/rcrt1.o
+a50500329680bed4dcc5ec3891fd50f65af9cae7de0b8e8fe925c37f1c6bb16b  /usr/lib/musl/Scrt1.o
+457fff81b3188b82621f3ae49847ebc60128017fcbdba012245169af76cf122a  /usr/lib/musl/crt1.o
+73f64b61e6e9ae83726ab4cc909a7b549b06b6df2b087aedddbcd39cb7146f69  /usr/lib/musl/crti.o
+f5e325819d86fb381574692b8f9ea24f88f44f185a75adfe461705ecf2619c6e  /usr/lib/musl/crtn.o
+d249175c8ac3187b0ac264fa282c325cf4877e635409fd7944d6943a257d1732  /usr/lib/musl/libc.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libcrypt.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libdl.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libm.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libpthread.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libresolv.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/librt.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libutil.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libxnet.a
+b60b59a94f10f039977cea2cea6f15b55b402b25df2e1b2a4e83fa84ccf2fd43  /usr/lib/musl/rcrt1.o
--- a/sysa/musl-1.2.2/checksums
+++ b/sysa/musl-1.2.2/checksums
@ -1,14 +1,14 @@
-40e7962d82241e166dba1b12a7c4c0658ec8ade4e7b93e20a57485811a92f366  /image/lib/musl/Scrt1.o
-13ae7b4895a3ce59ab6b8219e03b5e65ca3d9400b673325c1df86d75bb1b9ff9  /image/lib/musl/crt1.o
-73f64b61e6e9ae83726ab4cc909a7b549b06b6df2b087aedddbcd39cb7146f69  /image/lib/musl/crti.o
-f5e325819d86fb381574692b8f9ea24f88f44f185a75adfe461705ecf2619c6e  /image/lib/musl/crtn.o
-e7403377fc54c74e2296c1fbd421fcf6ff867b9cc305340f0e7f324119f9c8b7  /image/lib/musl/libc.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libcrypt.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libdl.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libm.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libpthread.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libresolv.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/librt.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libutil.a
-f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /image/lib/musl/libxnet.a
-ee385035a4d9b3f4f9a1c73148821ddf26a1b3c2e607aa948c70d8612559cf7d  /image/lib/musl/rcrt1.o
+40e7962d82241e166dba1b12a7c4c0658ec8ade4e7b93e20a57485811a92f366  /usr/lib/musl/Scrt1.o
+13ae7b4895a3ce59ab6b8219e03b5e65ca3d9400b673325c1df86d75bb1b9ff9  /usr/lib/musl/crt1.o
+73f64b61e6e9ae83726ab4cc909a7b549b06b6df2b087aedddbcd39cb7146f69  /usr/lib/musl/crti.o
+f5e325819d86fb381574692b8f9ea24f88f44f185a75adfe461705ecf2619c6e  /usr/lib/musl/crtn.o
+e7403377fc54c74e2296c1fbd421fcf6ff867b9cc305340f0e7f324119f9c8b7  /usr/lib/musl/libc.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libcrypt.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libdl.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libm.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libpthread.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libresolv.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/librt.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libutil.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /usr/lib/musl/libxnet.a
+ee385035a4d9b3f4f9a1c73148821ddf26a1b3c2e607aa948c70d8612559cf7d  /usr/lib/musl/rcrt1.o
--- a/sysa/patch-2.5.9/checksums
+++ b/sysa/patch-2.5.9/checksums
@ -1 +1 @@
-19ead2cf81b112f2e8907089954915eeae36d78df6bf1d2e72a0d7fc15c4483b  /image/bin/patch
+19ead2cf81b112f2e8907089954915eeae36d78df6bf1d2e72a0d7fc15c4483b  /usr/bin/patch
--- a/sysa/patch-2.7.6/checksums
+++ b/sysa/patch-2.7.6/checksums
@ -1 +0,0 @@
-b887260c73947c5293804f42cbfcd2d48728f7ed395fdfe5ffde0aa96e381fd1  /image/bin/patch
--- a/sysa/patch-2.7.6/import-gnulib.sh
+++ b/sysa/patch-2.7.6/import-gnulib.sh
@ -1,76 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-../gnulib-e017871/gnulib-tool --import \
-    --local-dir=gl \
-    --lib=libpatch \
-    --source-base=lib \
-    --m4-base=m4 \
-    --doc-base=doc \
-    --tests-base=tests \
-    --aux-dir=build-aux \
-    --makefile-name=gnulib.mk \
-    --no-conditional-dependencies \
-    --no-libtool \
-    --macro-prefix=gl \
-    argmatch \
-    backupfile \
-    clock-time \
-    diffseq \
-    dirname \
-    dup2 \
-    errno \
-    exitfail \
-    extensions \
-    faccessat \
-    fchmodat \
-    fchownat \
-    fcntl-h \
-    fstatat \
-    full-write \
-    getdate \
-    getopt-gnu \
-    gettime \
-    git-version-gen \
-    gitlog-to-changelog \
-    gnupload \
-    hash \
-    ignore-value \
-    intprops \
-    largefile \
-    linked-list \
-    maintainer-makefile \
-    malloc \
-    manywarnings \
-    memchr \
-    minmax \
-    mkdirat \
-    nstrftime \
-    openat \
-    progname \
-    quotearg \
-    readlinkat \
-    realloc \
-    renameat \
-    setenv \
-    signal \
-    size_max \
-    ssize_t \
-    stat-time \
-    stdbool \
-    stdlib \
-    symlinkat \
-    sys_stat \
-    tempname \
-    time \
-    unistd \
-    unlinkat \
-    update-copyright \
-    utimensat \
-    verror \
-    xalloc \
-    xlist \
-    xmemdup0
--- a/sysa/patch-2.7.6/patch-2.7.6.sh
+++ b/sysa/patch-2.7.6/patch-2.7.6.sh
@ -1,24 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    ../../import-gnulib.sh
-
-    # bison
-    rm lib/parse-datetime.c
-
-    autoreconf -fi
-}
-
-src_configure() {
-    ./configure --prefix="${PREFIX}"
-}
-
-src_compile() {
-    make MAKEINFO=true
-}
-
-src_install() {
-    make MAKEINFO=true DESTDIR="${DESTDIR}" install
-}
--- a/sysa/perl-5.000/checksums
+++ b/sysa/perl-5.000/checksums
@ -1 +1 @@
-964a879564e1709ef4c464c0044cf195ea716064732bfbb802722db02d950f0a  /image/bin/perl
+28618a743a70393ad29a330a310e26c988961d72e5a979c47334012f82dc283c  /usr/bin/perl
--- a/sysa/perl-5.000/files/config.h
+++ b/sysa/perl-5.000/files/config.h
@ -1,9 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 // SPDX-License-Identifier: GPL-3.0-or-later

 #define MEM_ALIGNBYTES 8
-#define BIN "/image/bin"
+#define BIN "/usr/bin"
 #define BYTEORDER 0x4321
 #define CPPSTDIN "tcc -E"
 #define CPPMINUS "-"
@ -47,13 +48,13 @@
 #define INTSIZE 4
 #define Off_t off_t

-#define PRIVLIB "/image/lib/perl5"
+#define PRIVLIB "/usr/lib/perl5"

 #define _(args) args

 #define RANDBITS 31

-#define SCRIPTDIR "/image/bin"
+#define SCRIPTDIR "/usr/bin"

 #define SIG_NAME "ZERO","HUP","INT","QUIT","ILL","TRAP","IOT","BUS","FPE","KILL","USR1","SEGV","USR2","PIPE","ALRM","TERM","STKFLT","CHLD","CONT","STOP","TSTP","TTIN","TTOU","URG","XCPU","XFSZ","VTALRM","PROF","WINCH", "IO", "POLL", "PWR", "SYS", "UNUSED"

@ -62,8 +63,8 @@
 #define STDCHAR char
 #define Uid_t uid_t

-#define LOC_SED "/image/bin/sed"
-#define ARCHLIB "/image/lib/perl5/"
+#define LOC_SED "/usr/bin/sed"
+#define ARCHLIB "/usr/lib/perl5/"

 #define CAT2(a,b) a##b
 #define Gconvert(x,n,t,b) gcvt((x),(n),(b))
--- a/sysa/perl-5.003/checksums
+++ b/sysa/perl-5.003/checksums
@ -1 +1 @@
-b8a51b854ec4f9c0eb170841d342c0eb8f43296bf980737400650a9ec4d94a53  /image/bin/perl
+c6583c3ce3d5ecd9c10f2ed2906a25d2bd3500d913f1e943ef78456a60090786  /usr/bin/perl
--- a/sysa/perl-5.003/files/config.h
+++ b/sysa/perl-5.003/files/config.h
@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 // SPDX-License-Identifier: GPL-3.0-or-later

--- a/sysa/perl-5.6.2/checksums
+++ b/sysa/perl-5.6.2/checksums
@ -1 +1 @@
-ec17b6489aeb96cbc6cb554c232e65867da5544bd62fc0fd81d91148c3f85de6  /image/bin/perl
+c3e271bcefe1389a8e96a9a6b1cdec7d5aaa421f0dbea9b37c542bba5ab85eba  /usr/bin/perl
--- a/sysa/perl-5.6.2/files/config.h
+++ b/sysa/perl-5.6.2/files/config.h
@ -1,9 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 // SPDX-License-Identifier: GPL-3.0-or-later

 #define MEM_ALIGNBYTES 8
-#define BIN "/image/bin"
+#define BIN "/usr/bin"
 #define BYTEORDER 0x4321
 #define CPPSTDIN "tcc -E"
 #define CPPMINUS "-"
@ -54,11 +55,11 @@
 #define INTSIZE 4
 #define Off_t off_t

-#define PRIVLIB "/image/lib/perl5"
+#define PRIVLIB "/usr/lib/perl5"

 #define _(args) args

-#define SCRIPTDIR "/image/bin"
+#define SCRIPTDIR "/usr/bin"

 #define SIG_NAME "ZERO","HUP","INT","QUIT","ILL","TRAP","IOT","BUS","FPE","KILL","USR1","SEGV","USR2","PIPE","ALRM","TERM","STKFLT","CHLD","CONT","STOP","TSTP","TTIN","TTOU","URG","XCPU","XFSZ","VTALRM","PROF","WINCH", "IO", "POLL", "PWR", "SYS", "UNUSED", 0
 #define SIG_NUM 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 0
@ -68,8 +69,8 @@
 #define STDCHAR char
 #define Uid_t uid_t

-#define LOC_SED "/image/bin/sed"
-#define ARCHLIB "/image/lib/perl5/"
+#define LOC_SED "/usr/bin/sed"
+#define ARCHLIB "/usr/lib/perl5/"

 #define CAT2(a,b) a##b
 #define STRINGIFY(a) "a"
@ -95,7 +96,7 @@

 #define SH_PATH "/bin/sh"
 #define ARCHNAME "i386-linux"
-#define BIN_EXP "/image/bin"
+#define BIN_EXP "/usr/bin"

 #define NVSIZE 8 /* sizeof(double) */
 #define UVSIZE 4 /* sizeof(long) on i386 */
--- a/sysa/perl5.004_05/checksums
+++ b/sysa/perl5.004_05/checksums
@ -1 +1 @@
-9ac9ba6fcf0f33b2dcc9b46c8df84fcd7eab7120575f6a4bc506d06b87493265  /image/bin/perl
+5aed524d856cdddc6d93412906a3b1d59c3b878748a0eaa0ffcf4f97c2a912a9  /usr/bin/perl
--- a/sysa/perl5.004_05/files/config.h
+++ b/sysa/perl5.004_05/files/config.h
@ -1,9 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 // SPDX-License-Identifier: GPL-3.0-or-later

 #define MEM_ALIGNBYTES 8
-#define BIN "/image/bin"
+#define BIN "/usr/bin"
 #define BYTEORDER 0x4321
 #define CPPSTDIN "tcc -E"
 #define CPPMINUS "-"
@ -50,13 +51,13 @@
 #define INTSIZE 4
 #define Off_t off_t

-#define PRIVLIB "/image/lib/perl5"
+#define PRIVLIB "/usr/lib/perl5"

 #define _(args) args

 #define RANDBITS 31

-#define SCRIPTDIR "/image/bin"
+#define SCRIPTDIR "/usr/bin"

 #define SIG_NAME "ZERO","HUP","INT","QUIT","ILL","TRAP","IOT","BUS","FPE","KILL","USR1","SEGV","USR2","PIPE","ALRM","TERM","STKFLT","CHLD","CONT","STOP","TSTP","TTIN","TTOU","URG","XCPU","XFSZ","VTALRM","PROF","WINCH", "IO", "POLL", "PWR", "SYS", "UNUSED"
 #define SIG_NUM 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
@ -66,8 +67,8 @@
 #define STDCHAR char
 #define Uid_t uid_t

-#define LOC_SED "/image/bin/sed"
-#define ARCHLIB "/image/lib/perl5/"
+#define LOC_SED "/usr/bin/sed"
+#define ARCHLIB "/usr/lib/perl5/"

 #define CAT2(a,b) a##b
 #define Gconvert(x,n,t,b) gcvt((x),(n),(b))
@ -92,5 +93,5 @@

 #define SH_PATH "/bin/sh"
 #define ARCHNAME "i386-linux"
-#define BIN_EXP "/image/bin"
+#define BIN_EXP "/usr/bin"

--- a/sysa/perl5.005_03/checksums
+++ b/sysa/perl5.005_03/checksums
@ -1 +1 @@
-22b9eff9a325b62387471a1670b508a8b199eb6f3e838eb80428bb21676b4db1  /image/bin/perl
+f1b517eb1e975a960ab2f1384fe6a48be28b782462ab63fe89d2c5b00bf83eb4  /usr/bin/perl
--- a/sysa/perl5.005_03/files/config.h
+++ b/sysa/perl5.005_03/files/config.h
@ -1,9 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>

 // SPDX-License-Identifier: GPL-3.0-or-later

 #define MEM_ALIGNBYTES 8
-#define BIN "/image/bin"
+#define BIN "/usr/bin"
 #define BYTEORDER 0x4321
 #define CPPSTDIN "tcc -E"
 #define CPPMINUS "-"
@ -50,13 +51,13 @@
 #define INTSIZE 4
 #define Off_t off_t

-#define PRIVLIB "/image/lib/perl5"
+#define PRIVLIB "/usr/lib/perl5"

 #define _(args) args

 #define RANDBITS 31

-#define SCRIPTDIR "/image/bin"
+#define SCRIPTDIR "/usr/bin"

 #define SIG_NAME "ZERO","HUP","INT","QUIT","ILL","TRAP","IOT","BUS","FPE","KILL","USR1","SEGV","USR2","PIPE","ALRM","TERM","STKFLT","CHLD","CONT","STOP","TSTP","TTIN","TTOU","URG","XCPU","XFSZ","VTALRM","PROF","WINCH", "IO", "POLL", "PWR", "SYS", "UNUSED"
 #define SIG_NUM 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
@ -66,8 +67,8 @@
 #define STDCHAR char
 #define Uid_t uid_t

-#define LOC_SED "/image/bin/sed"
-#define ARCHLIB "/image/lib/perl5/"
+#define LOC_SED "/usr/bin/sed"
+#define ARCHLIB "/usr/lib/perl5/"

 #define CAT2(a,b) a##b
 #define Gconvert(x,n,t,b) gcvt((x),(n),(b))
@ -92,5 +93,5 @@

 #define SH_PATH "/bin/sh"
 #define ARCHNAME "i386-linux"
-#define BIN_EXP "/image/bin"
+#define BIN_EXP "/usr/bin"

--- a/sysa/pkg-config-0.29.2/checksums
+++ b/sysa/pkg-config-0.29.2/checksums
@ -1 +1 @@
-95bfa9867c273ae5e5ff8126b377952907b33ff00dd1cf0059aa587c1dfc2ec5  /image/bin/pkg-config
+95bfa9867c273ae5e5ff8126b377952907b33ff00dd1cf0059aa587c1dfc2ec5  /usr/bin/pkg-config
--- a/sysa/sed-4.0.9/checksums/pass1
+++ b/sysa/sed-4.0.9/checksums/pass1
@ -1 +1 @@
-a29789a4a0150cbc7ed718ece238cad4c3863c794c8825f0743bc6cf1838b4a8  /image/bin/sed
+a29789a4a0150cbc7ed718ece238cad4c3863c794c8825f0743bc6cf1838b4a8  /usr/bin/sed
--- a/sysa/sed-4.0.9/checksums/pass2
+++ b/sysa/sed-4.0.9/checksums/pass2
@ -1 +1 @@
-de7d06a5c0b0a4b52307771f60dd711d0ae9ae0b14562ad6d26942785aaf0909  /image/bin/sed
+de7d06a5c0b0a4b52307771f60dd711d0ae9ae0b14562ad6d26942785aaf0909  /usr/bin/sed
--- a/sysa/stage0-posix/checksums
+++ b/sysa/stage0-posix/checksums
@ -1,12 +1,12 @@
-75ce25fae5c4d18bb89240e5f83f96fe70a9a6b4870824bf74c3d9977916af42  /after/bin/blood-elf
-d5b1b6da29eec7d0f9592027e752fc65454068d1cbc1325d27d5b9275c4be3d7  /after/bin/catm
-2dd399c02f36b1fe345128d1723b01bc1eb2820336fd5b54a37fae54196a1de3  /after/bin/chmod
-574c6bbed1fa4cf41f1ef2115a147549a869e73e7cdce6716168033038e38490  /after/bin/get_machine
-c37e1e4dc58fbafca1a178e63db3cc0b5aaf4fccd99c3011a4b8546129a468fa  /after/bin/hex2
-a214c6236a810c8cb0d6291e156bb9a35c955cc18d74ece6314a89246bbf1cd7  /after/bin/kaem
-0961b730018553a779c20eb0693d53c9271b1e1f967e9455df678344006b531e  /after/bin/M1
-f44564db06bb910f5c8e3c99a3e28f86eee5f30863ee7ec06a945b5cdc72e590  /after/bin/M2-Planet
-d2e38ce7eab153cb2a019de92d12f1afc81f3ca0d4e068597fdab472250c7408  /after/bin/mes-m2
-3892d2e1c9e0a248d70afd942d4a580fc228799385d32712eacc53a216992593  /after/bin/sha256sum
-98c51ed8b5d3453c4a7eceab6b44815abb7bd306b4fd3b2375861e924c2cf83f  /after/bin/ungz
-9a918b28c5929fc4156a0203887dc4bac40498b38491d1f3e0c58d6755d589f5  /after/bin/untar
+75ce25fae5c4d18bb89240e5f83f96fe70a9a6b4870824bf74c3d9977916af42  /usr/bin/blood-elf
+d5b1b6da29eec7d0f9592027e752fc65454068d1cbc1325d27d5b9275c4be3d7  /usr/bin/catm
+2dd399c02f36b1fe345128d1723b01bc1eb2820336fd5b54a37fae54196a1de3  /usr/bin/chmod
+574c6bbed1fa4cf41f1ef2115a147549a869e73e7cdce6716168033038e38490  /usr/bin/get_machine
+c37e1e4dc58fbafca1a178e63db3cc0b5aaf4fccd99c3011a4b8546129a468fa  /usr/bin/hex2
+72ff0b03ac1e389a1fcdd2bdde2e7ff4ff5be131b4ae4ccf8378da88258fbc6d  /usr/bin/kaem
+0961b730018553a779c20eb0693d53c9271b1e1f967e9455df678344006b531e  /usr/bin/M1
+f44564db06bb910f5c8e3c99a3e28f86eee5f30863ee7ec06a945b5cdc72e590  /usr/bin/M2-Planet
+d2e38ce7eab153cb2a019de92d12f1afc81f3ca0d4e068597fdab472250c7408  /usr/bin/mes-m2
+3892d2e1c9e0a248d70afd942d4a580fc228799385d32712eacc53a216992593  /usr/bin/sha256sum
+98c51ed8b5d3453c4a7eceab6b44815abb7bd306b4fd3b2375861e924c2cf83f  /usr/bin/ungz
+9a918b28c5929fc4156a0203887dc4bac40498b38491d1f3e0c58d6755d589f5  /usr/bin/untar
--- a/sysa/tar-1.12/checksums
+++ b/sysa/tar-1.12/checksums
@ -1 +1 @@
-5b50a68538fb8c220dedf4cad8f707f29d853d1ff675db3b95a5ca0eb11f6a54  /image/bin/tar
+5b50a68538fb8c220dedf4cad8f707f29d853d1ff675db3b95a5ca0eb11f6a54  /usr/bin/tar
--- a/sysa/tcc-0.9.26/checksums
+++ b/sysa/tcc-0.9.26/checksums
@ -1,13 +1,13 @@
-f24cef474ee688934c2b2f1389d0d4b3182a488cb27ab07c018520f5c955b32b  /image/bin/mes-tcc
-cf64a4511478a34b2f68834912069e1dc127ce5acdf4aa065bf2e8c7b76ce15d  /image/bin/boot0-tcc
-69d6326b7f9e29dfcb3238abcdc9e068ce49b860e38ec8506126878c7fa39c48  /image/bin/boot1-tcc
-2eabc4078b76a59a8f2882de7d900f52546987a65fbcd4b4c312e04fc2263616  /image/bin/boot2-tcc
-a5cf05c81d9834378754d119192194d97f74c0eb6e760068809bce1b25f847bc  /image/bin/boot3-tcc
-ae9f716829dc661e8d1d85e7823421517b6b443756d32b49a31f0621c6290b12  /image/bin/boot4-tcc
-54ec2881fdc0d3508d401aca181bb7975f300ce788feeb73ece8a7629e089fc2  /image/bin/tcc
-37e53f55da1a8ca5452016528727b0c3e4b4e60690f1c5ed1dfc7ecca6e56581  /image/lib/mes/libc.a
-12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /image/lib/mes/libgetopt.a
-44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49  /image/lib/mes/crt1.o
-09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /image/lib/mes/crti.o
-461ca1494737fab86fe1c1d3addeaf9d0ece413e353abcdea8674db3f700cda3  /image/lib/mes/crtn.o
-ac11f09698f092ed76ae40ebcd56cf3f2b903ea1333ef7537a00673dd6f73da7  /image/lib/mes/tcc/libtcc1.a
+ea96f7ad93ee4f7ed33b45b5055dbd95280a7fb315d8a205c703b55d1fe127ca  /usr/bin/mes-tcc
+904d73ae12fcf3994c8a3a63e35a8ee2ce58cd4d02d7826c5dc09497cd257257  /usr/bin/boot0-tcc
+887eb2efaa99d70a9a6c238a84d3d47242111d0c15518ccedb7c5aa557809ad2  /usr/bin/boot1-tcc
+f3190d3010d105fe531df5c3c881f2a80b45206fcf50e958cfc92827bcdf53ca  /usr/bin/boot2-tcc
+d5d34dcd03047d96f1b5fcf6f5ec593d93aceee7c8876747d17a241b8ecd3ac1  /usr/bin/boot3-tcc
+8ac74ae5020d5536ce88060513f9e287058c3c518c9b72f6f76a1f75ce91f349  /usr/bin/boot4-tcc
+0133401e766ace30103593a067c3234698bbcfed9e839f932f502e74a8eb593c  /usr/bin/tcc
+37e53f55da1a8ca5452016528727b0c3e4b4e60690f1c5ed1dfc7ecca6e56581  /usr/lib/mes/libc.a
+12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /usr/lib/mes/libgetopt.a
+44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49  /usr/lib/mes/crt1.o
+09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /usr/lib/mes/crti.o
+461ca1494737fab86fe1c1d3addeaf9d0ece413e353abcdea8674db3f700cda3  /usr/lib/mes/crtn.o
+ac11f09698f092ed76ae40ebcd56cf3f2b903ea1333ef7537a00673dd6f73da7  /usr/lib/mes/tcc/libtcc1.a
--- a/sysa/tcc-0.9.27/checksums/tcc-0.9.27
+++ b/sysa/tcc-0.9.27/checksums/tcc-0.9.27
@ -1 +1 @@
-fa0b1b15830e431770edc4b3d40b37879c59af1ebd6f1cedcdf67bb808e53f8e  /image/bin/tcc
+287056807b7cd70ecded9201ef7afa0d71fb1cd1e4effc24e38aaf7580c5e442  /usr/bin/tcc
--- a/sysa/tcc-0.9.27/checksums/tcc-meslibc-rebuild
+++ b/sysa/tcc-0.9.27/checksums/tcc-meslibc-rebuild
@ -1 +1 @@
-ee2329aaab0776b8b701f81f82baa6ced5d2cdd7738f517d3210f9c7cb6ab5e6  /image/bin/tcc
+ca13d906c1e977821021469df2296682f22f5caf1a998548c88e07f1e48412a5  /usr/bin/tcc
--- a/sysa/tcc-0.9.27/checksums/tcc-musl-pass1
+++ b/sysa/tcc-0.9.27/checksums/tcc-musl-pass1
@ -1,2 +1,2 @@
-ec1e79231d889bdb7edad9986071586809b5facd312967864aeced473bb49f6c  /image/bin/tcc-musl
-dd2f569a10a5bce7a8d264a9a04a86be9c3c1293df64c907370a8d5088c21e65  /image/lib/musl/tcc/libtcc1.a
+0ce457c089aa5500f8d13d6f1e9485dd42847447f2b13fd713e9beac82557534  /usr/bin/tcc-musl
+dd2f569a10a5bce7a8d264a9a04a86be9c3c1293df64c907370a8d5088c21e65  /usr/lib/musl/tcc/libtcc1.a
--- a/sysa/tcc-0.9.27/checksums/tcc-musl-pass2
+++ b/sysa/tcc-0.9.27/checksums/tcc-musl-pass2
@ -1 +1 @@
-cf12d39aeb067daa07e3d952e06d701c86524004754364fc74ddcf2b4a68034d  /image/bin/tcc-musl
+38f749fa85341cd12bd705c3a5f740c37308b4a6c9e162e53d64ed6228ef8e53  /usr/bin/tcc-musl
--- a/sysa/tcc-0.9.27/checksums/tcc-musl-pass3
+++ b/sysa/tcc-0.9.27/checksums/tcc-musl-pass3
@ -1 +1 @@
-2192e71893a41f0f6b8ad68f2166380a4a7acea0921cb98c09db6c27ce01cb70  /image/bin/tcc-musl
+d98c888c2514525cce3af4eee2d202d2c8828279c6fc3134cecb5507e19948fe  /usr/bin/tcc-musl
--- a/sysa/texinfo-6.7/checksums
+++ b/sysa/texinfo-6.7/checksums
@ -1,8 +0,0 @@
-6b7360dac62bb1fbfc1cb9a52aae4b4578802f7e936dedc57128637a9a3447ea  /image/bin/install-info
-ce7a5fa1b123d2c04761a942d0786ff410330cd0428119fb477a5ee6cbde7b89  /image/bin/makeinfo
-93fafa11310722900c521df7a831faa5827b542bad7feebbf2b3d67dc2c01ffe  /image/bin/pdftexi2dvi
-3f75371015b97159399be11122a07c0b9e63386531eaa61a8ed9bb9f536c4b7d  /image/bin/pod2texi
-ce7a5fa1b123d2c04761a942d0786ff410330cd0428119fb477a5ee6cbde7b89  /image/bin/texi2any
-0f0a456c939940453e30668f23f5dbf9151d56088117ef03eec817d3e229f29d  /image/bin/texi2dvi
-93fafa11310722900c521df7a831faa5827b542bad7feebbf2b3d67dc2c01ffe  /image/bin/texi2pdf
-09490236e9a02747d0409c898d9a21abecfdf6612e755cb23954b378097b30f9  /image/bin/texindex
--- a/sysa/texinfo-6.7/import-gnulib.sh
+++ b/sysa/texinfo-6.7/import-gnulib.sh
@ -1,37 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-../gnulib-b81ec69/gnulib-tool --import \
-    --lib=libgnu \
-    --source-base=gnulib/lib \
-    --m4-base=gnulib/m4 \
-    --doc-base=doc \
-    --tests-base=tests \
-    --aux-dir=build-aux \
-    --conditional-dependencies \
-    --no-libtool \
-    --macro-prefix=gl \
-    --no-vc-files \
-    argz \
-    getopt-gnu \
-    gettext-h \
-    iconv \
-    mbchar \
-    mbiter \
-    mbscasecmp \
-    mbschr \
-    mbslen \
-    mbsncasecmp \
-    mbsstr \
-    mbswidth \
-    memrchr \
-    regex \
-    stdarg \
-    strcasestr \
-    strdup-posix \
-    strerror \
-    vasprintf \
-    xalloc
--- a/sysa/texinfo-6.7/texinfo-6.7.sh
+++ b/sysa/texinfo-6.7/texinfo-6.7.sh
@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    find . -name '*.mo' -delete
-    find . -name '*.gmo' -delete
-
-    ../../import-gnulib.sh
-    autoreconf -fi
-}
-
-src_configure() {
-    ./configure --prefix="${PREFIX}"
-}
--- a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
+++ b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
@ -11,6 +11,8 @@ src_prepare() {

 src_configure() {
    ./configure --prefix=${PREFIX} \
+        --bindir="${PREFIX}/bin" \
+        --sbindir="${PREFIX}/sbin" \
        --target=i386-unknown-linux-gnu \
        --host=i386-unknown-linux-gnu \
        --build=i386-unknown-linux-gnu \
--- a/sysa/zlib-1.2.11/checksums
+++ b/sysa/zlib-1.2.11/checksums
@ -1 +0,0 @@
-8e8255b1f90615cbb69f45697edcfd17dae492e090ca31c9d5390cb2d076e1b4  /image/lib/musl/libz.a
--- a/sysa/zlib-1.2.11/zlib-1.2.11.sh
+++ b/sysa/zlib-1.2.11/zlib-1.2.11.sh
@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_configure() {
-    ./configure --prefix="${PREFIX}" --libdir="${PREFIX}/lib/musl" --static
-}
				`@ -1 +0,0 @@`
				`1f2a11dd9afd812a40ab44e5297ef375daddeda589c79d08be65958430c4ef82 /image/bin/gperf`
				`@ -1 +0,0 @@`
				`0254b0de266d8dd8de847315c5ee9602e0ae7875c75e762bf043bb13510e628f /after/boot/linux-2.6.16.62`
				`@ -1 +0,0 @@`
				`b887260c73947c5293804f42cbfcd2d48728f7ed395fdfe5ffde0aa96e381fd1 /image/bin/patch`
				`@ -1 +0,0 @@`
				`8e8255b1f90615cbb69f45697edcfd17dae492e090ca31c9d5390cb2d076e1b4 /image/lib/musl/libz.a`