wip

Without this, one of my boards fails to reboot from USB drive due to
slow USB enumeration. Rootwait is not needed during the Fiwix -> Linux
jump, because we use an initramfs there, and the init scripts already
wait for USB drives to show up. Linux->Linux kexec, used with a custom
early kernel, might need it, so add it there as well to be safe.

builder-hex0

@@ -1 +1 @@
-Subproject commit b5ea0ddf31388cdc0f280745d64c010f6cf783e0
+Subproject commit a2781242d19e6be891b453d8fa827137ab5db31a

lib/generator.py

@@ -78,7 +78,7 @@ class Generator():
             shutil.copy2(os.path.join(self.git_dir, 'seed', 'preseeded.kaem'),
                          os.path.join(self.target_dir, 'kaem.x86'))
         else:
-            self.stage0_posix()
+            self.stage0_posix(kernel_bootstrap)
             self.seed()
 
         self.steps()
@@ -109,10 +109,12 @@ class Generator():
 
         shutil.copytree(os.path.join(self.git_dir, 'steps'), os.path.join(self.target_dir, 'steps'))
 
-    def stage0_posix(self):
+    def stage0_posix(self, kernel_bootstrap=False):
         """Copy in all of the stage0-posix"""
         stage0_posix_base_dir = os.path.join(self.git_dir, 'seed', 'stage0-posix')
         for entry in os.listdir(stage0_posix_base_dir):
+            if kernel_bootstrap and entry == 'bootstrap-seeds':
+                continue
             orig = os.path.join(stage0_posix_base_dir, entry)
             target = os.path.join(self.target_dir, entry)
             if os.path.isfile(orig):
@@ -120,10 +122,12 @@ class Generator():
             else:
                 shutil.copytree(orig, target)
 
-        arch = stage0_arch_map.get(self.arch, self.arch)
-        kaem_optional_seed = os.path.join(self.git_dir, 'seed', 'stage0-posix', 'bootstrap-seeds',
-                                          'POSIX', arch, 'kaem-optional-seed')
-        shutil.copy2(kaem_optional_seed, os.path.join(self.target_dir, 'init'))
+        if not kernel_bootstrap:
+            arch = stage0_arch_map.get(self.arch, self.arch)
+            kaem_optional_seed = os.path.join(self.git_dir, 'seed', 'stage0-posix',
+                                              'bootstrap-seeds', 'POSIX', arch,
+                                              'kaem-optional-seed')
+            shutil.copy2(kaem_optional_seed, os.path.join(self.target_dir, 'init'))
 
     def seed(self):
         """Copy in extra seed files"""
@@ -193,17 +197,32 @@ class Generator():
         self.output_tree(image_file, '.')
 
         # Add commands to kick off stage0-posix
-        cmd = ' '.join(['hex0',
-                        './bootstrap-seeds/POSIX/x86/hex0_x86.hex0',
-                        './bootstrap-seeds/POSIX/x86/hex0-seed\n'])
+        cmd = ' '.join(['src',
+                        '0',
+                        '/bootstrap-seeds\n'])
+        image_file.write(cmd.encode())
+        cmd = ' '.join(['src',
+                        '0',
+                        '/bootstrap-seeds/POSIX\n'])
+        image_file.write(cmd.encode())
+        cmd = ' '.join(['src',
+                        '0',
+                        '/bootstrap-seeds/POSIX/x86\n'])
         image_file.write(cmd.encode())
         cmd = ' '.join(['hex0',
-                        './bootstrap-seeds/POSIX/x86/kaem-minimal.hex0',
-                        './bootstrap-seeds/POSIX/x86/kaem-optional-seed\n'])
+                        '/x86/hex0_x86.hex0',
+                        '/bootstrap-seeds/POSIX/x86/hex0-seed\n'])
         image_file.write(cmd.encode())
-        cmd = ' '.join(['./bootstrap-seeds/POSIX/x86/kaem-optional-seed', './kaem.x86\n'])
+        cmd = ' '.join(['hex0',
+                        '/x86/kaem-minimal.hex0',
+                        '/bootstrap-seeds/POSIX/x86/kaem-optional-seed\n'])
+        image_file.write(cmd.encode())
+        cmd = ' '.join(['hex0',
+                        '/x86/kaem-minimal.hex0',
+                        '/init\n'])
+        image_file.write(cmd.encode())
+        cmd = ' '.join(['/bootstrap-seeds/POSIX/x86/kaem-optional-seed', '/kaem.x86\n'])
         image_file.write(cmd.encode())
-
         os.chdir(save_cwd)
 
     def create_builder_hex0_disk_image(self, image_file_name, size):

rootfs.py

@@ -28,6 +28,8 @@ def create_configuration_file(args):
     """
     config_path = os.path.join('steps', 'bootstrap.cfg')
     with open(config_path, "w", encoding="utf_8") as config:
+        config.write(f"ARCH={args.arch}\n")
+        config.write(f"ARCH_DIR={stage0_arch_map.get(args.arch, args.arch)}\n")
         config.write(f"FORCE_TIMESTAMPS={args.force_timestamps}\n")
         config.write(f"CHROOT={args.chroot or args.bwrap}\n")
         config.write(f"UPDATE_CHECKSUMS={args.update_checksums}\n")
@@ -225,6 +227,7 @@ print(shutil.which('chroot'))
                                   '--dev-bind', '/dev/urandom', '/dev/urandom',
                                   '--dev-bind', '/dev/ptmx', '/dev/ptmx',
                                   '--dev-bind', '/dev/tty', '/dev/tty',
+                                  '--ro-bind', '/usr/bin/qemu-riscv64', '/usr/bin/qemu-riscv64',
                                   '--tmpfs', '/dev/shm',
                                   '--proc', '/proc',
                                   '--bind', '/sys', '/sys',

seed/seed.kaem

@@ -30,6 +30,7 @@ cp /${ARCH_DIR}/bin/sha256sum ${BINDIR}/sha256sum
 cp /${ARCH_DIR}/bin/unbz2 ${BINDIR}/unbz2
 cp /${ARCH_DIR}/bin/ungz ${BINDIR}/ungz
 cp /${ARCH_DIR}/bin/untar ${BINDIR}/untar
+cp /${ARCH_DIR}/bin/unxz ${BINDIR}/unxz
 cp /${ARCH_DIR}/bin/cp ${BINDIR}/cp
 cp /${ARCH_DIR}/bin/replace ${BINDIR}/replace
 cp /${ARCH_DIR}/bin/rm ${BINDIR}/rm
@@ -50,6 +51,7 @@ chmod 755 ${BINDIR}/sha256sum
 chmod 755 ${BINDIR}/unbz2
 chmod 755 ${BINDIR}/ungz
 chmod 755 ${BINDIR}/untar
+chmod 755 ${BINDIR}/unxz
 chmod 755 ${BINDIR}/replace
 chmod 755 ${BINDIR}/rm
 
@@ -58,7 +60,7 @@ M2LIBC_PATH=/M2libc
 
 # mes envars
 NYACC_PKG=nyacc-1.00.2
-MES_PKG=mes-0.25
+MES_PKG=mes-wip
 MES_PREFIX=${SRCDIR}/${MES_PKG}/build/${MES_PKG}
 GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${SRCDIR}/${MES_PKG}/build/${NYACC_PKG}/module
 

seed/stage0-posix

@@ -1 +1 @@
-Subproject commit a5c382e9ab5d070d192841122e453ca72754eec1
+Subproject commit 63fd7767db0651b703b8942cfc0c92989a3e4b25

steps/SHA256SUMS.pkgs

@@ -35,13 +35,13 @@ ca7403a7503e8f3bb55e6c5bd54571b8c061b11c96e50ee89e006df6011d1518  bzip2-1.0.8_0.
 7450bb38caaa633f8c11269fed44eb680c6ba03bb0e19c18fce3b2450f80e358  coreutils-5.0_0.tar.bz2
 c95fd8c51c3bfbd4d08a4a50d0033ee85394e6efe4ff82703c050e4dbc4347bf  coreutils-6.10_0.tar.bz2
 9fa31a4aeaa5132205efb796c8f546c94c1cfef6b5c27e64f6ebe06ca0360e67  coreutils-9.4_0.tar.bz2
-6a10f5258650ae75e92eb7aa1a5e6107b72c8b6419a4f64272262a1545c43161  curl-8.5.0_0.tar.bz2
-f9efd6600ceb91918078078ff44a33f2a4fb4a59edb804866aebd288c2cfb24e  curl-8.5.0_1.tar.bz2
-1d4dec2d1885a6b5499a0f0d55e9c2c65dab532c4c593d848b6a542f67789627  dhcpcd-10.0.1_0.tar.bz2
+abd629e5675196c39dae00afbe23e2116bbd277be1d82214e2ec557a3b03994f  curl-8.5.0_0.tar.bz2
+a4473a15de63a1d8ed0a9344f81b3926ce2b1324e48c2574b0042a91384aa5c7  curl-8.5.0_1.tar.bz2
+9534d834b018343b8335d0ef0b5faff3ee18e4ecbecf43a2a80deb972283f5d6  dhcpcd-10.0.1_0.tar.bz2
 abb9f6fe46c57ea809100b71497e04905deaad345d64485532bf6ef7f2a07f2c  diffutils-2.7_0.tar.bz2
 41e3129b974391fe4ace69914fdef9b0fe72c6f5d87d495750fb89bdd999fa01  diffutils-3.10_0.tar.bz2
 bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1  dist-3.5-236_0.tar.bz2
-3a4c5143a241364019afd39af067f1e8433bab78b04096870d9bf2c70ec6ded8  e2fsprogs-1.45.7_0.tar.bz2
+26c0835a8b9be115082a2866e906363947528169c7274bd3b82752df77e99f11  e2fsprogs-1.45.7_0.tar.bz2
 9c6f7e156f299f1d0948537e28f00d40e727a3debae3cce158e9bce827136214  ed-1.4_0.tar.bz2
 0061d240f9bb2bb534db7003ddcc4eae9981954ad72e8f41ff1d76dc449ebd37  file-5.44_0.tar.bz2
 eec07e0d710ed3dd8d0ba6a1ec6ca9f1fa3a611bbb225195435679175317bf90  findutils-4.2.33_0.tar.bz2
@@ -65,10 +65,10 @@ dc67fc1b132fa3945349efe74c5b2197bd0b6babf4d29d2deddd04f09d9af680  gettext-0.21_0
 e2a85aad6d51e52c9a30afeed058f95172fde1215f77243549274672990f6237  guile-3.0.9_0.tar.bz2
 6585ae3bc8149ec0e3fba766278fa30e2d7f0e7d1b9a9a4a457e0afa15b109c9  gzip-1.13_0.tar.bz2
 8d2015b87337abbf287f7a39ee4cf53514120b5d3e90a93fe7d533dcc43f14fa  help2man-1.36.4_0.tar.bz2
-f650c3b24de6edd49cd662c9e9ce11f7b0b5ea6df66d561b46a032b08fc34faa  kbd-1.15_0.tar.bz2
+ea5639dc6198c5f243362a1a7adfbea0cb779e085975712a1b410e82d7e0cf84  kbd-1.15_0.tar.bz2
 50a0f881161c68fe7c9ec6836b11a905b0d54e08e99b2476e8d1f5ac3212769e  kexec-linux-1.0.0_0.tar.bz2
-1be7bf0319635b8bd22fd3c1a5a88ea267730a9a2e3cfff37473a5fea0779efb  kexec-tools-2.0.22_0.tar.bz2
-453c10220178f097e1ab26fac6dffbee63b61890cdb8d7d24dcd6acad6ad08a3  libarchive-3.5.2_0.tar.bz2
+fc784d2c46ffe91e7d54150022c9d2687140e90e3019c1d6799f875f22d99d2e  kexec-tools-2.0.22_0.tar.bz2
+e4dcdabf540a9e51a555616abff8ec2fdee5bb40bb05ce702b5410239dd5d7d8  libarchive-3.5.2_0.tar.bz2
 36550df491767bb24d2ccab304ce70a3b4956e7c0c0e0c343d922fd57cdafbdd  libatomic_ops-7.6.10_0.tar.bz2
 fea96776b929569b98bc1740a9977cf8c0eff1d999a08d766bcc0f40c7b1380c  libbsd-0.11.8_0.tar.bz2
 b39826742e236890f3562cdf19492e7ef4224b271f3e75ddeab1f07982b03ebe  libffi-3.3_0.tar.bz2
@@ -76,10 +76,10 @@ b39826742e236890f3562cdf19492e7ef4224b271f3e75ddeab1f07982b03ebe  libffi-3.3_0.t
 daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29  libtool-2.2.4_0.tar.bz2
 6cefa575362149620f8008a32c8af54f0198a18bc6ab910bd3cead196c1507d7  libtool-2.4.7_0.tar.bz2
 503007bbcddcf4e49d26514c59b4c9501f8b42f0c994a59dfdc388b1ae6b7900  libunistring-0.9.10_0.tar.bz2
-576c04a4b2ccbfe6b48f5f16e8bd59469e359bdc77458ed82a4025da98ad6dcb  linux-4.9.10_0.tar.bz2
-d15c922973c15a8206e09020e8cfe6a78f7e93614de212f2b37ff80163799c6c  linux-headers-4.9.10_0.tar.bz2
-bd3885a389d3e058081e099850f95aa7938ce1d9b88a187aea6b7196124fbcfe  m4-1.4.7_0.tar.bz2
+05a99e5404bc743570abf514d09a89a719d9443e0e6f196ce92c47a2be774a8a  linux-4.14.336_0.tar.bz2
+1d88015de1be5416d4794559962c1c700d72b877cc0ce2a47b28b078d11b2075  linux-headers-4.14.336_0.tar.bz2
 78b0cf6d9312e53c613186cbddd5f747310f375c1f322f33a6ac33682d2f3389  m4-1.4.19_0.tar.bz2
+bd3885a389d3e058081e099850f95aa7938ce1d9b88a187aea6b7196124fbcfe  m4-1.4.7_0.tar.bz2
 e69554b0a77b419ddd5d0a0e418ba4005ecd0f6784c92a6928a0270bd929a098  make-3.82_0.tar.bz2
 6d24960d6a987f68a7e0e3abf6edb52d2e0fe4c86f6ba45327e9634dbf7d40b4  make-4.2.1_0.tar.bz2
 17cd976bc0f6e897c6fffe43dd7c55d93ce0adadf1b4dc72925b80e2d266519f  mpc-1.2.1_0.tar.bz2
@@ -91,37 +91,37 @@ d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079  musl-1.1.24_2.
 6dc5e763b747b66f72692c6820d7f46b7f4cf2e2fe05229a1d01c03919c1c936  musl-1.2.4_1.tar.bz2
 820203286127e7c22cee9f1b3cff664431f10d14c3f22f00b3e771fd849fd449  musl-1.2.4_2.tar.bz2
 a18c4b2e5de2bfe5bb3ee9d360484fcfebad3df042f1859d4aa333dd60f55e56  opendoas-6.8.2_0.tar.bz2
-c490016e49bbf77e7f63071f7aa60e8290a0c67f017846def1c3f65bd10d5712  openssl-1.1.1l_0.tar.bz2
+b1acdc394c2dd42f01046480db07da6b0393bf76b198abf099c4877e5e3b869e  openssl-1.1.1l_0.tar.bz2
 71864d042cdc564b65eab21360902c714e9b43f80a19689c5600589529b267e7  patch-2.7.6_0.tar.bz2
 5ae7fe43d62d1064c123d9813017015e5e8d5107d0e70f0199576141416ff81d  perl-5.000_0.tar.bz2
 4994c55e3832649600f190079bd4779c463478a092b167098b1d00eff3358fbe  perl-5.003_0.tar.bz2
+74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6  perl-5.10.1_0.tar.bz2
+c6c3d729cf36b820f9a671130b84c83fd384f38f639be63804e90c3a1f21d3ab  perl-5.32.1_0.tar.bz2
+101a791b6843b997ec10d5ce6dc32af2637f687772674eb6f1cdc1c8ff836a03  perl-5.6.2_0.tar.bz2
 ae6c84e55c2d9bcd7b80bf780ae6921fe890608123c9ba904e1b7d90759ade3d  perl5.004-05_0.tar.bz2
 8cedd2240bbbd5bca65a1362998ed73884756aa7ff5208226d3fa22c68868052  perl5.005-03_0.tar.bz2
-74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6  perl-5.10.1_0.tar.bz2
-bbbfde31441fab7fe8b825409fae8b2cd1032950d8f5a32fb8b9cf1555e11a70  perl-5.32.1_0.tar.bz2
-101a791b6843b997ec10d5ce6dc32af2637f687772674eb6f1cdc1c8ff836a03  perl-5.6.2_0.tar.bz2
 1b9d4260edf7b2241d10e4c4ad17d0f90047bd4bf42f2487a7133902529e9dfe  pkg-config-0.29.2_0.tar.bz2
 2f7198009e4d021d52ee4ce86241b4936fb88349c20cc8b6c286261368878c3c  python-2.0.1_0.tar.bz2
 b5d86ddc98cfbc684b03f1c84c786caaad810d5e4c7be38089f324eb3c276ad9  python-2.0.1_1.tar.bz2
 396577cdd0cc61d76420a1771c64156e49e8f9d00430c82feb88ad933b341632  python-2.3.7_0.tar.bz2
 2499cb7f10f292c3506fbf1b6a876195179ec98edfe7b8c357140137a1449492  python-2.3.7_1.tar.bz2
 2dd06364e281da421a16251fa2258df201efd180461718f5a000012c4b2bdfe5  python-2.5.6_0.tar.bz2
-52ffb1ea6f2b893a6fd26f930c8ff63f78ddcc31ac3ec9c2ddade555205aa1ef  python-3.11.1_0.tar.bz2
 3508248f299b73c50e3607c4c294d40face05170476a5026b0821aed69025863  python-3.1.5_0.tar.bz2
 12b1ffc7ec98ba8f807160b93ba69a694d5395567c3bcac1e49e8f8d1d50de43  python-3.1.5_1.tar.bz2
+fde3a6af334434b35a8db0711d33c21a96762d09ff912e19638efbdf2dc363c5  python-3.11.1_0.tar.bz2
 60b93253a2078f849f81e7e1ed6233e30702f03b1893640eee95671d814f5514  python-3.3.7_0.tar.bz2
 da7c8ec579dd225c0d8bee63d95aeeb27ac2d5a60d4eefe298508cbf86bf506c  python-3.4.10_0.tar.bz2
-0be505f63205b4bc1b1421896c610468ad1a2194bbc4c9abf58f61685c2023d1  python-3.8.16_0.tar.bz2
+4c5c08b237d1c8cfe91d6b8f36d1942bf1e8f114894a228b5969c810ea52b8c3  python-3.8.16_0.tar.bz2
 34c51d3df85585a8aee7691b3500a5c3c7442b06a6f57231b76970bdd6e99bf9  sed-4.0.9_0.tar.bz2
 e8daec00b2c2de7b18efbec057dc9290eed06668806c6f5a48914d4a5cd95eb4  sed-4.8_0.tar.bz2
-96bd9f051aa665f6836efe3642127df6987b529ed53f1c539293fc049f0f4c28  shadow-4.14.3_0.tar.bz2
+ef2f2c791c1ae74f19c98ebcd7edae6ae28bc1d9367cc3a2cdb1ac302a156cb7  shadow-4.14.3_0.tar.bz2
 912d8f344104f1322255d6210c7c7e1371413ab530b2c6796e6aa565c74bf647  tar-1.34_0.tar.bz2
 1667937d5d646f2bb7ec7ab54a23ddd65a0ae3ca7d5e597f3fbcd5163031d2ef  tcc-0.9.27_0.tar.bz2
 b20cea098c8ff635a0ce9f99430d7c9a75d081194941ab54dc92dbc8af3776a4  tcc-0.9.27_1.tar.bz2
 8e8cc802fccdb907cd74501dccce1ee85ffb0150b33b4719f86d6720f5b09a7a  tcc-0.9.27_2.tar.bz2
 d4fe9460ca561fc2f546f9730f19f541b17dac0bcc42eb190abba856588c3593  tcc-0.9.27_3.tar.bz2
 50ebaa1d8fcc4a03a43d431eb71e2f435cc8712ae47d400564df3716037d553a  texinfo-6.7_0.tar.bz2
-858f3c9b3e824d6cdff8009de171fb1ac6932adc227efd854aebf29aba0bbf7c  util-linux-2.19.1_0.tar.bz2
+59bda6faaa95782154b917a6600cdf932e08cd6bf9388ba40d801baf18e5b454  util-linux-2.19.1_0.tar.bz2
 ecdb7ffeb9256f6a9760be70969fe5dea9cde6a538cc88595281fe44340e98a1  which-2.21_0.tar.bz2
 3fade2079cc91f2c5624ff7247220059caee82e7de493332103d7a78155400b2  xz-5.4.1_0.tar.bz2
 ca8ec9876a7334f5f87e1159e0efe343b8b497ffb0dea8b548223035ecd67f9e  zlib-1.2.13_0.tar.bz2

steps/autoconf-2.64/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/autoconf/autoconf-2.64.tar.bz2 872f4cadf12e7e7c8a2414e047fdff26b517c7f1a977d72433c124d0d3acaa85
+https://mirrors.kernel.org/gnu/autoconf/autoconf-2.64.tar.xz 32d977213320b8ae76c71175305301197f2b0e04e72d70694bc3d3e2ae6c7248

steps/autoconf-2.69/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/autoconf/autoconf-2.69.tar.gz 954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969
+https://mirrors.kernel.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684

steps/automake-1.15.1/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/automake/automake-1.15.1.tar.gz 988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260
+https://mirrors.kernel.org/gnu/automake/automake-1.15.1.tar.xz af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf

steps/bash-2.05b/mk/common.mk

@@ -49,6 +49,7 @@ COMMON_CFLAGS  = \
 	-DHAVE_BZERO \
 	-DHAVE_POSIX_SIGNALS \
 	-DHAVE_GETCWD \
+	-DHAVE_RENAME \
 	-DHAVE_SYS_SIGLIST \
 	-Dendpwent\(x\)=0 \
 	-Denable_hostname_completion\(on_or_off\)=0

steps/bash-2.05b/pass1.kaem

@@ -16,8 +16,8 @@ mkdir build src
 cd build
 
 # Extract
-cp ${DISTFILES}/${pkg}.tar.gz ../src/
-gzip -d -f ../src/${pkg}.tar.gz
+cp ${DISTFILES}/${pkg}.tar.bz2 ../src/
+bzip2 -d -f ../src/${pkg}.tar.bz2
 tar xf ../src/${pkg}.tar
 rm -r ../src/
 cd ${pkg}

steps/bash-2.05b/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/bash/bash-2.05b.tar.gz ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4
+https://src.fedoraproject.org/repo/pkgs/bash/bash-2.05b.tar.bz2/f3e5428ed52a4f536f571a945d5de95d/bash-2.05b.tar.bz2 1ce4e5b47a6354531389f0adefb54dee2823227bf6e1e59a31c0e9317a330822

steps/bc-1.07.1/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/bc/bc-1.07.1.tar.gz 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
+https://mirrors.kernel.org/slackware/slackware64-15.0/source/ap/bc/bc-1.07.1.tar.xz 95396f88fc719a1bf8bd463809119526fef44a42ab9eb708335c2cb79bc801c6

steps/binutils-2.30/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/binutils/binutils-2.30.tar.bz2 efeade848067e9a03f1918b1da0d37aaffa0b0127a06b5e9236229851d9d0c09
+https://mirrors.kernel.org/gnu/binutils/binutils-2.30.tar.xz 6e46b8aeae2f727a36f0bd9505e405768a72218f1796f0d09757d45209871ae6

steps/bison-3.4.1/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/bison/bison-3.4.1.tar.gz 7007fc89c216fbfaff5525359b02a7e5b612694df5168c74673f67055f015095
+https://mirrors.kernel.org/gnu/bison/bison-3.4.1.tar.xz 27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d

steps/bzip2-1.0.8/bzip2-1.0.8.checksums

@@ -1 +1 @@
-d04adf65091f839217b5ae725df01ad9ddeb77e74cd7474b26cf2fa8962ad150  /usr/bin/bzip2
+103af2b8cb00efe5ea91266978db548a69cee5883aa6263e1f1b960448065580  /usr/bin/bzip2

steps/bzip2-1.0.8/pass1.kaem

@@ -12,12 +12,13 @@ checksum-transcriber sources
 sha256sum -c sources.SHA256SUM
 
 mkdir build src
-cd build 
+cd build
 
 # Extract
-cp ${DISTFILES}/${pkg}.tar.gz ../src/
-gzip -d -f ../src/${pkg}.tar.gz
+cp ${DISTFILES}/${pkg}.tar.xz ../src/
+unxz --file ../src/${pkg}.tar.xz --output ../src/${pkg}.tar
 tar xf ../src/${pkg}.tar
+rm -r ../src
 cd ${pkg}
 
 # Patch

steps/bzip2-1.0.8/sources

@@ -1 +1 @@
-https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
+https://mirrors.kernel.org/slackware/slackware-14.0/patches/source/bzip2/bzip2-1.0.8.tar.xz 47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f

steps/checksum-transcriber-1.0/checksum-transcriber-1.0.riscv64.checksums

@@ -1 +1 @@
-b6145df4b2a92d5ee75902f4367e7a1a5456a5cef7a2e1365610637b054c477a  /usr/bin/checksum-transcriber
+560df1e8527df9758252f6255c144cfd6b1555b9d2aa6162011204061af80ab5  /usr/bin/checksum-transcriber

steps/checksum-transcriber-1.0/checksum-transcriber-1.0.x86.checksums

@@ -1 +1 @@
-a670c810b4f94d67bd171d5a79469882c04066ea7585f31c52f4c166ad5e5ee8  /usr/bin/checksum-transcriber
+19fd50d727e8a7feba8b6e369e68287d1922d8f623a156fb113d994891e96998  /usr/bin/checksum-transcriber

steps/coreutils-5.0/pass1.kaem

@@ -20,6 +20,7 @@ cd build
 cp ${DISTFILES}/${pkg}.tar.bz2 ../src/
 bunzip2 -f ../src/${pkg}.tar.bz2
 tar xf ../src/${pkg}.tar
+rm -r ../src
 cd ${pkg}
 cp ../../mk/main.mk Makefile
 

steps/coreutils-6.10/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/coreutils/coreutils-6.10.tar.gz 1d013547889f20576460249c4210632d5314531c8477378a2e046b13a8ebeb7e
+https://mirrors.kernel.org/gnu/coreutils/coreutils-6.10.tar.lzma 8b05bba1b2726a164e444c314e3f359604b58216be704bed8f2e028449cc6204

steps/curl-8.5.0/sources

@@ -1 +1 @@
-https://curl.se/download/curl-8.5.0.tar.bz2 ce4b6a6655431147624aaf582632a36fe1ade262d5fab385c60f78942dd8d87b
+https://curl.se/download/curl-8.5.0.tar.xz 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb

steps/diffutils-2.7/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/diffutils/diffutils-2.7.tar.gz d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6
+https://dept.rpi.edu/acm/packages/diffutils/2.7/distrib/diffutils-2.7.tar.bz2 fd6c44f7cbd0a942a3f0c012365997965451197ad4faeb0b8aac1fe03192de58

steps/e2fsprogs-1.45.7/sources

@@ -1,4 +1,4 @@
-https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.7/e2fsprogs-1.45.7.tar.gz 340e9de42a12d0c26dd7527e9ef055ac85586de5c61f6273ae19f88d04e55804
+https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.7/e2fsprogs-1.45.7.tar.xz 62d49c86d9d4becf305093edd65464484dc9ea41c6ff9ae4f536e4a341b171a2
 https://www.unicode.org/Public/11.0.0/ucd/CaseFolding.txt 64f117a4749dd4a1b6c54277f63f6cf1e0eb45d290cbedaf777fbe71b8880885
 https://www.unicode.org/Public/11.0.0/ucd/DerivedAge.txt eb115a5de9a32c9ad447d6ea1cddcadb53d47f6cbc2521f3fe0bebb040c39866
 https://www.unicode.org/Public/11.0.0/ucd/extracted/DerivedCombiningClass.txt 11c8bd81ecbede4d67c7b5b693a471647d5401956707c639ae053b836cc7f5da

steps/ed-1.4/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/ed/ed-1.4.tar.gz db36da85ee1a9d8bafb4b041bd4c8c11becba0c43ec446353b67045de1634fda
+https://mirrors.kernel.org/slackware/slackware-13.37/source/a/ed/ed-1.4.tar.xz 102c80e6da527c6b8eebd5195cd05fc71808d60735d73e8bb503a5e294475007

steps/fiwix-1.5.0-lb1/files/custom_config.h

@@ -5,7 +5,7 @@
 #undef NR_CALLOUTS
 #define NR_CALLOUTS	NR_PROCS
 #undef NR_OPENS
-#define NR_OPENS	1536
+#define NR_OPENS	4096
 #undef NR_FLOCKS
 #define NR_FLOCKS	(NR_PROCS * 5)
 #undef MAX_PID_VALUE

steps/fiwix-1.5.0-lb1/files/custom_limits.h

@@ -3,6 +3,6 @@
 #undef CHILD_MAX
 #define CHILD_MAX	4096
 #undef OPEN_MAX
-#define OPEN_MAX	1536
+#define OPEN_MAX	4096
 #undef FD_SETSIZE
 #define FD_SETSIZE	OPEN_MAX 

steps/fiwix-1.5.0-lb1/fiwix-1.5.0-lb1.checksums

@@ -1 +1 @@
-5aee0b059f5dddb096779b9fb7d6f5f47b56da750623a0a506f47632d31efac6  /boot/fiwix
+2c6d2d24bc1ffcec1af415b031846d06f581cd4d2b8ba721fed55f98863a79f9  /boot/fiwix

steps/fiwix-1.5.0-lb1/pass1.kaem

@@ -9,13 +9,10 @@ checksum-transcriber sources
 sha256sum -c sources.SHA256SUM
 
 # Extract
-mkdir build src
-cd src
-ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
-cd ..
-
+mkdir build
 cd build
-untar --file ../src/${pkg}.tar
+ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
+untar --file ${pkg}.tar
 cd ${pkg}
 
 cp ../../files/custom_config.h include/fiwix

steps/gcc-4.0.4/pass1.sh

@@ -4,7 +4,7 @@
 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-EXTRA_DISTFILES="automake-1.16.3.tar.gz"
+EXTRA_DISTFILES="automake-1.16.3.tar.xz"
 
 src_prepare() {
     default

steps/gcc-4.0.4/pass2.sh

@@ -4,7 +4,7 @@
 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-EXTRA_DISTFILES="automake-1.16.3.tar.gz"
+EXTRA_DISTFILES="automake-1.16.3.tar.xz"
 
 src_prepare() {
     default

steps/gcc-4.0.4/sources

@@ -1,2 +1,2 @@
 https://mirrors.kernel.org/gnu/gcc/gcc-4.0.4/gcc-core-4.0.4.tar.bz2 e9bf58c761a4f988311aef6b41f12fd5c7e51d09477468fb73826aecc1be32e7
-https://mirrors.kernel.org/gnu/automake/automake-1.16.3.tar.gz ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f
+https://mirrors.kernel.org/gnu/automake/automake-1.16.3.tar.xz ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a

steps/gzip-1.2.4/gzip-1.2.4.checksums

@@ -1 +1 @@
-2eea6424aebf9d68e674c48c729e2eff72cfe330f5d4a5cc3918b7275c36e679  /usr/bin/gzip
+e5ddef55d9747552d3d29662312417d8223b125d6df423fdec303e2684e2c34c  /usr/bin/gzip

steps/gzip-1.2.4/pass1.kaem

@@ -12,13 +12,13 @@ set -ex
 checksum-transcriber sources
 sha256sum -c sources.SHA256SUM
 
-mkdir build src
+mkdir build
 cd build
 
 # Extract
-ungz --file ${DISTFILES}/${pkg}.tar.gz --output ../src/${pkg}.tar
-untar --file ../src/${pkg}.tar
-rm ../src/${pkg}.tar
+ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
+untar --file ${pkg}.tar
+rm ${pkg}.tar
 cd ${pkg}
 
 # Prepare

steps/helpers.sh

@@ -307,8 +307,13 @@ extract_file() {
                         *.tar.bz2)
                             # Initial bzip2 built against meslibc has broken pipes
                             bzip2 -dc "${DISTFILES}/${f}" | tar -xf - ${extract} ;;
-                        *.tar.xz)
-                            tar -xf "${DISTFILES}/${f}" --use-compress-program=xz ${extract} ;;
+                        *.tar.xz | *.tar.lzma)
+                            if test -e "${PREFIX}/bin/xz"; then
+                                tar -xf "${DISTFILES}/${f}" --use-compress-program=xz ${extract}
+                            else
+                                unxz --file "${DISTFILES}/${f}" | tar -xf - ${extract}
+                            fi
+                            ;;
                         esac
                     fi
                     ;;

steps/improve/clean_artifacts.sh

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Delete build artifacts to free up space for Linux kernel build
+
+for pkg in $(ls "${SRCDIR}"); do
+    if [ -d "${SRCDIR}/${pkg}/build" ]; then
+        rm -rf "${SRCDIR}/${pkg}/build"
+    fi
+done
+
+rm -rf "/${ARCH_DIR}/artifact"

steps/improve/clean_sources.sh

@@ -38,9 +38,9 @@ for source in "${DISTFILES}/"*; do
     rm "${source}"
 done
 
-if [ -e "/external/repo-preseeded/linux-4.9.10_0.tar.bz2" ]; then
+if [ -e "/external/repo-preseeded/linux-4.14.336_0.tar.bz2" ]; then
     # This is done in src_extract out of necessity usually -- I can't think of a better solution :(
-    rm -f "${DISTFILES}/linux-4.9.10.tar.gz"
+    rm -f "${DISTFILES}/linux-4.14.336.tar.xz"
 fi
 
 unset get_source_filename

steps/improve/make_bootable.sh

@@ -24,10 +24,11 @@ grub-install "/dev/${PHYSICAL}"
 cat > /boot/grub/grub.cfg <<- EOF
 set timeout=5
 set default=0
-menuentry 'Linux live-bootstrap (4.9.10)' {
+menuentry 'Linux live-bootstrap' {
     insmod part_msdos
     set root='$(grub-probe -d /dev/${DISK} -t bios_hints | sed -e 's/ //g')'
-    linux /boot/linux-4.9.10 root=/dev/${DISK} rw $(cat /proc/cmdline)
+    set gfxpayload=auto
+    linux /boot/vmlinuz root=/dev/${DISK} rootwait rw $(cat /proc/cmdline)
 }
 EOF
 

steps/improve/setup_repo.sh

@@ -5,3 +5,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 mkdir -p /external/repo
+
+tar -cf - --exclude='/external/repo/*' --exclude='/external/repo-preseeded/*' --exclude='/external/distfiles/*' --exclude='/dev/*' --exclude='/proc/*' --exclude='/sys/*' --exclude='/tmp/*' / | bzip2 --best > /external/repo/base.tar.bz2

steps/jump/fiwix.sh

@@ -7,11 +7,11 @@
 set -ex
 
 # Build the ext2 image
-make_fiwix_initrd -s 1310720 /boot/fiwix.ext2
+make_fiwix_initrd -s 1376256 /boot/fiwix.ext2
 
 # Boot Fiwix
 if match x${BARE_METAL} xTrue; then
-    kexec-fiwix /boot/fiwix -i /boot/fiwix.ext2 -m /e820 -c "fiwix console=/dev/tty1 root=/dev/ram0 initrd=fiwix.ext2 kexec_proto=linux kexec_size=262144 kexec_cmdline=\"init=/init consoleblank=0\""
+    kexec-fiwix /boot/fiwix -i /boot/fiwix.ext2 -m /e820 -c "fiwix console=/dev/tty1 root=/dev/ram0 initrd=fiwix.ext2 kexec_proto=linux kexec_size=204800 kexec_cmdline=\"init=/init consoleblank=0\""
 else
-    kexec-fiwix /boot/fiwix -i /boot/fiwix.ext2 -m /e820 -c "fiwix console=/dev/ttyS0 root=/dev/ram0 initrd=fiwix.ext2 kexec_proto=linux kexec_size=262144 kexec_cmdline=\"init=/init console=ttyS0\""
+    kexec-fiwix /boot/fiwix -i /boot/fiwix.ext2 -m /e820 -c "fiwix console=/dev/ttyS0 root=/dev/ram0 initrd=fiwix.ext2 kexec_proto=linux kexec_size=204800 kexec_cmdline=\"init=/init console=ttyS0\""
 fi

steps/jump/linux.sh

@@ -17,16 +17,16 @@ if [ "${KERNEL_BOOTSTRAP}" = True ]; then
     find / -xdev -type d -printf "dir %p %m %U %G\n" >> /initramfs.list
     find / -xdev -type f -printf "file %p %p %m %U %G\n" >> /initramfs.list
     find / -xdev -type l -printf "slink %p %l %m %U %G\n" >> /initramfs.list
-    kexec-linux "/dev/ram1" "/boot/linux-4.9.10" "!gen_init_cpio /initramfs.list | gzip -c"
+    kexec-linux "/dev/ram1" "/boot/vmlinuz" "!gen_init_cpio /initramfs.list | gzip -c"
 else
     mkdir /etc
     # kexec time
     if [ "${BARE_METAL}" = True ]; then
-        kexec -l "/boot/linux-4.9.10" \
-            --append="root=/dev/sda1 rootfstype=ext3 init=/init rw"
+        kexec -l "/boot/vmlinuz" \
+            --append="root=/dev/sda1 rootfstype=ext3 init=/init rw rootwait"
     else
-        kexec -l "/boot/linux-4.9.10" --console-serial \
-            --append="console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw"
+        kexec -l "/boot/vmlinuz" --console-serial \
+            --append="console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw rootwait"
     fi
     kexec -e
 fi

steps/kbd-1.15/sources

@@ -1 +1 @@
-https://mirrors.edge.kernel.org/pub/linux/utils/kbd/kbd-1.15.tar.gz 203c93e004ac7ad0e50423ff54d89e40fa99f45b207b2b892a4d70211feebe05
+https://mirrors.edge.kernel.org/pub/linux/utils/kbd/kbd-1.15.tar.xz 92f59ecaa85fe2746ef1830ac01eef84c394a413f7c7326b8d0a5c819e87502f

steps/libtool-2.2.4/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/libtool/libtool-2.2.4.tar.bz2 c4e63399b12f5858d11c44cea8e92f21cd564f8548e488dadc84046b424c80fc
+https://mirrors.kernel.org/gnu/libtool/libtool-2.2.4.tar.lzma d81839fa4d566dbef7c286fdca9b430d3530983fff6d389fac0f08baf27e4c3a

steps/linux-4.14.336/pass1.sh

@@ -3,13 +3,10 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# XXX: Fix package after builder-hex0
-
 src_unpack() {
     mkdir "${pkg}"
-    cp "${DISTFILES}/deblob-4.9" "${pkg}/"
     default || true # Predictable link errors - not a problem
-    rm "${DISTFILES}/${pkg}.tar.gz"
+    rm "${DISTFILES}/${pkg}.tar.xz"
 }
 
 generate_autoconf_h() {
@@ -32,12 +29,11 @@ src_prepare() {
 
     generate_autoconf_h
 
-    # Deblob the kernel
-    chmod +x deblob-4.9
-    ./deblob-4.9 --force
-
     # Remove shipped files
     find . -name "*_shipped*" -delete
+
+    # Remove documentation to save space
+    rm -rf Documentation
 }
 
 src_compile() {
@@ -54,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-    install -D -m 644 arch/i386/boot/bzImage "${DESTDIR}/boot/linux-4.9.10"
+    install -D -m 644 arch/i386/boot/bzImage "${DESTDIR}/boot/vmlinuz"
     install -D -m 755 usr/gen_init_cpio "${DESTDIR}${PREFIX}/bin/gen_init_cpio"
     install -D -m 755 scripts/gen_initramfs_list.sh "${DESTDIR}${PREFIX}/bin/gen_initramfs_list.sh"
 }

steps/linux-4.14.336/patches/ddfd117714014cebe7b5d008fdec8eaec620cba1.patch

@@ -0,0 +1,60 @@
+SPDX-FileCopyrightText: 2022 Sean Christopherson <seanjc@google.com>
+
+SPDX-License-Identifier: GPL-2.0-only
+
+Revert the following patch:
+From ddfd117714014cebe7b5d008fdec8eaec620cba1 Mon Sep 17 00:00:00 2001
+From: Sean Christopherson <seanjc@google.com>
+Date: Wed, 30 Nov 2022 23:36:48 +0000
+Subject: [PATCH] x86/virt: Force GIF=1 prior to disabling SVM (for reboot
+ flows)
+
+commit 6a3236580b0b1accc3976345e723104f74f6f8e6 upstream.
+
+Set GIF=1 prior to disabling SVM to ensure that INIT is recognized if the
+kernel is disabling SVM in an emergency, e.g. if the kernel is about to
+jump into a crash kernel or may reboot without doing a full CPU RESET.
+If GIF is left cleared, the new kernel (or firmware) will be unabled to
+awaken APs.  Eat faults on STGI (due to EFER.SVME=0) as it's possible
+that SVM could be disabled via NMI shootdown between reading EFER.SVME
+and executing STGI.
+
+Link: https://lore.kernel.org/all/cbcb6f35-e5d7-c1c9-4db9-fe5cc4de579a@amd.com
+Cc: stable@vger.kernel.org
+Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>
+Cc: Tom Lendacky <thomas.lendacky@amd.com>
+Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
+Link: https://lore.kernel.org/r/20221130233650.1404148-3-seanjc@google.com
+Signed-off-by: Sean Christopherson <seanjc@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/include/asm/virtext.h | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h
+index 0116b2ee9e64f..4699acd602af4 100644
+--- arch/x86/include/asm/virtext.h
++++ arch/x86/include/asm/virtext.h
+@@ -114,21 +114,7 @@ static inline void cpu_svm_disable(void)
+ 
+ 	wrmsrl(MSR_VM_HSAVE_PA, 0);
+ 	rdmsrl(MSR_EFER, efer);
+-	if (efer & EFER_SVME) {
+-		/*
+-		 * Force GIF=1 prior to disabling SVM to ensure INIT and NMI
+-		 * aren't blocked, e.g. if a fatal error occurred between CLGI
+-		 * and STGI.  Note, STGI may #UD if SVM is disabled from NMI
+-		 * context between reading EFER and executing STGI.  In that
+-		 * case, GIF must already be set, otherwise the NMI would have
+-		 * been blocked, so just eat the fault.
+-		 */
+-		asm_volatile_goto("1: stgi\n\t"
+-				  _ASM_EXTABLE(1b, %l[fault])
+-				  ::: "memory" : fault);
+-fault:
+-		wrmsrl(MSR_EFER, efer & ~EFER_SVME);
+-	}
++	wrmsrl(MSR_EFER, efer & ~EFER_SVME);
+ }
+ 
+ /** Makes sure SVM is disabled, if it is supported on the CPU

steps/linux-4.14.336/patches/drm_edid.patch

@@ -0,0 +1,24 @@
+SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+
+SPDX-License-Identifier: GPL-2.0-only
+
+Remove BUILD_BUG_ON check as it causes a link error
+
+--- drivers/gpu/drm/drm_edid.c.bak	2024-02-16 08:36:01.168832650 +0100
++++ drivers/gpu/drm/drm_edid.c	2024-02-16 08:36:58.148828524 +0100
+@@ -2879,15 +2879,6 @@
+ 	 * get the other variants by simply increasing the
+ 	 * vertical front porch length.
+ 	 */
+-	BUILD_BUG_ON(edid_cea_modes[8].vtotal != 262 ||
+-		     edid_cea_modes[9].vtotal != 262 ||
+-		     edid_cea_modes[12].vtotal != 262 ||
+-		     edid_cea_modes[13].vtotal != 262 ||
+-		     edid_cea_modes[23].vtotal != 312 ||
+-		     edid_cea_modes[24].vtotal != 312 ||
+-		     edid_cea_modes[27].vtotal != 312 ||
+-		     edid_cea_modes[28].vtotal != 312);
+-
+ 	if (((vic == 8 || vic == 9 ||
+ 	      vic == 12 || vic == 13) && mode->vtotal < 263) ||
+ 	    ((vic == 23 || vic == 24 ||

steps/linux-4.14.336/patches/i2c-hid-dmi-quirks.patch

@@ -0,0 +1,42 @@
+SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+
+SPDX-License-Identifier: GPL-2.0-only
+
+Name the union in i2c_hid_desc_override, to avoid unknown field error
+
+--- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c.bak	2024-02-15 13:27:20.177877726 +0100
++++ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c	2024-02-15 15:11:15.787482938 +0100
+@@ -18,7 +18,7 @@
+ 	union {
+ 		struct i2c_hid_desc *i2c_hid_desc;
+ 		uint8_t             *i2c_hid_desc_buffer;
+-	};
++	} u;
+ 	uint8_t              *hid_report_desc;
+ 	unsigned int          hid_report_desc_size;
+ 	uint8_t              *i2c_name;
+@@ -36,6 +36,7 @@
+  */
+ 
+ static const struct i2c_hid_desc_override sipodev_desc = {
++	.u = {
+ 	.i2c_hid_desc_buffer = (uint8_t [])
+ 	{0x1e, 0x00,                  /* Length of descriptor                 */
+ 	 0x00, 0x01,                  /* Version of descriptor                */
+@@ -52,6 +53,7 @@
+ 	 0x06, 0x00,                  /* Version ID                           */
+ 	 0x00, 0x00, 0x00, 0x00       /* Reserved                             */
+ 	},
++	},
+ 
+ 	.hid_report_desc = (uint8_t [])
+ 	{0x05, 0x01,                  /* Usage Page (Desktop),                */
+@@ -422,7 +424,7 @@
+ 	if (strcmp(override->i2c_name, i2c_name))
+ 		return NULL;
+ 
+-	return override->i2c_hid_desc;
++	return override->u.i2c_hid_desc;
+ }
+ 
+ char *i2c_hid_get_dmi_hid_report_desc_override(uint8_t *i2c_name,

steps/linux-4.14.336/patches/i915_sw_fence.patch

@@ -0,0 +1,17 @@
+SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+
+SPDX-License-Identifier: GPL-2.0-only
+
+Neuter the __i915_sw_fence_call define, which our gcc can't understand
+
+--- drivers/gpu/drm/i915/i915_sw_fence.h.bak	2024-02-15 12:21:07.758127759 +0100
++++ drivers/gpu/drm/i915/i915_sw_fence.h	2024-02-15 12:22:04.498124232 +0100
+@@ -37,7 +37,7 @@
+ 
+ typedef int (*i915_sw_fence_notify_t)(struct i915_sw_fence *,
+ 				      enum i915_sw_fence_notify state);
+-#define __i915_sw_fence_call __aligned(4)
++#define __i915_sw_fence_call /* __aligned(4) */
+ 
+ void __i915_sw_fence_init(struct i915_sw_fence *fence,
+ 			  i915_sw_fence_notify_t fn,

steps/linux-4.14.336/patches/wno-array-bounds.patch

@@ -0,0 +1,17 @@
+SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+
+SPDX-License-Identifier: GPL-2.0-only
+
+Remove -Wno-array-bounds which gcc-4.0.4 doesn't recognize
+
+--- drivers/net/ethernet/broadcom/Makefile.bak	2024-02-15 17:05:34.617050047 +0100
++++ drivers/net/ethernet/broadcom/Makefile	2024-02-15 17:06:06.097047984 +0100
+@@ -16,8 +16,3 @@
+ obj-$(CONFIG_BGMAC_PLATFORM) += bgmac-platform.o
+ obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o
+ obj-$(CONFIG_BNXT) += bnxt/
+-
+-# FIXME: temporarily silence -Warray-bounds on non W=1+ builds
+-ifndef KBUILD_EXTRA_WARN
+-CFLAGS_tg3.o += -Wno-array-bounds
+-endif

steps/linux-4.14.336/sources

@@ -0,0 +1 @@
+https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.336.tar.xz 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c

steps/linux-4.9.10/sources

@@ -1,2 +0,0 @@
-https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.10.tar.gz 97ff15f9550c6e85c25173b3cf5c7e89a2d39fb923112f2c8bc2729cf64bf6d8
-https://linux-libre.fsfla.org/pub/linux-libre/releases/old/gen6/4.9.10-gnu/deblob-4.9 af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3

steps/linux-headers-4.14.336/pass1.sh

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-extract="linux-4.9.10/scripts linux-4.9.10/include linux-4.9.10/arch/x86/include linux-4.9.10/arch/x86/entry"
+extract="linux-4.14.336/scripts linux-4.14.336/include linux-4.14.336/arch/x86/include linux-4.14.336/arch/x86/entry"
 
 src_prepare() {
     default
@@ -49,8 +49,8 @@ src_install() {
     # Generate linux/version.h
     # Rules are from makefile
     VERSION=4
-    PATCHLEVEL=9
-    SUBLEVEL=10
+    PATCHLEVEL=14
+    SUBLEVEL=336
     VERSION_CODE="$((VERSION * 65536 + PATCHLEVEL * 256 + SUBLEVEL))"
     echo '#define LINUX_VERSION_CODE '"${VERSION_CODE}" \
         > "${DESTDIR}${PREFIX}/include/linux/version.h"

steps/linux-headers-4.14.336/sources

@@ -0,0 +1 @@
+https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.336.tar.xz 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c

steps/linux-headers-4.9.10/patches/musl.patch

@@ -1,160 +0,0 @@
-SPDX-FileCopyrightText: 2018 Felix Janda <felix.janda@posteo.de>
-
-SPDX-License-Identifier: GPL-2.0-only
-
-Applies cleanly (backport).
-
-From c0bace798436bca0fdc221ff61143f1376a9c3de Mon Sep 17 00:00:00 2001
-From: Date: Mon, 1 Jan 2018 19:33:20 +0100
-Subject: uapi libc compat: add fallback for unsupported libcs
-
-libc-compat.h aims to prevent symbol collisions between uapi and libc
-headers for each supported libc. This requires continuous coordination
-between them.
-
-The goal of this commit is to improve the situation for libcs (such as
-musl) which are not yet supported and/or do not wish to be explicitly
-supported, while not affecting supported libcs. More precisely, with
-this commit, unsupported libcs can request the suppression of any
-specific uapi definition by defining the correspondings _UAPI_DEF_*
-macro as 0. This can fix symbol collisions for them, as long as the
-libc headers are included before the uapi headers. Inclusion in the
-other order is outside the scope of this commit.
-
-All infrastructure in order to enable this fallback for unsupported
-libcs is already in place, except that libc-compat.h unconditionally
-defines all _UAPI_DEF_* macros to 1 for all unsupported libcs so that
-any previous definitions are ignored. In order to fix this, this commit
-merely makes these definitions conditional.
-
-This commit together with the musl libc commit
-
-http://git.musl-libc.org/cgit/musl/commit/?id=04983f2272382af92eb8f8838964ff944fbb8258
-
-fixes for example the following compiler errors when <linux/in6.h> is
-included after musl's <netinet/in.h>:
-
-./linux/in6.h:32:8: error: redefinition of 'struct in6_addr'
-./linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6'
-./linux/in6.h:59:8: error: redefinition of 'struct ipv6_mreq'
-
-The comments referencing glibc are still correct, but this file is not
-only used for glibc any more.
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/uapi/linux/libc-compat.h | 55 +++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 54 insertions(+), 1 deletion(-)
-
-(limited to 'include/uapi/linux/libc-compat.h')
-
-diff --git include/uapi/linux/libc-compat.h include/uapi/linux/libc-compat.h
-index 282875cf805657..8254c937c9f455 100644
---- include/uapi/linux/libc-compat.h
-+++ include/uapi/linux/libc-compat.h
-@@ -168,46 +168,99 @@
- 
- /* If we did not see any headers from any supported C libraries,
-  * or we are being included in the kernel, then define everything
-- * that we need. */
-+ * that we need. Check for previous __UAPI_* definitions to give
-+ * unsupported C libraries a way to opt out of any kernel definition. */
- #else /* !defined(__GLIBC__) */
- 
- /* Definitions for if.h */
-+#ifndef __UAPI_DEF_IF_IFCONF
- #define __UAPI_DEF_IF_IFCONF 1
-+#endif
-+#ifndef __UAPI_DEF_IF_IFMAP
- #define __UAPI_DEF_IF_IFMAP 1
-+#endif
-+#ifndef __UAPI_DEF_IF_IFNAMSIZ
- #define __UAPI_DEF_IF_IFNAMSIZ 1
-+#endif
-+#ifndef __UAPI_DEF_IF_IFREQ
- #define __UAPI_DEF_IF_IFREQ 1
-+#endif
- /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
-+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
-+#endif
- /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-+#endif
- 
- /* Definitions for in.h */
-+#ifndef __UAPI_DEF_IN_ADDR
- #define __UAPI_DEF_IN_ADDR		1
-+#endif
-+#ifndef __UAPI_DEF_IN_IPPROTO
- #define __UAPI_DEF_IN_IPPROTO		1
-+#endif
-+#ifndef __UAPI_DEF_IN_PKTINFO
- #define __UAPI_DEF_IN_PKTINFO		1
-+#endif
-+#ifndef __UAPI_DEF_IP_MREQ
- #define __UAPI_DEF_IP_MREQ		1
-+#endif
-+#ifndef __UAPI_DEF_SOCKADDR_IN
- #define __UAPI_DEF_SOCKADDR_IN		1
-+#endif
-+#ifndef __UAPI_DEF_IN_CLASS
- #define __UAPI_DEF_IN_CLASS		1
-+#endif
- 
- /* Definitions for in6.h */
-+#ifndef __UAPI_DEF_IN6_ADDR
- #define __UAPI_DEF_IN6_ADDR		1
-+#endif
-+#ifndef __UAPI_DEF_IN6_ADDR_ALT
- #define __UAPI_DEF_IN6_ADDR_ALT		1
-+#endif
-+#ifndef __UAPI_DEF_SOCKADDR_IN6
- #define __UAPI_DEF_SOCKADDR_IN6		1
-+#endif
-+#ifndef __UAPI_DEF_IPV6_MREQ
- #define __UAPI_DEF_IPV6_MREQ		1
-+#endif
-+#ifndef __UAPI_DEF_IPPROTO_V6
- #define __UAPI_DEF_IPPROTO_V6		1
-+#endif
-+#ifndef __UAPI_DEF_IPV6_OPTIONS
- #define __UAPI_DEF_IPV6_OPTIONS		1
-+#endif
-+#ifndef __UAPI_DEF_IN6_PKTINFO
- #define __UAPI_DEF_IN6_PKTINFO		1
-+#endif
-+#ifndef __UAPI_DEF_IP6_MTUINFO
- #define __UAPI_DEF_IP6_MTUINFO		1
-+#endif
- 
- /* Definitions for ipx.h */
-+#ifndef __UAPI_DEF_SOCKADDR_IPX
- #define __UAPI_DEF_SOCKADDR_IPX			1
-+#endif
-+#ifndef __UAPI_DEF_IPX_ROUTE_DEFINITION
- #define __UAPI_DEF_IPX_ROUTE_DEFINITION		1
-+#endif
-+#ifndef __UAPI_DEF_IPX_INTERFACE_DEFINITION
- #define __UAPI_DEF_IPX_INTERFACE_DEFINITION	1
-+#endif
-+#ifndef __UAPI_DEF_IPX_CONFIG_DATA
- #define __UAPI_DEF_IPX_CONFIG_DATA		1
-+#endif
-+#ifndef __UAPI_DEF_IPX_ROUTE_DEF
- #define __UAPI_DEF_IPX_ROUTE_DEF		1
-+#endif
- 
- /* Definitions for xattr.h */
-+#ifndef __UAPI_DEF_XATTR
- #define __UAPI_DEF_XATTR		1
-+#endif
- 
- #endif /* __GLIBC__ */
- 
--- 
-cgit 
-

steps/linux-headers-4.9.10/sources

@@ -1 +0,0 @@
-https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.10.tar.gz 97ff15f9550c6e85c25173b3cf5c7e89a2d39fb923112f2c8bc2729cf64bf6d8

steps/lwext4-1.0.0-lb1/pass1.kaem

@@ -4,13 +4,10 @@
 
 set -ex
 
-mkdir build src
-cd src
-ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
-cd ..
-
+mkdir build
 cd build
-untar --file ../src/${pkg}.tar
+ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
+untar --file ${pkg}.tar
 cd ${pkg}
 
 mkdir -p build_generic/include/generated

steps/m4-1.4.7/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/gnu/m4/m4-1.4.7.tar.gz 093c993767f563a11e41c1cf887f4e9065247129679d4c1e213d0544d16d8303
+https://mirrors.kernel.org/gnu/m4/m4-1.4.7.tar.bz2 a88f3ddaa7c89cf4c34284385be41ca85e9135369c333fdfa232f3bf48223213

steps/make-3.82/make-3.82.checksums

@@ -1 +1 @@
-b1345773131fa42c6b746482a0031037823fb772dd81b7b3771c51db9aeeb7f9  /usr/bin/make
+43ad49ef3345573286a93ce74c1c952edd600fb1335529d8394a53bc87189fd1  /usr/bin/make

steps/make-3.82/pass1.kaem

@@ -10,13 +10,13 @@ set -ex
 checksum-transcriber sources
 sha256sum -c sources.SHA256SUM
 
-mkdir build src
+mkdir build
 cd build 
 
 # Extract
-unbz2 --file ${DISTFILES}/${pkg}.tar.bz2 --output ../src/${pkg}.tar
-untar --file ../src/${pkg}.tar
-rm ../src/${pkg}.tar
+unbz2 --file ${DISTFILES}/${pkg}.tar.bz2 --output ${pkg}.tar
+untar --file ${pkg}.tar
+rm ${pkg}.tar
 cd ${pkg}
 
 # Create .h files
@@ -26,34 +26,34 @@ catm config.h
 cp ../../files/putenv_stub.c putenv_stub.c
 
 # Compile
-tcc -c getopt.c
-tcc -c getopt1.c
-tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STDINT_H ar.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_FCNTL_H arscan.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 commands.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DSCCS_GET=\"/nullop\" default.c
-tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DIRENT_H dir.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART expand.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 file.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -Dvfork=fork function.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART implicit.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DUP2 -DHAVE_STRCHR -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 -DHAVE_ANSI_COMPILER -DHAVE_STDARG_H misc.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 strcache.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART variable.c
-tcc -c -I. -DVERSION=\"3.82\" version.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART vpath.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART hash.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART remote-stub.c
-tcc -c -DHAVE_FCNTL_H getloadavg.c
-tcc -c -Iglob -DSTDC_HEADERS glob/fnmatch.c
-tcc -c -Iglob -DHAVE_STRDUP -DHAVE_DIRENT_H glob/glob.c
-tcc -c putenv_stub.c
+tcc -DNO_FLOAT -c getopt.c
+tcc -DNO_FLOAT -c getopt1.c
+tcc -DNO_FLOAT -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STDINT_H ar.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_FCNTL_H arscan.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 commands.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DSCCS_GET=\"/nullop\" default.c
+tcc -DNO_FLOAT -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DIRENT_H dir.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART expand.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 file.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -Dvfork=fork function.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART implicit.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DUP2 -DHAVE_STRCHR -Dvfork=fork job.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DLOCALEDIR=\"/fake-locale\" -DPACKAGE=\"fake-make\" -DHAVE_MKTEMP -DHAVE_GETCWD main.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STRERROR -DHAVE_VPRINTF -DHAVE_ANSI_COMPILER -DHAVE_STDARG_H misc.c
+tcc -DNO_FLOAT -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DINCLUDEDIR=\"${PREFIX}/include\" read.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 -DHAVE_FCNTL_H -DLIBDIR=\"${PREFIX}/lib\" remake.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART rule.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART signame.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART strcache.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART variable.c
+tcc -DNO_FLOAT -c -I. -DVERSION=\"3.82\" version.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART vpath.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART hash.c
+tcc -DNO_FLOAT -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART remote-stub.c
+tcc -DNO_FLOAT -c -DHAVE_FCNTL_H getloadavg.c
+tcc -DNO_FLOAT -c -Iglob -DSTDC_HEADERS glob/fnmatch.c
+tcc -DNO_FLOAT -c -Iglob -DHAVE_STRDUP -DHAVE_DIRENT_H glob/glob.c
+tcc -DNO_FLOAT -c putenv_stub.c
 
 # Link
 tcc -static -o ${BINDIR}/make getopt.o getopt1.o ar.o arscan.o commands.o default.o dir.o expand.o file.o function.o implicit.o job.o main.o misc.o read.o remake.o rule.o signame.o strcache.o variable.o version.o vpath.o hash.o remote-stub.o getloadavg.o fnmatch.o glob.o putenv_stub.o

steps/manifest

@@ -33,7 +33,7 @@
 
 build: checksum-transcriber-1.0
 build: simple-patch-1.0
-build: mes-0.25
+build: mes-wip
 build: tcc-0.9.26
 build: tcc-0.9.27
 define: BUILD_FIWIX = ( KERNEL_BOOTSTRAP == True || BUILD_KERNELS == True )
@@ -110,7 +110,7 @@ improve: populate_device_nodes
 build: gcc-4.0.4
 build: findutils-4.2.33
 build: musl-1.2.4
-build: linux-headers-4.9.10
+build: linux-headers-4.14.336
 build: gcc-4.0.4
 build: util-linux-2.19.1
 build: e2fsprogs-1.45.7
@@ -123,7 +123,8 @@ define: BUILD_LINUX = ( CHROOT == False || BUILD_KERNELS == True )
 build: kexec-linux-1.0.0 ( BUILD_LINUX == True )
 build: kexec-tools-2.0.22 ( BUILD_LINUX == True )
 improve: clean_sources
-build: linux-4.9.10 ( BUILD_LINUX == True )
+improve: clean_artifacts
+build: linux-4.14.336 ( BUILD_LINUX == True )
 jump: break ( INTERNAL_CI == pass1 )
 improve: populate_device_nodes
 jump: linux ( CHROOT == False )

steps/mes-0.25/files/config.h

@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2020 fosslinux <fosslinux@aussies.space>
-// SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#undef SYSTEM_LIBC
-#define MES_VERSION "0.25"

steps/mes-0.25/mes-0.25.amd64.checksums

@@ -1,14 +0,0 @@
-9c7318aceeb21856d3f0346d41cb41b794bc2c5c7bf3415e6067105c75e3824f  /usr/bin/mes
-94668ea026e429f38bc37fadc75f987899784af4239f55b2951d87227b72aa98  /usr/bin/mes-m2
-a7375f00fdafff9d76ec63290471c97123b0e29b21747b21604835235b5bb3b7  /usr/bin/mescc.scm
-c66de1ba72b8019eee113271638e4e30543aa7d34f45c9cc751346dba0d8817c  /usr/lib/x86_64-mes/crt1.s
-d0a80b94228deb99bda15244f0ed3736badd0632c78a3379195ba24a78f68a75  /usr/lib/x86_64-mes/crt1.o
-ff5640d78b9924dd40157596438da4108a97fe658806fbbadced38b4020395f4  /usr/lib/x86_64-mes/x86_64.M1
-684bfcde34f118026d875acf2dbe2e4a39dce96d5f938f534995b582ba1a4241  /usr/lib/x86_64-mes/libmescc.s
-7f5c8d9a5226fd33aa310e4d76151fb4f39969387ea00527356f7891f9e7ff6b  /usr/lib/x86_64-mes/libc+tcc.s
-53de3c338d82cb45848193b95d319b7a860d289a14824f1961c655b167aabd68  /usr/lib/x86_64-mes/libc.s
-ad1f1e390f675db2a3545aecc63df798d49317cad2ae5eadb9382df960bbd9f3  /usr/lib/x86_64-mes/libmescc.a
-5bce272890558f2c628030eeff06889346398d15ebe46bb9d9f116162fa6f547  /usr/lib/x86_64-mes/libc+tcc.a
-264bfb52a14957759e65c9c1224f0ca750713107586db367a2e235729797ecda  /usr/lib/x86_64-mes/libc.a
-48c57492e80a99bf16eeba55e242b60b9e759992482b651d1b512f07ddd9a65a  /usr/lib/linux/x86_64-mes/elf64-header.hex2
-94c796cb34a6e581491d0cf609e7fad01715c84a17b8b2017178a36568a80e48  /usr/lib/linux/x86_64-mes/elf64-footer-single-main.hex2

steps/mes-0.25/mes-0.25.riscv64.checksums

@@ -1,14 +0,0 @@
-4c722a7455db030122072f3bb7b2733a1b826460c1022308d314775685838447  /usr/bin/mes
-c149469a741b170bfe3da4e737b3d68490996cc957d593ea5555301de0329afc  /usr/bin/mes-m2
-3296b313d02fe4a4f7ba37446b5cdf9e7c472426a942b7e7227fe7f9929ad97f  /usr/bin/mescc.scm
-50441b03b915bd51fb811749901a56b3c42186b45f7f466dbf23337eafad520c  /usr/lib/riscv64-mes/crt1.s
-a96a0a8f1b2dd1e5a7dad8264c92b5448be7d29aa7706d40d67be978d5ddc305  /usr/lib/riscv64-mes/crt1.o
-1511e99da81caa02490078c7a880ac97d439b6fec99cf846dc2044468e2444b8  /usr/lib/riscv64-mes/riscv64.M1
-8f7e94270c7cbb076ff5fe3cdd0d6c891537e7945e5aa4bdbf167867471bfbc2  /usr/lib/riscv64-mes/libmescc.s
-dc017df6d381bd13909f01eea43a9baf5210312715e1bb95c8d4df5f35566276  /usr/lib/riscv64-mes/libc+tcc.s
-409ef724a5f67bcfec1696e5f99d15b089e7e2b9d8c9a91134d6e2bcdb515d9c  /usr/lib/riscv64-mes/libc.s
-5027a055f6c564417bf5194a9b43a8a93ae59d9a26ce75a55895f253a6aab2c2  /usr/lib/riscv64-mes/libmescc.a
-938cbb375ca287c3a3e19d3b86ccf1e805963f6b47c4f7fcf3c857edf77f19f3  /usr/lib/riscv64-mes/libc+tcc.a
-a994b9aeeff0b7a0cc36e0214848ede3b0dc9d11dd3986562713a672dcb6d3f6  /usr/lib/riscv64-mes/libc.a
-22ad5f7b6e5ea07b275619956bddd913b061d6ad492a442e4b6b2f28898e50ae  /usr/lib/linux/riscv64-mes/elf64-header.hex2
-94c796cb34a6e581491d0cf609e7fad01715c84a17b8b2017178a36568a80e48  /usr/lib/linux/riscv64-mes/elf64-footer-single-main.hex2

steps/mes-0.25/mes-0.25.x86.checksums

@@ -1,5 +1,5 @@
 ab14556dd405debd1fc4aa18bffea9ee8c89bc8fa89f745e8fb20c9da83e5809  /usr/bin/mes
-1e5ceedd062bfddab21ceb5f84f762eafa373d274ea82017b092e03bb24bb7bf  /usr/bin/mes-m2
+ddaa6eaaedc5f20298474b4118f12ef86e9e9a5b681893fb138ade189e971caf  /usr/bin/mes-m2
 834320264b245728c2270b2a60f1ceb5f63de8a79bcd99f5c6bba6be11ed7223  /usr/bin/mescc.scm
 234c264965116a24583dd569050adc766d7cc2da83b1db38085210f26031b70c  /usr/lib/x86-mes/crt1.s
 494f184a87175abc485a898c250c3831b2b5dcf5aead46591e00b39d1c5529fc  /usr/lib/x86-mes/crt1.o

steps/mes-0.25/pass1.kaem

@@ -32,19 +32,16 @@ checksum-transcriber sources
 sha256sum -c sources.SHA256SUM
 
 # Unpack
-mkdir src build
-cd src
+mkdir build
+cd build
 ungz --file ${DISTFILES}/${NYACC_PKG}.tar.gz --output ${NYACC_PKG}.tar
 ungz --file ${DISTFILES}/${MES_PKG}.tar.gz --output ${MES_PKG}.tar
-cd ..
-
-cd build
-untar --file ../src/${NYACC_PKG}.tar
-untar --non-strict --file ../src/${MES_PKG}.tar # ignore symlinks
+untar --file ${NYACC_PKG}.tar
+untar --non-strict --file ${MES_PKG}.tar # ignore symlinks
 mes_run=${MES_PREFIX}/kaem.run
 replace --file ${mes_run} --output ${mes_run} --match-on 0x1000000 --replace-with 0x8048000
 
-rm ../src/${NYACC_PKG}.tar ../src/${MES_PKG}.tar
+rm ${NYACC_PKG}.tar ${MES_PKG}.tar
 
 cp ../files/config.h ${MES_PREFIX}/include/mes
 

steps/mes-0.25/sources

@@ -1,2 +0,0 @@
-https://mirrors.kernel.org/gnu/mes/mes-0.25.tar.gz 325250b3567ed9203ba70161c835af01079e73ebed97b4b5bb77ca500b828940
-https://download.savannah.gnu.org/releases/nyacc/nyacc-1.00.2.tar.gz f36e4fb7dd524dc3f4b354d3d5313f69e7ce5a6ae93711e8cf6d51eaa8d2b318

steps/patch-2.5.9/pass1.kaem

@@ -10,13 +10,13 @@ set -ex
 checksum-transcriber sources
 sha256sum -c sources.SHA256SUM
 
-mkdir build src
+mkdir build
 cd build
 
 # Extract
-cp ${DISTFILES}/${pkg}.tar.gz ../src/
-ungz --file ../src/${pkg}.tar.gz --output ../src/${pkg}.tar
-untar --file ../src/${pkg}.tar
+ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
+untar --file ${pkg}.tar
+rm ${pkg}.tar
 cd ${pkg}
 cp ../../mk/main.mk Makefile
 

steps/patch-2.5.9/patch-2.5.9.checksums

@@ -1 +1 @@
-cdb22238dfa7f659c3d7afae6e93f27b4c84a40e082b20bc78a8b19a0dc79536  /usr/bin/patch
+728596bca1f67ec8386f312d8738eeb398203505851faad91406c29a299bc748  /usr/bin/patch

steps/perl-5.32.1/patches/reproducibility.patch

@@ -34,7 +34,7 @@ NOTE: this patch CANNOT be applied to a non-live-bootstrap environment.
  # because the A-Z/a-z are not consecutive.
 -myuname=`echo $myuname | $sed -e "s,['/],,g" | \
 -	./tr '[A-Z]' '[a-z]' | $tr $trnl ' '`
-+myuname="linux (none) 4.9.10-gnu_1 #1 mon jan 1 00:00:01 1970 i686 gnulinux"
++myuname="linux (none) 4.14.336 #1 mon jan 1 00:00:01 1970 i686 gnulinux"
  ?X: Save the value we just computed to reset myuname after we get done here.
  newmyuname="$myuname"
  dflt=n
@@ -43,7 +43,7 @@ NOTE: this patch CANNOT be applied to a non-live-bootstrap environment.
  ?X: into using the SysV case!
  		gnu)	osname=gnu
 -			osvers="$3" ;;
-+			osvers="4.9.10-gnu_1" ;;
++			osvers="4.14.336" ;;
  ?X: HP-UX uname -a gives something like
  ?X: HP-UX foobar B.10.20 A 9000/735 2016483812 two-user license
  ?X: Preserve the full 10.20 string instead of the previous plain '10'.

steps/perl-5.32.1/patches/reproducibility2.patch

@@ -41,7 +41,7 @@ NOTE: this patch CANNOT be applied to a non-live-bootstrap environment.
  	linux) osname=linux
  		case "$3" in
 -		*)	osvers="$3" ;;
-+		*)	osvers="4.9.10-gnu_1" ;;
++		*)	osvers="4.14.336" ;;
  		esac
  		;;
  	MiNT) osname=mint

steps/sed-4.0.9/pass1.kaem

@@ -19,6 +19,7 @@ cd build
 cp ${DISTFILES}/${pkg}.tar.gz ../src/
 gzip -d -f ../src/${pkg}.tar.gz
 tar xf ../src/${pkg}.tar
+rm -r ../src
 cd ${pkg}
 cp ../../mk/main.mk Makefile
 

steps/sed-4.0.9/sed-4.0.9.checksums

@@ -1 +1 @@
-27dbc29d04ad2a2905ab56c198660510010377062d716bc791a8d0e281fec4d4  /usr/bin/sed
+58d2dd86201ed5ed48f546876eae862f6749983354e0408234d0801796dc8c0c  /usr/bin/sed

steps/simple-patch-1.0/simple-patch-1.0.x86.checksums

@@ -1 +1 @@
-bf49a897e96fe4052904aaedc8281f6849e3dc1836899d393c43726cc8f5e92e  /usr/bin/simple-patch
+f66b8200c9237a7d5fe6a3d4d94f1ae661009d8ad14efdc7e95ac4cb8c4775e8  /usr/bin/simple-patch

steps/tar-1.12/pass1.kaem

@@ -19,7 +19,7 @@ cd build
 cp ${DISTFILES}/${pkg}.tar.gz ../src/
 gzip -d -f ../src/${pkg}.tar.gz
 untar --file ../src/${pkg}.tar
-rm ../src/${pkg}.tar
+rm -r ../src
 
 cd ${pkg}
 

steps/tar-1.12/tar-1.12.checksums

@@ -1 +1 @@
-0b14f1849c2c8dab671399905753e0503f7ba60bfc807b0be13132da6c9814e9  /usr/bin/tar
+05a5983f7961c92c1cf4caae9dcf9cc73c5820e83dc142d1893ece2571a62019  /usr/bin/tar

steps/tcc-0.9.26/sources

@@ -1 +1 @@
-https://lilypond.org/janneke/tcc/tcc-0.9.26-1147-gee75a10c.tar.gz 6b8cbd0a5fed0636d4f0f763a603247bc1935e206e1cc5bda6a2818bab6e819f tcc-0.9.26.tar.gz
+http://lilypond.org/janneke/tcc/tcc-0.9.26-1150-ga0de0ae4.tar.gz 987fdeb131460bacdd31193a2380ba165a4a716634ed611ebbfc79c28dcb1cad tcc-0.9.26.tar.gz

steps/tcc-0.9.26/tcc-0.9.26.x86.checksums

@@ -1,8 +1,8 @@
-48f0ac2f1fb8002a6a6958557732b83778f744de3e09085987d65c6981a57ab3  /usr/bin/tcc-mes
-b758fff28f3d03b057b0414eb92da0c46e22bc8e9da29af33fbe65b01047d25d  /usr/bin/tcc-boot0
-56e267e3031f548ea155d61a97fc3e6e8fff277159d7ae3273820a8c0f4582a0  /usr/bin/tcc-boot1
-3404d1e8f61be09c1caeba03dcf99abae8881a485fe13160e6bb5fe44538d378  /usr/bin/tcc
-3bfd10dfe347c4fb40fbf5f2f705cd806c77e0f80cf4ad1ecfd4beddada2937c  /usr/lib/mes/libc.a
+6a65dd1cd578ac11a5f7a75b0a431e1146112c3e1af31727f45b5a7fe6c9584f  /usr/bin/tcc-mes
+bc745d8e3fdd8e68aa6d6abb598cdf48cf63338b02eea1e8026756b2cc411ed7  /usr/bin/tcc-boot0
+26b534a34ef1ced83cc379b85eadf135d7b09a584a1de38651fe64001b78838c  /usr/bin/tcc-boot1
+1fdffe37d0a0f1beaa134fe9dc2900175254ed702759c991e039ade43f50d46d  /usr/bin/tcc
+d52110f683c4c1357f326205149f3cb4513b3e683c20064134bd6ff0f824a22a  /usr/lib/mes/libc.a
 12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /usr/lib/mes/libgetopt.a
 76d280e0733f2c84aad180968167d789a825ac56526bddba4f100d6d74851027  /usr/lib/mes/crt1.o
 09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /usr/lib/mes/crti.o

steps/tcc-0.9.27/tcc-0.9.27.checksums

@@ -1 +1 @@
-cff99e8badc080f57f34b31560d266b703b79c5ed8380a9ddfc3f1694aba10bd  /usr/bin/tcc
+98d804bfd0cb486170633392ac4ea0f5e1a353973de489afcc9f9a5628867f6f  /usr/bin/tcc

steps/util-linux-2.19.1/sources

@@ -1 +1 @@
-https://mirrors.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-2.19.1.tar.gz f694bee56099b8d72c3843d97e27f2306aa9946741e34a27391f6f6f19c7bcd0
+https://mirrors.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-2.19.1.tar.xz d12e0f1be0257eadca6a2653acfb4792571c9f7189ed642873363f9b6797bb51