commit: 52e4366fb68295316cfb01a1793b55d4d2756599 parent cc2b17c46b74dbc083ffcab9ee85477bfd730f2a Author: fosslinux <fosslinux@aussies.space> Date: Thu, 5 May 2022 17:54:38 +1000 Merge pull request #153 from fosslinux/wip-fixes Various fixesDiffstat:
51 files changed, 262 insertions(+), 206 deletions(-)diff --git a/.gitignore b/.gitignore@@ -5,6 +5,7 @@ tmp/ kernel -sources/ +sysa/distfiles/ +sysc/distfiles/ __pycache__ sysa/bootstrap.cfgdiff --git a/README.rst b/README.rst@@ -29,12 +29,15 @@ Get me started! a hard drive. This is currently hardcoded as sda. You also need to put ``sysc/tmp/disk.img`` onto your sda on the bootstrapping machine. + c. Alternatively, do not use python at all, see "Python-less build" + below. 5. Wait. 6. If you can, observe the many binaries in ``/usr/bin``! When the bootstrap is completed ``bash`` is launched providing a shell to explore the system. + Background ---------- @@ -88,7 +91,7 @@ Comparison between GNU Guix and live-bootstrap +----------------------+----------------------+----------------------+ [1]: Both projects only use software licensed under a FSF-approved -free software license. +free software license. Kernel is excluded from seed. [2]: Reiterating that Guix is working on a full source bootstrap, although that still uses guile (~12 MB). [3]: Work is ongoing to use other, smaller POSIX kernels. @@ -153,3 +156,16 @@ from sysb, executed through util-linux's ``switch_root`` command which moves the entire rootfs without a reboot. Every package from here on out is compiled under this system, taking binaries from sysa. Chroot mode skips sysb, as it is obviously irrelevant for a chroot. + +Python-less build +----------------- + +Python is no longer a requirement to set up the build system. The +repository is almost completely in a form where it can be used as the +source of a build. + +1. Copy sysa/stage0-posix/src/* to the root of the repository. +2. Copy sysa/stage0-posix/src/bootstrap-seeds/POSIX/x86/kaem-optional-seed + to init in the root of the repository. +3. Create a CPIO archive (eg, ``cpio --format newc --create --directory . > ../initramfs``). +4. Boot your initramfs and kernel.diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources@@ -33,7 +33,6 @@ c25b36b8af6e0ad2a875daf4d6196bd0df28a62be7dd252e5f99a4d5d7288d95 coreutils-5.0. 1d013547889f20576460249c4210632d5314531c8477378a2e046b13a8ebeb7e coreutils-6.10.tar.gz 6f7cfc0ac6717afb6ba1f41b0da43a713ba0dd97dec1227e32effc12d79f08c1 coreutils-8.32.tar.gz af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3 deblob-4.9 -185cfad468a033b6c69b882c3941440e50ac3e3b68617d3d93b4a8755357d65c deblob-check d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6 diffutils-2.7.tar.gz 54437ae4211867de7ad55723f68b94c29cb2f08a23f431e0bbbc9f34ee384f47 dist-3.5-236.tar.gz 813cd9405aceec5cfecbe96400d01e90ddad7b512d3034487176ce5258ab0f78 findutils-4.2.33.tar.gz @@ -65,6 +64,7 @@ f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.ta a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2 help2man-1.36.4.tar.gz 203c93e004ac7ad0e50423ff54d89e40fa99f45b207b2b892a4d70211feebe05 kbd-1.15.tar.gz af618de7848142f204b57811f703de3ae7aa3f5bc5d52226db35800fa8fc4dff kexec-tools-2.0.22.tar.gz +f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz 587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af libatomic_ops-7.6.10.tar.gz 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056 libffi-3.3.tar.gz 8e8ce6175d435e7df8c9bbb0e5fd5357691cdc28c1a2d00fdd9b47b7643bec3a libtool-1.4.tar.gz @@ -83,6 +83,7 @@ a8da14d1cd6aaa1ff607a571a8ca5948258195c712de05b0f8ad11c215b6b094 mes.tar.gz 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz 9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz f36e4fb7dd524dc3f4b354d3d5313f69e7ce5a6ae93711e8cf6d51eaa8d2b318 nyacc-1.00.2.tar.gz +0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a patch-2.5.9.tar.gz ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz 1ae43c8d2983404b9eec61c96e3ffa27e7b07e08215c95c015a4ab0095373ef3 perl-5.000.tar.gz @@ -101,8 +102,6 @@ c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a tar-1.12.tar.g de23af78fca90ce32dff2dd45b3432b2334740bb9bb7b05bf60fdbfc396ceb9c tcc-0.9.27.tar.bz2 988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa texinfo-6.7.tar.xz f694bee56099b8d72c3843d97e27f2306aa9946741e34a27391f6f6f19c7bcd0 util-linux-2.19.1.tar.gz -166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 xz-5.0.5.tar.bz2 -4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz -f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz -0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz 0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a xbps-0.59.1.tar.gz +166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 xz-5.0.5.tar.bz2 +7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xzdiff --git a/lib/sysgeneral.py b/lib/sysgeneral.py@@ -3,7 +3,7 @@ This file contains a few functions to be shared by all Sys* classes """ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-License-Identifier: GPL-3.0-or-later @@ -30,9 +30,10 @@ class SysGeneral: git_dir = None sys_dir = None initramfs_path = None + mounted_tmpfs = False def __del__(self): - if not self.preserve_tmp: + if self.mounted_tmpfs and not self.preserve_tmp: print(f"Unmounting tmpfs from {self.tmp_dir}") umount(self.tmp_dir) os.rmdir(self.tmp_dir) @@ -43,6 +44,7 @@ class SysGeneral: os.mkdir(self.tmp_dir) print(f"Mounting tmpfs on {self.tmp_dir}") mount('tmpfs', self.tmp_dir, 'tmpfs', 'size=8G') + self.mounted_tmpfs = True def check_file(self, file_name): """Check hash of downloaded source file."""diff --git a/lib/utils.py b/lib/utils.py@@ -5,7 +5,7 @@ This file contains a few self-contained helper functions # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> import os import shutildiff --git a/parts.rst b/parts.rst@@ -250,8 +250,8 @@ m4 1.4.7 flex 2.6.4 and bison. It allows macros to be defined and files to be generated from those macros. -flex 2.6.14 -=========== +flex 2.6.4 +========== We recompile unpatched GNU ``flex`` using older flex 2.5.11. This is again a two stage process, first compiling flex using ``scan.c`` (from @@ -584,14 +584,12 @@ work with our version of binutils. However, a much earlier 4.9.10 does (selected arbitarily, could go newer but did not test), with a small amount of patching. This is also modern enough for most hardware and to cause few problems with software built in sysc. Secondly, the linux-libre scripts are used -to deblob the kernel. Unauditable, unbootstrappable binary blobs within our -kernel are unacceptable. Our gawk is too buggy/old so we use sed instead for -this operation. Every other pregenerated file is appended with ``_shipped`` so -we use a ``find`` command to remove those, which are automatically regenerated. +to deblob the kernel. Every other pregenerated file is appended with ``_shipped`` +so we use a ``find`` command to remove those, which are automatically regenerated. The kernel config was originally taken from Void Linux, and was then modified for the requirements of live-bootstrap, including compiler features, drivers, -and removing modules. Speaking of which, modules cannot be used. These cannot -be transferred to subsequent systems, and we do not have ``modprobe``. Lastly, +and removing modules. Modules are unused. They are difficult to transfer to +subsequent systems, and we do not have ``modprobe``. Lastly, the initramfs of sysb is generated in this stage, using ``gen_init_cpio`` within the Linux kernel tree. This avoids the compilation of ``cpio`` as well. @@ -601,11 +599,14 @@ go_sysb This is the last step of sysa, run for non-chroot mode. It uses kexec to load the new Linux kernel into RAM and execute it, moving into sysb. +In chroot, sysb is skipped, and data is transferred directly to sysc and +chrooted into. + sysb ==== sysb is purely a transition to sysc, allowing binaries from sysa to get onto a -disk (as sysa does not nessecarily have hard disk support in the kernel). +disk (as sysa does not necessarily have hard disk support in the kernel). It populates device nodes, mounts sysc, copies over data, and executes sysc. bash 5.1 @@ -738,6 +739,31 @@ We finally compile a full version of Perl using Configure. This includes all bas extensions required and is the latest version of Perl. We are now basically able to run any Perl application we want. +libarchive 3.5.2 +================ + +``libarchive`` is a C library used to read and write archives. + +openssl 1.1.1l +============== + +OpenSSL is a C library for secure communications/cryptography. We do not +strictly use any of the networking functions of this library but it is a hard dependency +of XBPS. + +zlib 1.2.12 +=========== + +zlib is a software library used for data compression and implements an abstraction of +DEFLATE algorithm that is also used in ``gzip``. + +xbps 0.59.1 +=========== + +XBPS is the package manager used from Void Linux. It has a rather simple package +creation and installation system, and is much more robust than the hand-rolled +tar package system used previously. From here, all package archives use XBPS. + automake 1.16.3 =============== @@ -767,12 +793,6 @@ texinfo 6.7 Texinfo is a typesetting syntax used for generating documentation. We can now use ``makeinfo`` script to convert ``.texi`` files into ``.info`` documentation format. -zlib 1.2.11 -=========== - -zlib is a software library used for data compression and implements an abstraction of -DEFLATE algorithm that is also used in ``gzip``. - gcc 4.7.4 =========diff --git a/rootfs.py b/rootfs.py@@ -111,10 +111,10 @@ def main(): system_c = SysC(arch=args.arch, preserve_tmp=args.preserve, tmpdir=args.tmpdir, chroot=args.chroot) system_b = SysB(arch=args.arch, preserve_tmp=args.preserve, - tmpdir=args.tmpdir, chroot=args.chroot) + chroot=args.chroot) system_a = SysA(arch=args.arch, preserve_tmp=args.preserve, tmpdir=args.tmpdir, chroot=args.chroot, - sysb_tmp=system_b.tmp_dir, sysc_tmp=system_c.tmp_dir) + sysb_dir=system_b.sys_dir, sysc_tmp=system_c.tmp_dir) bootstrap(args, system_a, system_b, system_c)diff --git a/sysa.py b/sysa.py@@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> import os from distutils.dir_util import copy_tree @@ -17,7 +17,7 @@ class SysA(SysGeneral): Class responsible for preparing sources for System A. """ # pylint: disable=too-many-instance-attributes,too-many-arguments - def __init__(self, arch, preserve_tmp, tmpdir, chroot, sysb_tmp, sysc_tmp): + def __init__(self, arch, preserve_tmp, tmpdir, chroot, sysb_dir, sysc_tmp): self.git_dir = os.path.dirname(os.path.join(__file__)) self.arch = arch self.preserve_tmp = preserve_tmp @@ -30,8 +30,8 @@ class SysA(SysGeneral): os.mkdir(self.tmp_dir) self.sysa_dir = os.path.join(self.tmp_dir, 'sysa') self.base_dir = self.sysa_dir - self.cache_dir = os.path.join(self.git_dir, 'sources') - self.sysb_tmp = sysb_tmp + self.cache_dir = os.path.join(self.sys_dir, 'distfiles') + self.sysb_dir = sysb_dir self.sysc_tmp = sysc_tmp self.chroot = chroot @@ -58,17 +58,15 @@ class SysA(SysGeneral): self.sysc() def sysa(self): - """Copy in sysb files for sysb.""" + """Copy in sysa files for sysa.""" self.get_packages() + shutil.copytree(self.sys_dir, os.path.join(self.tmp_dir, 'sysa'), shutil.ignore_patterns('tmp')) - # Copy in downloaded sources - shutil.copytree(self.cache_dir, os.path.join(self.tmp_dir, 'sources')) - def sysb(self): """Copy in sysb files for sysb.""" - shutil.copytree(self.sysb_tmp, os.path.join(self.tmp_dir, 'sysb'), + shutil.copytree(self.sysb_dir, os.path.join(self.tmp_dir, 'sysb'), shutil.ignore_patterns('tmp')) def sysc(self):diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs@@ -1,29 +1,29 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.12_0.links -0315f21016b38981aa40e2fd2d3d12b9fa2f0ddd9ef13576eb0ab3c82295af74 autoconf-2.12_0.tar.bz2 +e100b17fdc78a84e58c5c9ccd3090d8bee10de2314236b99c96d17f199049e15 autoconf-2.12_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.13_0.links -cd8c61bd1d22239efd9a7a4932e1f973285c9c890d9b62e0c9dab3c1f4080106 autoconf-2.13_0.tar.bz2 +19fcaf4a87b3cfec7a1331a7b0316b73bd8fda1495b3cecb00c626f320126d49 autoconf-2.13_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.52_0.links -a5bead63a06e0a023855f6aa6605bbb2b1d62a7774eb89437eed845c728a6a27 autoconf-2.52_0.tar.bz2 +0d4b980825d9f09d41a76939c8112b8bcc8ddde57d88fcaeffefcab76c4376b1 autoconf-2.52_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.52_1.links -28154e19e6c346f90217b2b85ca3b77631f2dca539146e0cb64c4e2427d62cea autoconf-2.52_1.tar.bz2 +e7a1892fdfa482774dc60ec27c105bc2b7e010dfcba157d0ea7020e58891bbf5 autoconf-2.52_1.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.53_0.links -2dcbb81e7ba55cb7a3a6e0d8a2afd7aad99e4f626b8b6fe8485ef0f48f7e4474 autoconf-2.53_0.tar.bz2 +faeaf0cf5d8cf2d1e9c5b84a64e4379f96aebec46698b3e47cf7fc3577842fa6 autoconf-2.53_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.53_1.links -2dcbb81e7ba55cb7a3a6e0d8a2afd7aad99e4f626b8b6fe8485ef0f48f7e4474 autoconf-2.53_1.tar.bz2 +faeaf0cf5d8cf2d1e9c5b84a64e4379f96aebec46698b3e47cf7fc3577842fa6 autoconf-2.53_1.tar.bz2 ad6c385e96d8c7ee9fa026e096b65821030adcc1c873547b4f6e3dc55e9d4669 autoconf-2.54_0.links -6ebd53013ebbbe4df2d6b93490aa64ae977cd240a1dc6477a73df186d7bdcdba autoconf-2.54_0.tar.bz2 +c763a72b1e4704cbe0d5e4f71d052f100a4e564dd72e6be7b5a445a7b3af7bcb autoconf-2.54_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.54_1.links -6ebd53013ebbbe4df2d6b93490aa64ae977cd240a1dc6477a73df186d7bdcdba autoconf-2.54_1.tar.bz2 +c763a72b1e4704cbe0d5e4f71d052f100a4e564dd72e6be7b5a445a7b3af7bcb autoconf-2.54_1.tar.bz2 1fd322fa08bd65b9630b03983933dd6a85d32090d49e16029b2dae16f5f7208a autoconf-2.55_0.links -053a755b214722c010316b917e91e0c4f12a47b0a0dc381ce6349b01a8bdd74e autoconf-2.55_0.tar.bz2 +5a00907a3e0ba6effcaf420e6f2823c3e037c878a349869fa10eadc46e7c6ba5 autoconf-2.55_0.tar.bz2 a5910f038266cf25281f770f13486979543e1b4ecd3d8c3d929812f052167ed5 autoconf-2.57_0.links -ab2fda41322186056b168a3bf517703863a0b4353a6db19b9a910a6a9e06e0c7 autoconf-2.57_0.tar.bz2 +1f41a3ef73a5fbf015d7ee06fa2c4c47a5338c0c0e2408e4de207b1944f921ff autoconf-2.57_0.tar.bz2 ba8ac111cb1ce8de6d35086e198541c620cbedb2525552b98d8f6c399b449ffa autoconf-2.59_0.links -29346e72b90e039d3bcb96b3f565748fcaf2f3aa1707e4bec4311c2abcf241b3 autoconf-2.59_0.tar.bz2 +fdce92fb2e2f80e630328da6df87c108372d473cb4483ba58813eaf5487653c8 autoconf-2.59_0.tar.bz2 95c7b832abbc66673ec1d0a4254224d7ee4b8450c817121e67195ff8719229ef autoconf-2.61_0.links -95466f9440a1278a95fb9708c528cfd7657b3aa7d38f1a52669c1d09edce5233 autoconf-2.61_0.tar.bz2 +8056ee37882cde6f6be51188983a8469c6e7f75e6bfca9d60a2b8d910e0dbecb autoconf-2.61_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.61_1.links -060fddab8b884b95842a46aacc1d0d9a067195dafea562082ef8da0e63279aed autoconf-2.61_1.tar.bz2 +20f02b2e999db056c612207543ed02ef612d6fee9a523f5ba17f934fccd5a91b autoconf-2.61_1.tar.bz2 48032a5174c2d346f43f43e00e82610cda23ca868c1202f001e241033d15a206 autoconf-2.64_0.links a6c4340135a23c3934ce1357c7ee21bf963ae56ab49a86d27e57af15437bfad9 autoconf-2.64_0.tar.bz2 6c73d920d88a96d1f971f98afe04dbc456522383777a42bb758f765630019f26 autoconf-2.69_0.links @@ -39,76 +39,76 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.15. 45733d8275e049824caa0c0d5cea94a863e136b9766bb8bf72c5372b73fd6613 automake-1.15.1_0.tar.bz2 708d854632c90e3706194a1a7555a3dc2fafb7ccae65872ad3420083f2781143 automake-1.16.3_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.4-p6_0.links -3d3656d771780362e54edc632c517b6957de431bcfda9941cfc5d25d07e37e6d automake-1.4-p6_0.tar.bz2 +6c50b053bf9c36d9fc524a435b07d7462d6177f2edb21807dcf272e777521ec9 automake-1.4-p6_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.6.3_0.links -6b7133a5a9fa9b0a17f2a3288937560aa50b4a959a8ed660a1c838dea0a8e0f2 automake-1.6.3_0.tar.bz2 +ce60572db606f3dcb882c274c9d1ccf2ad54f38a9d87c6bcdb8654692a0e34f9 automake-1.6.3_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.6.3_1.links -fd3f08f1f36f01c60a58e673c22d24baf387753096252c6485a2c746fb5a59be automake-1.6.3_1.tar.bz2 +7801f7e1136d20bcbc132df84d8516ea91279255b44b6ef4e9c6978fbb097c05 automake-1.6.3_1.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.6.3_2.links -1f72ccf75607d5230edd45e87d7c193e4170f4496fb867f71dd8bbe06457cba5 automake-1.6.3_2.tar.bz2 -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7.8_0.links -56b1db0695b9df345434d12affd890be0d2abf98e2ecc0a8db5610c2bdad5877 automake-1.7.8_0.tar.bz2 +ae735743f1f6e522885b9b3d35acb83fe54717467dc7530f2526a943809918bf automake-1.6.3_2.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7_0.links -a2e3b4407bda56f88d78c4efed47fe6adff31e5869e4caa9c0d51bc228b03ae7 automake-1.7_0.tar.bz2 +725fe4a6ebc35219d672917800be8763315bab5dc3449f3b99cfa5396bb69daf automake-1.7_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7_1.links -a2e3b4407bda56f88d78c4efed47fe6adff31e5869e4caa9c0d51bc228b03ae7 automake-1.7_1.tar.bz2 +725fe4a6ebc35219d672917800be8763315bab5dc3449f3b99cfa5396bb69daf automake-1.7_1.tar.bz2 +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7.8_0.links +be69e2f68afbcd8243cceb07ee2356c0e1464fe1a535ca7435f0d2bb901c7d0d automake-1.7.8_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.8.5_0.links -4709bd37394a9ae54b3fd48af13a13027d9dd4b13d9b84262850078bf42f68ec automake-1.8.5_0.tar.bz2 +c87030c3524d546de2e1b5a64fffe8e30a54a401cb5afd34d7f12223ac87423d automake-1.8.5_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.9.6_0.links -4d384100a10a3d8735b1a15f702ed3e6f6600c63a82510b4840c253fe6ea13e8 automake-1.9.6_0.tar.bz2 +8b417791bcd7ef38f2e685e1ff405e4549291a10f9c6c244eee6644ebc757782 automake-1.9.6_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.9.6_1.links -4d384100a10a3d8735b1a15f702ed3e6f6600c63a82510b4840c253fe6ea13e8 automake-1.9.6_1.tar.bz2 +8b417791bcd7ef38f2e685e1ff405e4549291a10f9c6c244eee6644ebc757782 automake-1.9.6_1.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bash-5.1_0.links c21699b507d6303b954fb94a8d32eb36273a7cd62ed3e95ad3b841be247399a0 bash-5.1_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 binutils-2.14_0.links -118b5f654d48113e4327df161cf8780d1275775fbfe1ca70f107d6d34b15d01c binutils-2.14_0.tar.bz2 +e6c462f70df90369d0471e04e347c68a5ff2e3b67543d44fa19657d83b9c4e35 binutils-2.14_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-2.3_0.links 93c3ca8187d8b8c34d08c027a8fcb9740e08413c4195c654267a567b745dc48a bison-2.3_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_0.links -a13065b727f7375f13c8a5c55fcc5996f71da25ea9f1d3a00f0841c66a5267c5 bison-3.4.1_0.tar.bz2 +a8d372a9ec4b39bb39f4d83dd689e6df75222c3d896dd25348070308bee9be7f bison-3.4.1_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_1.links -eeb74409f87963e8d58078ef5d4278baa18d07b357ecef2b3c7ba66ca01d14fa bison-3.4.1_1.tar.bz2 +6458d3aea1c2daacbb7017a3c0732c38d81719fc1e523799252dfd819ad2efd1 bison-3.4.1_1.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_2.links -019bd3972382e761ac499d3a9f0f4fa9408268d7a608ee1de147593aaff1f7da bison-3.4.1_2.tar.bz2 +48d93d34b21eb226c05f5b3eff78ad0666e4e4eb655bf8ebe88cade0fc51966d bison-3.4.1_2.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.2_0.links 0146942b6d008d11c42d11141c2f80dbdbbf8472073db79d921bb516e20f9dcf bison-3.4.2_0.tar.bz2 07fee627dcf30aaa9beab40ffeacc3bec7afe3488d2fbc7e8a72ae782a85869a bzip2-1.0.8_0.links -d9a4b7f7b2d4113cd0c6aee962ec80f9af13acded0d796e9a3acac6af3eb2710 bzip2-1.0.8_0.tar.bz2 +f4fad25a0e7a451ed906b76846efd6d2699a65b40795b29553addc35bf9a75c8 bzip2-1.0.8_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 coreutils-5.0_0.links -23adbf427dab824a9b63604ddd2226e5598ccccdaa33f6f8b723fb316b2f131b coreutils-5.0_0.tar.bz2 +61d64f999975ec0e2e7a85d7c983036ebc6b2af617c54135d6ef8247fd7c54f5 coreutils-5.0_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 coreutils-6.10_0.links -3c826ca62e5e2f46008e091dda7776af866f55ba90f6c5842e579cd73cde518f coreutils-6.10_0.tar.bz2 +0e24e09194ab37a62d4712b0925c4a0bb0467f08751bd3915d9e904c8fefffb5 coreutils-6.10_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 coreutils-8.32_0.links 19d3214553736d7f6d144c8826be50553c6cb961fa0cc2ccba400f4902250796 coreutils-8.32_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 diffutils-2.7_0.links -c073d63ed17670197d026065557bc5da902db9b2213d89e1e5ceb130304e7c02 diffutils-2.7_0.tar.bz2 +bc0a9a1acce254db2833aa5ff9f56b0675b42fdebd9ab7d5a5f921757ed79667 diffutils-2.7_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 dist-3.5-236_0.links de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45 dist-3.5-236_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 findutils-4.2.33_0.links -8aad38864b8a4b003f37c11fb2564b51dc49fb78f38bde68fd569a21e0c440a0 findutils-4.2.33_0.tar.bz2 +05e06133fb0235d0594d23e0df58760c9eb1865ba921124fe8a409a09d2abc14 findutils-4.2.33_0.tar.bz2 865b57db33fc860abd00efc6b239366c3c1354ab4e699d8506e21a4316352863 flex-2.5.11_0.links -0404450ea64bce895204d0d05b8d2c554bc849fc6f66524cf28f0ffb0cb8d351 flex-2.5.11_0.tar.bz2 +fb2b8531491ceac1c55c6237e67bd281144eb66d361574e3d3f15e084bf2dd3b flex-2.5.11_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 flex-2.5.33_0.links d1b62a9ea3516cd6399d67ea2e6641d922cb763f665b4d776dbfcd980925cd59 flex-2.5.33_0.tar.bz2 a0ab924b46c0c11740a52958313d0543182053f476d42879128c57c52131a956 flex-2.6.4_0.links -f849859f234110ea0af9af126238d5a153655ac2945073f8cc680c40a3b275f8 flex-2.6.4_0.tar.bz2 +0a968380ccf663dbf1de12514367ed2f9444649b10a0f1c878d7c6d1d2156df1 flex-2.6.4_0.tar.bz2 85c6ea124aa20e758ac334689782eeda694a35e32eacf320b588130be15d746a gawk-3.0.4_0.links -63f5eb2b7c24630ddca14ad97afd664277552566482d2dd16288f963ec3cda62 gawk-3.0.4_0.tar.bz2 +83cdb780d9603e318728aa1cbcb8ba0ed8ddc618913b4a333ab2c4934c6cae9c gawk-3.0.4_0.tar.bz2 452767f7321aef2eeff9d3a935a574f0680f834f89f2589f3a43951a159b3948 gc-8.0.4_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 gcc-4.0.4_0.links b6134fabf6f8eb98c63f0218281cc5fe0140094f0dc92415653b0de28e877ba0 gcc-4.0.4_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 gcc-4.0.4_1.links af372b5ecf41c9d9c10da58f845c5d0e32ac27e1c11f4e4a1a4a7f01fb9c71e1 gcc-4.0.4_1.tar.bz2 -3d012ad16221f6cd39d35158a5d483002d53e279eed0a4d6a1ad32bac4f2fd52 gcc-4.7.4_0.x86.xbps +c2fd372b857146510db4dfc53455915702dac269e81fea1430a5e3ad6a9c614e gcc-4.7.4_0.x86.xbps d5c08e8f48c78b9f96c38cdbcea321be57a4f5a7e8bf05c9bac5770550aab0ca gettext-0.21_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 gmp-6.2.1_0.links ddcc4d5e4a80855d1c59a22ad9d095be5b0ae828461f98bc1246093a797a83b4 gmp-6.2.1_0.tar.bz2 507f79f3c07b212154053caae665ee7ed3a53bc420987ec381cf637339fef7de gperf-3.1_0.x86.xbps ae0b200220b4a6d40571764d065ddf35d9535e94582c6bdb2c95316d937c4dce grep-2.4_0.links -38017521e32810dc6365a62d0647aadf42f7a4519e6cc7a3120f63bc39abff97 grep-2.4_0.tar.bz2 +60f8b585dfbea490467baefa6445e79cbf691b6e88886baa433894fa001e000b grep-2.4_0.tar.bz2 e86436389d960515efdc1ba08c8178c1134dbed693ccce01ea82b05e6d9874f7 guile-3.0.7_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 help2man-1.36.4_0.links -ff24fb2db6ac1231341aed7ba34607833a64c7583966f9c4e045b92adafe0efc help2man-1.36.4_0.tar.bz2 +566d93b2c41ba4d61b3f34baa8a0e2af6ea568d15ca1be0ac483b74fcdbfe911 help2man-1.36.4_0.tar.bz2 7eeeb832b400a11419e4ef14bf778b8177bbc6a77f5a37c0c0f2965f66ab4d51 kbd-1.15_0.links 4ba1f2f0878a0450815842debc7e0a7a7565cf3ba7a1fe19a06cdb3bdf2011c2 kbd-1.15_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 kexec-tools-2.0.22_0.links @@ -118,7 +118,7 @@ a481bde6169a5c9bec7a73782a1d2649d0db025adecc87b02e08e218c0251b43 libarchive-3.5 3a9d7649afe75a76583305283c8606e717cbab01b098f094f806e8e37045a658 libatomic_ops-7.6.10_0.x86.xbps 019bf569a1374e7fff7a106b11eb2c91dfd8da7f3a8b04e98d7e9403c27fc781 libffi-3.3_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 libtool-1.4_0.links -7de31e089182cb00b611bd97afe3376d5df40b8e130f0fe9da731c42775fe77d libtool-1.4_0.tar.bz2 +c772b9ebd1f51b5b90cc820ad8fb28a3f816acedccaa632641495355f9b23b9b libtool-1.4_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 libtool-2.2.4_0.links d5a622df5eb4bf80a2e697262158e46c4b9cc95122b3f2ebf8df0a650643e8fb libtool-2.2.4_0.tar.bz2 19bde5b058c188e976f4cfcea35d9f0d897daf593479a7db00eb6a6eabefd131 libunistring-0.9.10_0.x86.xbps @@ -127,63 +127,62 @@ a575a37f05006915c532698500bcc6476c0d2e09ac447cb1b7aa9679e7b593c5 linux-4.9.10_0 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 linux-headers-5.10.41_0.links 73a0ba95a62bf30c794c4025b36b73b3140371e2419b502937c5ce83a0febe5a linux-headers-5.10.41_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 m4-1.4.7_0.links -e26e62fda9ac8e85db7145b1f5fb870cfacd75edfd57fe7714922615dba6f45a m4-1.4.7_0.tar.bz2 +557e9a7f6c169c9e7d988188f9e36f9c7084c8134148959ec5849eedcc464a6a m4-1.4.7_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 make-3.82_0.links 1f3cabc0beec65e4adb7a3dc720ea94ef49090692eca717b4f2c75d4a7ee16a3 make-3.82_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 make-4.2.1_0.links 34b87eca72afe922e8ea88f154af2b89d7920efd701babef53a05a1ea6c8bc78 make-4.2.1_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 mes-0.23_0.links -b5441c4bbb30765c0ef23863583f456e0383c50318f20ac0d1aebbd104fc1b45 mes-0.23_0.tar.bz2 +7216483ab218b56539ef4846eac59fc67b6888f52388233d81c7dc460f20bfdb mes-0.23_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 mpc-1.2.1_0.links 0f88b1715bde14c5d65ffeff54903fae5a11cd02d0e95cad9629c76d42e8d739 mpc-1.2.1_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 mpfr-4.1.0_0.links b6d39f777d6770894844a64715149e1f4440668da28b91902e23be38086a0358 mpfr-4.1.0_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 musl-1.1.24_0.links -daf045916ee58babea4a0c60af45b756e1cca2dbf37a75877a8d9a9fb4cb6195 musl-1.1.24_0.tar.bz2 +26d394ab75ff14854986342e88010d29d2db7cd3b9bcce5abdcf3985f2dc22d5 musl-1.1.24_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 musl-1.1.24_1.links -add489a4cc25f54d1527b7160395f4af483e7a80ce9391ca30b862f00a27a03a musl-1.1.24_1.tar.bz2 +ccc546868be7726effb6dab24a24af486bd305bfbf5a909e5b53f5d7f2cd52f2 musl-1.1.24_1.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 musl-1.1.24_2.links -1298143458b0132825ed0673059b9e61a1b9f0a4bab865dfb9d4e387d44b32be musl-1.1.24_2.tar.bz2 +2a08a02bac1becb471ab18bb725da164631ab8f2acdd0b5d29542e79ff5bc8ba musl-1.1.24_2.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 musl-1.2.2_0.links 7d841aa6f22320447443cc0edad29b2950f932a5361c2e0ffbbda392a53624fd musl-1.2.2_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 openssl-1.1.1l_0.links bdf100e847adcf98e278d942c942cfa589afc7084744fc74df0e91fc5ae4a7d9 openssl-1.1.1l_0.tar.bz2 863e44f0df017895ca6aecfca668971b9c445aa2958ea29134e03cd905502007 patch-2.7.6_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.000_0.links -ed5a2422e430a4c445b0afc4bc4a0fcfd7de84b08206c8ceca106826500098bb perl-5.000_0.tar.bz2 +96f5f0c6c0aab29e9d4e316c704c862a4ceaf39f19cf4db7e76d3bf10ebc217a perl-5.000_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.003_0.links -9311682e86e847fe7a2fe5e68013b2643042b8409011fcb68cb8f187840cea4c perl-5.003_0.tar.bz2 +c7cc7cfea620fcc9834844b6b69d59e39c64d70cdfe25c7387525d0b8eabcdfe perl-5.003_0.tar.bz2 +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl5.004-05_0.links +7b21b31997df44023070c122b613f555658cad8bd39a89ce834212833d6cedbc perl5.004-05_0.tar.bz2 +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl5.005-03_0.links +b418ef47a65ba1f52f0b79a96ce2ebf1bb1f4f2a78e3985fa512e6c41477f100 perl5.005-03_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.10.1_0.links 0e216f189404be18ef7463665e9288258058b322f0636e9b9c19b5262af7980a perl-5.10.1_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.32.1_0.links 9ed0a0c9ff88af07ea2cb2eea6367365da42a346a81b537f6e4a3dc80076953d perl-5.32.1_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.6.2_0.links -7cbc4e4335fd3e25a24c94e4313c9426039efa28b0eb9eecb2b1e6e23c414ff3 perl-5.6.2_0.tar.bz2 -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl5.004-05_0.links -e58538ab8f14a17941982165de8ea3ff57d402140b86583542af6ef5ab3e35ac perl5.004-05_0.tar.bz2 -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl5.005-03_0.links -3247abde3ddced1efb1f418f4d03765f996503421d67a07bf21000f85f3f3309 perl5.005-03_0.tar.bz2 +b5fce312b381d0135d44b1bd30089e89e17ce35e6cf5e326eac87baf6c554dd4 perl-5.6.2_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 pkg-config-0.29.2_0.links f7d06f0ea85e8ede35ffdd0c37a8996803263ca8766905e5533f36d2258fddfa pkg-config-0.29.2_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 sed-4.0.9_0.links -32672e07d3b571067084878edfe0b12b18379f3a63aa69523191f26fb6347e7d sed-4.0.9_0.tar.bz2 +84777d6451b391ee5c16fcf05a38bace0db97d7761f383ff5920b00e65bc1144 sed-4.0.9_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tar-1.34_0.links 4ce969cac1ad1baee8cc9f30d480a02a49fb37e56012e061a65f0cbefe32b84d tar-1.34_0.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_0.links -bc592f7d9a0d41968a4a07e6b9f8964df969a6f73d492b03688f821de003072a tcc-0.9.27_0.tar.bz2 +8d3fd8915ec3d786a9146f8717ef016327243ca9917d53dd2c9c630431ef1bc2 tcc-0.9.27_0.tar.bz2 b69c042a33cbf18e5a2a5a886d675ebcced92f57eec95b0f47345df8f1e89cf0 tcc-0.9.27_1.links -7cab26ac700fee9d445d0f56f285ce2c5c95685a359b231de76b4bf51c85b141 tcc-0.9.27_1.tar.bz2 +1086136d7bb8e0c3b4bba9aa3b0442412d58bdd3effa790015f85a723c9804e1 tcc-0.9.27_1.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_2.links -34cc5e95c3dedb4ab84d0cda8552d2b0957bb6c406fb627f6ef143f510d3b71b tcc-0.9.27_2.tar.bz2 +d88a72f36e947462b5bea9b56ecf6c828b8ba7c363af00e2b02303095555cabe tcc-0.9.27_2.tar.bz2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_3.links -d353c17c187960f16e7944dd4bd1d4b45678ab230ba673ab596f9ce0e87755d1 tcc-0.9.27_3.tar.bz2 +733df9aae85fbf422aac26fe0354c48d035f7a5fb4f79b00e666e0763914aeca tcc-0.9.27_3.tar.bz2 8cc08f90342fdbfac51c9d3d0219f2b5bbf54ef3272aa16c1cee28a97e281822 texinfo-6.7_0.x86.xbps 970cc84444fecc225becb0db24671a186888a8a8d37daf3f40d827a907181a12 util-linux-2.19.1_0.links c5e290b56f7a148b874e148d41050660eaac62124aff8ec29f277a584c4ee672 util-linux-2.19.1_0.tar.bz2 -8a93bd58e2463eeb9ec1bf9b647dffee16e4d0d4d12067c82e4124aabd875710 x86-repodata e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 xbps-0.59.1_0.links -8ac1acb6db2cb2856630d48915f5f38a45aaa2ccb0709d19df60477bcb54fcb1 xbps-0.59.1_0.tar.bz2 +608d4933e5ce97723d3489ceec0944045f43d72cd76263d9eba8a232f52d57da xbps-0.59.1_0.tar.bz2 ac8c7b186195ad29d86c2d1608b0c4ba37eeb12daff8f155d69d568239cae237 xz-5.0.5_0.links 514cd101fa54861de51622f35004423e5e4b168e704127d631692b7b4eed477d xz-5.0.5_0.tar.bz2 -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 zlib-1.2.11_0.links -cf5118fda278108c698c53725f411da4a0939c844a3a053181d916736429642f zlib-1.2.11_0.tar.bz2 +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 zlib-1.2.12_0.links +f73856b9e370cb54a44ca6167abff326d4c909aaa6822c935804766e2ef11ef3 zlib-1.2.12_0.tar.bz2diff --git a/sysa/after.kaem b/sysa/after.kaem@@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> -# SPDX-FileCopyrightText: 2020-2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -12,7 +12,7 @@ PATH=/${ARCH_DIR}/bin # Set commonly used variables sysa=/sysa -sources=/sources +distfiles=/sysa/distfiles prefix=/usr bindir=${prefix}/bin libdir=${prefix}/lib @@ -22,8 +22,8 @@ TMPDIR=/tmp # tmpdir is needed for patch to work # Environmental variables needed for mes NYACC_PKG=nyacc-1.00.2 MES_PKG=mes -MES_PREFIX=${sysa}/${MES_PKG}/src/mes-m2-dad1744fa80f52b3b428803c06b09d39c285f500 -GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sysa}/${MES_PKG}/src/${NYACC_PKG}/module +MES_PREFIX=${sysa}/${MES_PKG}/build/mes-m2-dad1744fa80f52b3b428803c06b09d39c285f500 +GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sysa}/${MES_PKG}/build/${NYACC_PKG}/module mkdir -p ${prefix} ${bindir} ${libdir} ${incdir} ${TMPDIR} cd ${prefix} @@ -66,7 +66,7 @@ cd ${sysa} pkg=${MES_PKG} cd ${pkg} kaem --file ${pkg}.kaem -cd ${sysa} +cd .. # tcc 0.9.26 pkg="tcc-0.9.26"diff --git a/sysa/bash-2.05b/bash-2.05b.kaem b/sysa/bash-2.05b/bash-2.05b.kaem@@ -12,7 +12,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.gz ../src/ +cp ${distfiles}/${pkg}.tar.gz ../src/ gunzip -f ../src/${pkg}.tar.gz tar xf ../src/${pkg}.tar rm -r ../src/diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem b/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem@@ -11,7 +11,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.gz ../src/ +cp ${distfiles}/${pkg}.tar.gz ../src/ gunzip -f ../src/${pkg}.tar.gz tar xf ../src/${pkg}.tar cd ${pkg}diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.sh b/sysa/bzip2-1.0.8/bzip2-1.0.8.sh@@ -13,7 +13,9 @@ src_compile() { } src_install() { - install -D bzip2 ${DESTDIR}${PREFIX}/bin/bzip2 + # Manually install bzip2 (cannot replace binary while running) + install -D bzip2 ${PREFIX}/bin/bzip2 + mkdir -p ${DESTDIR}${PREFIX}/bin ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bunzip2 ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bzcat }diff --git a/sysa/coreutils-5.0/coreutils-5.0.kaem b/sysa/coreutils-5.0/coreutils-5.0.kaem@@ -12,7 +12,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.bz2 ../src/ +cp ${distfiles}/${pkg}.tar.bz2 ../src/ bunzip2 -f ../src/${pkg}.tar.bz2 tar xf ../src/${pkg}.tar cd ${pkg}diff --git a/sysa/findutils-4.2.33/findutils-4.2.33.sh b/sysa/findutils-4.2.33/findutils-4.2.33.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-8e128e.tar.gz" +EXTRA_DISTFILES="gnulib-8e128e.tar.gz" src_prepare() { . ../../import-gnulib.shdiff --git a/sysa/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh@@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="automake-1.16.3.tar.gz" +EXTRA_DISTFILES="automake-1.16.3.tar.gz" src_prepare() { defaultdiff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh@@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="automake-1.16.3.tar.gz" +EXTRA_DISTFILES="automake-1.16.3.tar.gz" src_prepare() { defaultdiff --git a/sysa/gzip-1.2.4/gzip-1.2.4.kaem b/sysa/gzip-1.2.4/gzip-1.2.4.kaem@@ -15,7 +15,7 @@ catm gzip.c.new ../../files/stat_override.c gzip.c cp gzip.c.new gzip.c # Extract -cp ${sources}/${pkg}.tar.gz ../src/ +cp ${distfiles}/${pkg}.tar.gz ../src/ ungz ../src/${pkg}.tar.gz untar ../src/${pkg}.tar cd ${pkg}diff --git a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem@@ -13,7 +13,7 @@ cd build lexdir=/lex # Extract -cp ${sources}/${pkg}.tar.bz2 ../src/ +cp ${distfiles}/${pkg}.tar.bz2 ../src/ bunzip2 -f ../src/${pkg}.tar.bz2 tar xf ../src/${pkg}.tar ${pkg}/yacc ${pkg}/lex rm -r ../src/diff --git a/sysa/helpers.sh b/sysa/helpers.sh@@ -36,6 +36,28 @@ get_links() { fi } +# Get a list of files +get_files() { + local prefix + prefix="${1}" + fs= + if [ -n "$(ls 2>/dev/null)" ]; then + fs=$(echo ./*) + fi + if [ -n "$(ls .[0-z]* 2>/dev/null)" ]; then + fs="${fs} $(echo .[0-z]*)" + fi + for f in ${fs}; do + if [ -d "${f}" ]; then + cd "${f}" + get_files "${prefix}/${f}" + cd .. + else + echo -n "${prefix}/${f} " + fi + done +} + # Reset all timestamps to unix time 0 reset_timestamp() { args= @@ -118,7 +140,7 @@ build() { echo "${pkg}: unpacking source." build_stage=src_unpack call $build_stage - unset EXTRA_SRCS + unset EXTRA_DISTFILES cd "${dirname}" || (echo "Cannot cd into build/${dirname}!"; kill $$) @@ -153,8 +175,6 @@ build() { echo "${pkg}: creating package." cd "${DESTDIR}" src_pkg - # Various shenanigans must be implemented for repoducibility - # as a result of timestamps src_checksum @@ -171,36 +191,31 @@ build() { cd "${SOURCES}" unset -f src_unpack src_prepare src_configure src_compile src_install - unset checksum } # Default unpacking function that unpacks all source tarballs. default_src_unpack() { - SRCS=$EXTRA_SRCS - for f in "/sources/${pkg}."*; do - SRCS="$(basename "$f") ${SRCS}" + distfiles=${EXTRA_DISTFILES} + # shellcheck disable=SC2153 + for f in "${DISTFILES}/${pkg}."*; do + distfiles="$(basename "$f") ${distfiles}" done # Check for new tar + # shellcheck disable=SC2153 if test -e "${PREFIX}/libexec/rmt"; then - for i in $SRCS; do - tar --no-same-owner -xf "/sources/${i}" + for i in ${distfiles}; do + tar --no-same-owner -xf "${DISTFILES}/${i}" done else - for i in $SRCS; do + for i in ${distfiles}; do case "$i" in - *.tar.gz) - tar -xzf "/sources/${i}" - ;; + *.tar.gz) tar -xzf "${DISTFILES}/${i}" ;; *.tar.bz2) # Initial bzip2 built against meslibc has broken pipes - bzip2 --decompress --keep "/sources/${i}" - tar -xf "/sources/${i%.bz2}" - rm "/sources/${i%.bz2}" - ;; + bzip2 -dc "${DISTFILES}/${i}" | tar -xf - ;; *.tar.xz) - tar -xf "/sources/${i}" --use-compress-program=xz - ;; + tar -xf "${DISTFILES}/${i}" --use-compress-program=xz ;; esac done fi @@ -253,7 +268,13 @@ create_tarball_pkg() { tar --no-recursion --null -T /tmp/filelist.txt -cf "/usr/src/repo/${pkg}_${revision}.tar" cd - else - tar -C "${DESTDIR}" -cf "/usr/src/repo/${pkg}_${revision}.tar" . + echo -n > /dev/null + tar -cf "/usr/src/repo/${pkg}_${revision}.tar" -T /dev/null + cd "${DESTDIR}" + for f in $(get_files .); do + tar -rf "/usr/src/repo/${pkg}_${revision}.tar" "${f}" + done + cd - fi touch -t 197001010000.00 "${pkg}_${revision}.tar" bzip2 --best "${pkg}_${revision}.tar" @@ -297,9 +318,8 @@ src_apply() { rm -f "/${file}" >/dev/null 2>&1 || true done < /tmp/filelist.txt fi - bzip2 --decompress --keep "/usr/src/repo/${pkg}_${revision}.tar.bz2" - tar -C / -xpf "/usr/src/repo/${pkg}_${revision}.tar" - rm "/usr/src/repo/${pkg}_${revision}.tar" + bzip2 -dc "/usr/src/repo/${pkg}_${revision}.tar.bz2" | \ + tar -C / -xpf - # shellcheck disable=SC2162 # ^ read -r unsupported in old bash while read line; dodiff --git a/sysa/linux-4.9.10/linux-4.9.10.sh b/sysa/linux-4.9.10/linux-4.9.10.sh@@ -1,19 +1,17 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later src_unpack() { mkdir "${pkg}" - mv /sources/deblob-4.9 "${pkg}/" - mv "/sources/${pkg}.tar.gz" . + mv "${DISTFILES}/deblob-4.9" "${pkg}/" # Remove all previous source tarballs - rm /sources/* - mv ${pkg}.tar.gz /sources + mv "${DISTFILES}/${pkg}.tar.gz" . + rm -r "${DISTFILES}/"* + mv "${pkg}.tar.gz" "${DISTFILES}" default || true # Predictable link errors - not a problem - - # Clear up storage space - rm -rf "/sources/${pkg}.tar.gz" + rm -r "${DISTFILES}" # Clear storage space } generate_autoconf_h() {diff --git a/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh b/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh@@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later src_unpack() { - tarball="/sources/linux-headers-5.10.41.tar.gz" + tarball="${DISTFILES}/linux-headers-5.10.41.tar.gz" tar -xzf "${tarball}" "${dirname}/scripts" tar -xzf "${tarball}" "${dirname}/include" tar -xzf "${tarball}" "${dirname}/arch/x86/include"diff --git a/sysa/make-3.80/make-3.80.kaem b/sysa/make-3.80/make-3.80.kaem@@ -10,7 +10,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.gz ../src/ +cp ${distfiles}/${pkg}.tar.gz ../src/ gunzip -f ../src/${pkg}.tar.gz tar xf ../src/${pkg}.tar cd ${pkg}diff --git a/sysa/mes/mes.kaem b/sysa/mes/mes.kaem@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2020-2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2020-2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -18,14 +18,17 @@ cp files/mescc.scm ${bindir}/ chmod 755 ${bindir}/mescc.scm # Unpack -mkdir src -cp ${sources}/${NYACC_PKG}.tar.gz src/ -cp ${sources}/${MES_PKG}.tar.gz src/ +mkdir src build cd src +cp ${distfiles}/${NYACC_PKG}.tar.gz ${NYACC_PKG}.tar.gz ungz ${NYACC_PKG}.tar.gz -untar ${NYACC_PKG}.tar +cp ${distfiles}/${MES_PKG}.tar.gz ${MES_PKG}.tar.gz ungz ${MES_PKG}.tar.gz -untar ${MES_PKG}.tar +cd .. + +cd build +untar ../src/${NYACC_PKG}.tar +untar ../src/${MES_PKG}.tar cp ../files/config.h ${MES_PREFIX}/include/mes @@ -287,5 +290,5 @@ cp include/sys/user.h ${incdir}/sys/user.h cp include/sys/wait.h ${incdir}/sys/wait.h # Checksums -cd ${sysa}/${MES_PKG} +cd ../.. sha256sum -c checksumsdiff --git a/sysa/musl-1.2.2/musl-1.2.2.sh b/sysa/musl-1.2.2/musl-1.2.2.sh@@ -1,7 +1,9 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later +SRCS="musl-1.2.2.tar.gz" + src_configure() { CC=gcc ./configure \ --host=i386-unknown-linux-musl \diff --git a/sysa/patch-2.5.9/patch-2.5.9.kaem b/sysa/patch-2.5.9/patch-2.5.9.kaem@@ -10,7 +10,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.gz ../src/ +cp ${distfiles}/${pkg}.tar.gz ../src/ gunzip -f ../src/${pkg}.tar.gz tar xf ../src/${pkg}.tar cd ${pkg}diff --git a/sysa/run.sh b/sysa/run.sh@@ -14,6 +14,7 @@ set -e export PREFIX="${prefix}" # shellcheck disable=SC2154 export SOURCES="${sysa}" +export DISTFILES="${sysa}/distfiles" export DESTDIR=/tmp/destdir export REPO="${PREFIX}/src/repo"diff --git a/sysa/sed-4.0.9/sed-4.0.9.kaem b/sysa/sed-4.0.9/sed-4.0.9.kaem@@ -12,7 +12,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.gz ../src/ +cp ${distfiles}/${pkg}.tar.gz ../src/ gunzip -f ../src/${pkg}.tar.gz tar xf ../src/${pkg}.tar cd ${pkg}diff --git a/sysa/tar-1.12/tar-1.12.kaem b/sysa/tar-1.12/tar-1.12.kaem@@ -12,7 +12,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.gz ../src/ +cp ${distfiles}/${pkg}.tar.gz ../src/ gunzip -f ../src/${pkg}.tar.gz untar ../src/${pkg}.tardiff --git a/sysa/tcc-0.9.26/checksums b/sysa/tcc-0.9.26/checksums@@ -1,10 +1,10 @@ ea96f7ad93ee4f7ed33b45b5055dbd95280a7fb315d8a205c703b55d1fe127ca /usr/bin/mes-tcc -25b21459c5e111492ce4e253a9b7e51a6a7caa3922e56f804cc597dbafd8d675 /usr/bin/boot0-tcc -31bc48b1d97777769e62d4b547fdf1655d441b6d33f5036de9e0a7000b491fee /usr/bin/boot1-tcc -bcbfad01134f83382932843343874de0952afce12ee69512e53c6153f4fcd7fa /usr/bin/boot2-tcc -7d34c08f1bd8944d11cbe213f03d484b6aca5fed0585d971572f239a09746b75 /usr/bin/boot3-tcc -e5bc6851ae1f3601f6dcb775d6459277646066147726028c28a8cf47eb96dd36 /usr/bin/boot4-tcc -7edcbfa3851f78bc9708cbf2a327d04ff1a88fd1cbef652ebe862345749049ca /usr/bin/tcc +fbf055522c51b6b4f5359beb937d404d0c17b43f892d4725c5a13208d3e24ae3 /usr/bin/boot0-tcc +a0a91baa0194f6bebb658f041d6ae786b9aea002b5dc8b2b21fa725f81b31259 /usr/bin/boot1-tcc +93e7a2530dba4955c3cea9f57f156e6368a2b5febc56855e1b277c46326a917e /usr/bin/boot2-tcc +9e7c8043fb42994faa255b14e3bb0d1fc44289a8567370baef5b455fa4b85e4c /usr/bin/boot3-tcc +d7301f314697d6783f5b8b1a969160ee7628ccbb477193ab746adffeb4a85855 /usr/bin/boot4-tcc +9ae8d5f4986c6375a705bd3e56aad26150c0a7a89421fc47c4343f5cf25a7a8d /usr/bin/tcc 37e53f55da1a8ca5452016528727b0c3e4b4e60690f1c5ed1dfc7ecca6e56581 /usr/lib/mes/libc.a 12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f /usr/lib/mes/libgetopt.a 44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49 /usr/lib/mes/crt1.odiff --git a/sysa/tcc-0.9.26/tcc-0.9.26.kaem b/sysa/tcc-0.9.26/tcc-0.9.26.kaem@@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -20,15 +20,18 @@ TCC_PKG=tcc-0.9.26-1136-g5bba73cc MES_PKG=mes-0.23 # Unpack -mkdir src -cp ${sources}/${TCC_TAR}.tar.gz src +mkdir src build +cp ${distfiles}/${TCC_TAR}.tar.gz src +cp ${distfiles}/mes-0.23.tar.gz src + cd src ungz ${TCC_TAR}.tar.gz -untar ${TCC_TAR}.tar - -cp ${sources}/mes-0.23.tar.gz mes-0.23.tar.gz ungz mes-0.23.tar.gz -untar mes-0.23.tar +cd .. + +cd build +untar ../src/${TCC_TAR}.tar +untar ../src/mes-0.23.tar # Create config.h cd ${TCC_PKG}diff --git a/sysa/tcc-0.9.27/tcc-0.9.27.kaem b/sysa/tcc-0.9.27/tcc-0.9.27.kaem@@ -11,7 +11,7 @@ mkdir build src cd build # Extract -cp ${sources}/${pkg}.tar.bz2 ../src/ +cp ${distfiles}/${pkg}.tar.bz2 ../src/ bunzip2 -f ../src/${pkg}.tar.bz2 tar xf ../src/${pkg}.tar cd ${pkg}diff --git a/sysb.py b/sysb.py@@ -2,36 +2,20 @@ """System B""" # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> import os -import shutil -from lib.utils import copytree from lib.sysgeneral import SysGeneral class SysB(SysGeneral): """ Class responsible for preparing sources for System B. """ - def __init__(self, arch, preserve_tmp, tmpdir, chroot): + def __init__(self, arch, preserve_tmp, chroot): self.git_dir = os.path.dirname(os.path.join(__file__)) self.arch = arch self.preserve_tmp = preserve_tmp self.chroot = chroot self.sys_dir = os.path.join(self.git_dir, 'sysb') - if tmpdir is None: - self.tmp_dir = os.path.join(self.sys_dir, 'tmp') - else: - self.tmp_dir = os.path.join(tmpdir, 'sysb') - os.mkdir(self.tmp_dir) - - self.prepare() - - def prepare(self): - """ - Prepare directory structure for System B. - """ - self.mount_tmpfs() - copytree(self.sys_dir, self.tmp_dir, ignore=shutil.ignore_patterns("tmp"))diff --git a/sysc.py b/sysc.py@@ -24,7 +24,7 @@ class SysC(SysGeneral): self.chroot = chroot self.sys_dir = os.path.join(self.git_dir, 'sysc') - self.cache_dir = os.path.join(self.sys_dir, 'sources') + self.cache_dir = os.path.join(self.sys_dir, 'distfiles') if tmpdir is None: self.tmp_dir = os.path.join(self.sys_dir, 'tmp') else: @@ -163,8 +163,8 @@ class SysC(SysGeneral): self.get_file(["https://mirrors.kernel.org/gnu/texinfo/texinfo-6.7.tar.xz", "https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-b81ec69.tar.gz"]) - # zlib 1.2.11 - self.get_file("https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.xz") + # zlib 1.2.12 + self.get_file("https://www.zlib.net/zlib-1.2.12.tar.xz") # gcc 4.7.4 self.get_file("https://mirrors.kernel.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2")diff --git a/sysc/autoconf-2.69/autoconf-2.69.sh b/sysc/autoconf-2.69/autoconf-2.69.sh@@ -1,8 +1,10 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later +SRCS="autoconf-2.69.tar.xz" + src_prepare() { rm doc/standards.info man/*.1 autoreconf-2.64 -fdiff --git a/sysc/autoconf-2.71/autoconf-2.71.sh b/sysc/autoconf-2.71/autoconf-2.71.sh@@ -1,7 +1,9 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later +SRCS="autoconf-2.71.tar.xz" + src_prepare() { rm doc/standards.info autoreconf-2.69 -fidiff --git a/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh b/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh@@ -1,7 +1,9 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later +SRCS="autoconf-archive-2021.02.19.tar.xz" + src_prepare() { autoreconf-2.69 -fi }diff --git a/sysc/bison-2.3/bison-2.3.sh b/sysc/bison-2.3/bison-2.3.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-b28236b.tar.gz" +EXTRA_DISTFILES="gnulib-b28236b.tar.gz" src_prepare() { defaultdiff --git a/sysc/bison-3.4.2/bison-3.4.2.sh b/sysc/bison-3.4.2/bison-3.4.2.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-672663a.tar.gz" +EXTRA_DISTFILES="gnulib-672663a.tar.gz" src_prepare() { defaultdiff --git a/sysc/coreutils-8.32/coreutils-8.32.sh b/sysc/coreutils-8.32/coreutils-8.32.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-d279bc.tar.gz" +EXTRA_DISTFILES="gnulib-d279bc.tar.gz" regenerate_files() { build-aux/gen-lists-of-programs.sh --autoconf > m4/cu-progs.m4diff --git a/sysc/gettext-0.21/gettext-0.21.sh b/sysc/gettext-0.21/gettext-0.21.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-7daa86f.tar.gz" +EXTRA_DISTFILES="gnulib-7daa86f.tar.gz" src_prepare() { find . -name '*.info*' -deletediff --git a/sysc/guile-3.0.7/guile-3.0.7.sh b/sysc/guile-3.0.7/guile-3.0.7.sh@@ -4,7 +4,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-901694b9.tar.gz guile-psyntax-bootstrapping.tar.gz" +EXTRA_DISTFILES="gnulib-901694b9.tar.gz guile-psyntax-bootstrapping.tar.gz" src_prepare() { defaultdiff --git a/sysc/libunistring-0.9.10/libunistring-0.9.10.sh b/sysc/libunistring-0.9.10/libunistring-0.9.10.sh@@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-52a06cb3.tar.gz" +EXTRA_DISTFILES="gnulib-52a06cb3.tar.gz" src_prepare() { find . -name '*.info*' -deletediff --git a/sysc/patch-2.7.6/patch-2.7.6.sh b/sysc/patch-2.7.6/patch-2.7.6.sh@@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-e017871.tar.gz" +EXTRA_DISTFILES="gnulib-e017871.tar.gz" src_prepare() { ../../import-gnulib.shdiff --git a/sysc/perl-5.10.1/perl-5.10.1.sh b/sysc/perl-5.10.1/perl-5.10.1.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="perl-5.10.1.tar.bz2" +EXTRA_DISTFILES="perl-5.10.1.tar.bz2" src_prepare() { default_src_preparediff --git a/sysc/perl-5.32.1/perl-5.32.1.sh b/sysc/perl-5.32.1/perl-5.32.1.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="perl-5f2dc80.tar.bz2" +EXTRA_DISTFILES="perl-5f2dc80.tar.bz2" src_prepare() { defaultdiff --git a/sysc/run.sh b/sysc/run.sh@@ -15,6 +15,7 @@ export PATH=/usr/bin:/usr/sbin export PREFIX=/usr export SOURCES=/usr/src export DESTDIR=/tmp/destdir +export DISTFILES=/distfiles create_fhs() { # Add the rest of the FHS that we will use and is not created pre-boot @@ -36,4 +37,4 @@ create_fhs build bash-5.1 -exec env -i PATH=${PATH} PREFIX=${PREFIX} SOURCES=${SOURCES} DESTDIR=${DESTDIR} bash run2.sh +exec env -i PATH=${PATH} PREFIX=${PREFIX} SOURCES=${SOURCES} DESTDIR=${DESTDIR} DISTFILES=${DISTFILES} bash run2.shdiff --git a/sysc/run2.sh b/sysc/run2.sh@@ -9,6 +9,7 @@ set -e +# shellcheck disable=SC2153 trap 'env - PATH=${PREFIX}/bin PS1="\w # " bash -i' EXIT # shellcheck source=sysa/helpers.sh @@ -56,7 +57,7 @@ build libarchive-3.5.2 build openssl-1.1.1l -build zlib-1.2.11 +build zlib-1.2.12 build xbps-0.59.1 export XBPS_TARGET_ARCH="${ARCH}"diff --git a/sysc/tar-1.34/tar-1.34.sh b/sysc/tar-1.34/tar-1.34.sh@@ -3,7 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-30820c.tar.gz" +EXTRA_DISTFILES="gnulib-30820c.tar.gz" src_prepare() { defaultdiff --git a/sysc/texinfo-6.7/texinfo-6.7.sh b/sysc/texinfo-6.7/texinfo-6.7.sh@@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -EXTRA_SRCS="gnulib-b81ec69.tar.gz" +EXTRA_DISTFILES="gnulib-b81ec69.tar.gz" src_prepare() { find . -name '*.mo' -deletediff --git a/sysc/zlib-1.2.11/zlib-1.2.11.sh b/sysc/zlib-1.2.12/zlib-1.2.12.sh