From 7a8567dc7880c7485cd4cd8b557925184c31bd99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 7 Apr 2022 00:09:45 +0100 Subject: [PATCH] Rename /after to /sysa. --- parts.rst | 6 +-- rootfs.py | 6 ++- sysa.py | 18 +++---- sysa/after.kaem | 2 +- sysa/bzip2-1.0.8/checksums | 2 +- sysa/run.sh | 8 ++- sysa/tcc-0.9.26/checksums | 12 ++--- sysb/run.sh | 2 - sysc/perl-5.32.1/perl-5.32.1.sh | 3 +- sysc/run.sh | 2 - sysc/run2.sh | 8 ++- sysglobal/SHA256SUMS.pkgs | 89 +++++++++++++++++---------------- sysglobal/helpers.sh | 13 ++++- 13 files changed, 92 insertions(+), 79 deletions(-) diff --git a/parts.rst b/parts.rst index 7b63a70..eb1a7be 100644 --- a/parts.rst +++ b/parts.rst @@ -46,13 +46,13 @@ checksumming tool, that we use to ensure reproducibility and authenticity of generated binaries. We also build initial ``untar`` and ``ungz`` utilities to deal with compressed archives. -``/after`` +``/sysa`` ========== -We now move into the ``/after`` directory. As stage0-posix has no +We now move into the ``/sysa`` directory. As stage0-posix has no concept of ``chdir()`` (not added until very late in stage0-posix), we have to copy a lot of files into the root of the initramfs, making it -very messy. We get into the move ordered directory ``/after`` here, +very messy. We get into the move ordered directory ``/sysa`` here, copying over all of the required binaries from ``/``. mes diff --git a/rootfs.py b/rootfs.py index fe00adf..6080c6e 100755 --- a/rootfs.py +++ b/rootfs.py @@ -31,6 +31,7 @@ def create_configuration_file(args): with open(config_path, "w", encoding="utf_8") as config: config.write("FORCE_TIMESTAMPS=" + str(args.force_timestamps) + "\n") config.write("CHROOT=" + str(args.chroot) + "\n") + config.write("UPDATE_CHECKSUMS=" + str(args.update_checksums) + "\n") config.write("DISK=sda1\n") def main(): @@ -47,9 +48,12 @@ def main(): parser.add_argument("-p", "--preserve", help="Do not unmount temporary dir", action="store_true") parser.add_argument("-t", "--tmpdir", help="Temporary directory") - parser.add_argument("--force_timestamps", + parser.add_argument("--force-timestamps", help="Force all files timestamps to be 0 unix time", action="store_true") + parser.add_argument("--update-checksums", + help="Update checksum files.", + action="store_true") parser.add_argument("--no-create-config", help="Do not automatically create config file", action="store_true") diff --git a/sysa.py b/sysa.py index d525c99..5f0a262 100755 --- a/sysa.py +++ b/sysa.py @@ -28,8 +28,8 @@ class SysA(SysGeneral): else: self.tmp_dir = os.path.join(tmpdir, 'sysa') os.mkdir(self.tmp_dir) - self.after_dir = os.path.join(self.tmp_dir, 'after') - self.base_dir = self.after_dir + self.sysa_dir = os.path.join(self.tmp_dir, 'sysa') + self.base_dir = self.sysa_dir self.sysb_tmp = sysb_tmp self.sysc_tmp = sysc_tmp self.chroot = chroot @@ -43,13 +43,13 @@ class SysA(SysGeneral): """ Prepare directory structure for System A. We create an empty tmpfs, unpack stage0-posix. - Rest of the files are unpacked into more structured directory /after + Rest of the files are unpacked into more structured directory /sysa """ self.mount_tmpfs() - os.mkdir(self.after_dir) + os.mkdir(self.sysa_dir) self.stage0_posix() - self.after() + self.sysa() # sysb must be added to sysa as it is another initramfs stage self.sysb() @@ -81,9 +81,9 @@ class SysA(SysGeneral): shutil.copy2(os.path.join(self.sys_dir, 'after.kaem'), os.path.join(self.tmp_dir, 'after.kaem')) - def after(self): + def sysa(self): """ - Prepare sources in /after directory. + Prepare sources in /sysa directory. After stage0-posix we get into our own directory because the stage0-posix one is hella messy. """ @@ -96,9 +96,9 @@ class SysA(SysGeneral): """Deploy misc files""" extra_files = ['run.sh', 'bootstrap.cfg'] for extra_file in extra_files: - shutil.copy2(os.path.join(self.sys_dir, extra_file), self.after_dir) + shutil.copy2(os.path.join(self.sys_dir, extra_file), self.sysa_dir) - shutil.copy2(os.path.join(self.git_dir, 'SHA256SUMS.sources'), self.after_dir) + shutil.copy2(os.path.join(self.git_dir, 'SHA256SUMS.sources'), self.sysa_dir) # pylint: disable=line-too-long,too-many-statements def get_packages(self): diff --git a/sysa/after.kaem b/sysa/after.kaem index 0e10269..6bdfe1e 100755 --- a/sysa/after.kaem +++ b/sysa/after.kaem @@ -11,7 +11,7 @@ set -ex PATH=/${ARCH_DIR}/bin # Set commonly used variables -sources=/after +sources=/sysa prefix=/usr bindir=${prefix}/bin libdir=${prefix}/lib diff --git a/sysa/bzip2-1.0.8/checksums b/sysa/bzip2-1.0.8/checksums index 5acab37..2bf207f 100644 --- a/sysa/bzip2-1.0.8/checksums +++ b/sysa/bzip2-1.0.8/checksums @@ -1 +1 @@ -6e93edb69a8089d5f0bd20ac29acf2ed1454c0bcb97e9aed085757b02f0f3756 /usr/bin/bzip2 +b9b82b004c42ed9d7a35f37ee6b0886929cc08ee252368cd883ff6b979988540 /usr/bin/bzip2 diff --git a/sysa/run.sh b/sysa/run.sh index 8d0e13f..5c65c13 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -9,11 +9,9 @@ set -e # shellcheck source=sysglobal/helpers.sh . helpers.sh -# shellcheck source=/dev/null -. bootstrap.cfg -export PREFIX=/usr -export SOURCES=/after +export PREFIX=${prefix} +export SOURCES=${sources} export DESTDIR="/tmp/destdir" create_sysb() { @@ -94,7 +92,7 @@ echo "Thank you! All done." # Write to bootstrap.cfg rm "${SOURCES}/bootstrap.cfg" -for var in CHROOT FORCE_TIMESTAMPS DISK ARCH; do +for var in CHROOT FORCE_TIMESTAMPS DISK ARCH UPDATE_CHECKSUMS; do echo "export ${var}=${!var}" >> "${SOURCES}/bootstrap.cfg" done diff --git a/sysa/tcc-0.9.26/checksums b/sysa/tcc-0.9.26/checksums index e0fbf45..324623a 100644 --- a/sysa/tcc-0.9.26/checksums +++ b/sysa/tcc-0.9.26/checksums @@ -1,10 +1,10 @@ ea96f7ad93ee4f7ed33b45b5055dbd95280a7fb315d8a205c703b55d1fe127ca /usr/bin/mes-tcc -904d73ae12fcf3994c8a3a63e35a8ee2ce58cd4d02d7826c5dc09497cd257257 /usr/bin/boot0-tcc -887eb2efaa99d70a9a6c238a84d3d47242111d0c15518ccedb7c5aa557809ad2 /usr/bin/boot1-tcc -f3190d3010d105fe531df5c3c881f2a80b45206fcf50e958cfc92827bcdf53ca /usr/bin/boot2-tcc -d5d34dcd03047d96f1b5fcf6f5ec593d93aceee7c8876747d17a241b8ecd3ac1 /usr/bin/boot3-tcc -8ac74ae5020d5536ce88060513f9e287058c3c518c9b72f6f76a1f75ce91f349 /usr/bin/boot4-tcc -0133401e766ace30103593a067c3234698bbcfed9e839f932f502e74a8eb593c /usr/bin/tcc +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 37e53f55da1a8ca5452016528727b0c3e4b4e60690f1c5ed1dfc7ecca6e56581 /usr/lib/mes/libc.a 12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f /usr/lib/mes/libgetopt.a 44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49 /usr/lib/mes/crt1.o diff --git a/sysb/run.sh b/sysb/run.sh index 98cd6a0..769a07f 100755 --- a/sysb/run.sh +++ b/sysb/run.sh @@ -8,8 +8,6 @@ set -e # shellcheck source=sysglobal/helpers.sh . helpers.sh -# shellcheck source=/dev/null -. bootstrap.cfg # Unload the current kernel before things go weird kexec -u diff --git a/sysc/perl-5.32.1/perl-5.32.1.sh b/sysc/perl-5.32.1/perl-5.32.1.sh index 9df9d74..66cf0e3 100755 --- a/sysc/perl-5.32.1/perl-5.32.1.sh +++ b/sysc/perl-5.32.1/perl-5.32.1.sh @@ -48,5 +48,6 @@ src_install() { default # Remove messed up manpages - rm -r "${DESTDIR}/"*.0 + rm "${DESTDIR}/"*.0 + rm "${DESTDIR}${PREFIX}/lib/perl5/5.32.1/pod/perldebguts.pod" } diff --git a/sysc/run.sh b/sysc/run.sh index cfa0307..fe09f59 100755 --- a/sysc/run.sh +++ b/sysc/run.sh @@ -10,8 +10,6 @@ set -e # shellcheck source=sysglobal/helpers.sh . helpers.sh -# shellcheck source=/dev/null -. bootstrap.cfg export PATH=/usr/bin:/usr/sbin export PREFIX=/usr diff --git a/sysc/run2.sh b/sysc/run2.sh index d930c8d..bea1dbf 100755 --- a/sysc/run2.sh +++ b/sysc/run2.sh @@ -13,8 +13,6 @@ trap 'env - PATH=${PREFIX}/bin PS1="\w # " bash -i' EXIT # shellcheck source=sysglobal/helpers.sh . helpers.sh -# shellcheck source=/dev/null -. bootstrap.cfg trap bash EXIT @@ -92,6 +90,12 @@ if [ "$FORCE_TIMESTAMPS" = True ] ; then canonicalise_all_files_timestamp fi +if [ "$UPDATE_CHECKSUMS" = True ] ; then + pushd /usr/src/repo + sha256sum ./* | tee "${SOURCES}/SHA256SUMS.pkgs" + popd +fi + echo "Bootstrapping completed." cd "${PREFIX}" diff --git a/sysglobal/SHA256SUMS.pkgs b/sysglobal/SHA256SUMS.pkgs index 48d381f..d37bd00 100644 --- a/sysglobal/SHA256SUMS.pkgs +++ b/sysglobal/SHA256SUMS.pkgs @@ -11,15 +11,15 @@ a824987c1e30d13cf2b9d1af8e354eb33f54ef7a8544743c5d7243410894df44 autoconf-2.53_ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.53_1.links ae4958fad5a258de859a34e22e46bccb492bf40b18cc2cc6cf9de333afa7e401 autoconf-2.53_1.tar.gz ad6c385e96d8c7ee9fa026e096b65821030adcc1c873547b4f6e3dc55e9d4669 autoconf-2.54_0.links -4710e10621e7b13e95b7e46be5792c1936bd54368649e0550d85552470772d81 autoconf-2.54_0.tar.gz +9dce2fc83085a9e20f7a9f57cea1c9c3d111dc51102d688ecdafea08376f582e autoconf-2.54_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.54_1.links -8f84f4e79fa843dd321038d62d284357e031531bf7687dd3e7a204bc090ea896 autoconf-2.54_1.tar.gz +d5f8657c7ce9aaa624838f2ea7fc624c28f01d9e189459d325bfc04ded36b2e5 autoconf-2.54_1.tar.gz 1fd322fa08bd65b9630b03983933dd6a85d32090d49e16029b2dae16f5f7208a autoconf-2.55_0.links -fc52f377a8169339d6d9de871670c6a85829b2d3fc57b7c5d2ed5b6e1dbc307d autoconf-2.55_0.tar.gz +848e41d3fe64464a1c76c566d0c31b154c75f0ff6e66fb79ed66e2cf3a46a3a0 autoconf-2.55_0.tar.gz a5910f038266cf25281f770f13486979543e1b4ecd3d8c3d929812f052167ed5 autoconf-2.57_0.links -a77d7c39e0f0ab074072ae05b1d81bec2ef73a912c649bbc506b64c485bff20c autoconf-2.57_0.tar.gz +d5cf501d7f69dbf3c21427cc3718b7d3bb79a216d3ece41dec96fd98ea18b04d autoconf-2.57_0.tar.gz ba8ac111cb1ce8de6d35086e198541c620cbedb2525552b98d8f6c399b449ffa autoconf-2.59_0.links -c5528d3cd25cc93c2a3af8d2d7281bba8ac387e203d1223855830bc0ee0017fc autoconf-2.59_0.tar.gz +55f4e138de7eedffef459061d7180e40e733cfd1dd9aa57572098111a70599fb autoconf-2.59_0.tar.gz 95c7b832abbc66673ec1d0a4254224d7ee4b8450c817121e67195ff8719229ef autoconf-2.61_0.links f123f798e1135347ffb9a84bd09a4a3c569e0941454fb094ba177a384c2a2619 autoconf-2.61_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.61_1.links @@ -32,7 +32,7 @@ d713ac1840e82250414ee4f7cd75c79ee44ecb4e8dfc659704eed3d75e7d348c autoconf-2.71_ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-archive-2021.02.19_0.links 3f6c27d6743f926c9b08cccd921c3d6179105c681dd5aa9ab362895c71c106c9 autoconf-archive-2021.02.19_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.10.3_0.links -e59fa265f406bae304def01402e2320275a26df24c7160602e7d29afe607c31c automake-1.10.3_0.tar.gz +3c3d5f935e0555694f7cf8d0d09281d9c3a1a6e0b18d0393c50d9c2359d1ea80 automake-1.10.3_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.11.2_0.links 8d367d6144ead0aa37e561f62a9873c5019adcba3973c9fe44772c0774a04997 automake-1.11.2_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.15.1_0.links @@ -46,12 +46,12 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.6.3 a4810ca31d5fb1ce968a889c19de8def4470a6a941b6a274b894c6bcb966c6dd automake-1.6.3_1.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.6.3_2.links e0e13b46d2aaee18d6dd0bbd86c47c1ca951c78e7c5e8e76f79fd14c2502e6ea automake-1.6.3_2.tar.gz +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7.8_0.links +57de0e448b3b334ea728cf1eac5f3a4d75953ec09b0f41c76ada93ef8a1621c0 automake-1.7.8_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7_0.links ef1e4f793f2e53ddb86f39719aac302038d40a5b49a0c7acfb5ec5cdb8462ecd automake-1.7_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7_1.links a4f8b44f15dd79202fd1900e670b2b789aa2b27a632b6b174300c244986b9d0d automake-1.7_1.tar.gz -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.7.8_0.links -57de0e448b3b334ea728cf1eac5f3a4d75953ec09b0f41c76ada93ef8a1621c0 automake-1.7.8_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.8.5_0.links 39e6fda316adc0c0f0dd59c7c2793d46583f292aca61e2f08c3bd6d0fb23c45c automake-1.8.5_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.9.6_0.links @@ -59,48 +59,48 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.9.6 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.9.6_1.links ce2252cf0e4e402248f06bff1f425829ba68a79a4e34efa2105234cfd0b76ca1 automake-1.9.6_1.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bash-5.1_0.links -07f171f3f9d019ebb9554e8011deda307daab00b1d18a4b33a23283b2192b1ef bash-5.1_0.tar.gz +d0e325c6dbe339c00e21851ef3f868fd4a1c405c3cda2d9c747f5307ff3011f8 bash-5.1_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 binutils-2.14_0.links -987b40612eea3ca186b1465fa169f8d979d10e0a7d43536c0d24e7df7eaab06f binutils-2.14_0.tar.gz +d6fc119b88047e4515b651f2d5132392eb636b91b444a3f2b24b6471936e8662 binutils-2.14_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-2.3_0.links -82625c1337c4c80e84c6e795852f60e4d01c429a667b544f29eb1cbf3d09e401 bison-2.3_0.tar.gz +cc5861e27fbd75167bb89fc8504ff6c4e24a2e171a0fe31dd23188b66e12cd48 bison-2.3_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_0.links -37156bd81143981d986a9e728e1dbdd2ead130b454be6cf46315b80d9c04f5aa bison-3.4.1_0.tar.gz +d3000f037c98722a308c8fa856641b40b6870ed032a25bfffb6218c32ec303e3 bison-3.4.1_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_1.links -1c4358bb5c67eb8a194800d3b705cccf51224c9ef6aa2d847463495c740b7d69 bison-3.4.1_1.tar.gz +6c4758005c9634d7cf79812d7d419ebdff044aa0902b19b0c4651afda1f10306 bison-3.4.1_1.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_2.links -d0a309628ecc5a9f331a8e4275412689b1c27509f7ebf255a8df2324a591381c bison-3.4.1_2.tar.gz +d9c4cb1c6bd07db46cdbf5cfc9b8d2cee4abc4cb970502770c0c1d5b0f3f37fd bison-3.4.1_2.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.2_0.links -6bf1432ff37e582d5a6d5b4195adeaa2bdf181b9bf976996c45a8ed39ff2546a bison-3.4.2_0.tar.gz +ecea2e3965d335bf580c95616541bbbb19431e5f0309993470f46e289ce01ecd bison-3.4.2_0.tar.gz 07fee627dcf30aaa9beab40ffeacc3bec7afe3488d2fbc7e8a72ae782a85869a bzip2-1.0.8_0.links -02c4d6e6a01c911593eb20bdbc72761cdc977ff48c3ca3b46af4255083cd2679 bzip2-1.0.8_0.tar.gz +e693059d3ea981d8fdfb65fb89e0f32a32bc6695f48f58e34c92d72d0f818f3f bzip2-1.0.8_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 coreutils-5.0_0.links 748512d89578c2b454cee350c81707c4a27bc02637429ee5f5d9b32c6d76f73a coreutils-5.0_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 coreutils-6.10_0.links 7ee4b097f5a896af925b53eee7055ba87dad89949f44d14695566249f45a5eaf coreutils-6.10_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 coreutils-8.32_0.links -d43d89ea6efb13cc84ad7fd218ca4fa19c07fa6ab308edf9df62919ad8b00359 coreutils-8.32_0.tar.gz +92bd1a88bf688ab6ec6922c4f4be3f20fa657208c9ea5f1e9e07b2738c9c7478 coreutils-8.32_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 diffutils-2.7_0.links 2cd5ac019b73c1be35bf08bf7a879b49962d666020a8fdf2823e249d2a13a9e5 diffutils-2.7_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 dist-3.5-236_0.links ad8e113ecc22a49b1c40e670f0620da86bde6199ec56366c3d46368cf46c184c dist-3.5-236_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 findutils-4.2.33_0.links -a01861fd8b93496f932cd94fd3dcccd7241a6bde613ea9390c26398c7588fba4 findutils-4.2.33_0.tar.gz +23cdcd99ce1d90b13b7fb51c59ce71ec244558d72b670966832392448546b5a0 findutils-4.2.33_0.tar.gz 865b57db33fc860abd00efc6b239366c3c1354ab4e699d8506e21a4316352863 flex-2.5.11_0.links 8c0c50860613d0223d36892013493b069c1855eb002b95526d55d590207635ec flex-2.5.11_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 flex-2.5.33_0.links -f9ef1a90b9472c75a5d40a8fca6f7a2539541e28026c6dddf3ca4762edb30814 flex-2.5.33_0.tar.gz +052bbc8984c7a792e33ca8736436bc47c3290372e997574642f68d62c9230629 flex-2.5.33_0.tar.gz a0ab924b46c0c11740a52958313d0543182053f476d42879128c57c52131a956 flex-2.6.4_0.links e4150bd14b0e3f2ab3afa918971c8589ed79be0fb1f2beb85f27989c873461fd flex-2.6.4_0.tar.gz 85c6ea124aa20e758ac334689782eeda694a35e32eacf320b588130be15d746a gawk-3.0.4_0.links 4c151b8fac8731d6f7ffb5279353d4f16e2cbfe7374d48c48a571ae09d7a9c50 gawk-3.0.4_0.tar.gz 452767f7321aef2eeff9d3a935a574f0680f834f89f2589f3a43951a159b3948 gc-8.0.4_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 gcc-4.0.4_0.links -1b57010e6c3926396c52e38c5dc52675c9783779a296a7ac6a47dc2b7672ba5f gcc-4.0.4_0.tar.gz +3e3bd9b0c83a8a7120b8b3329ac60c8932d26793a7b38983e7e7b35e039ca260 gcc-4.0.4_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 gcc-4.0.4_1.links -c5e922589a67f64159414cb5fc4335f250966d9401628822ab016403a5d4390d gcc-4.0.4_1.tar.gz -3960567fc3f358d85b58a6441d3fb97442821a6d51847df72109eec547617b0b gcc-4.7.4_0.x86.xbps -b42a7996ec247a915e3a1c9b71b5f5e65fa6caadc5f77c2c32357754e4274e16 gettext-0.21_0.x86.xbps +6c9033ccedeb1d4c8d10487390fdef71cc1a4f687fc1e9d9413ab94314a0a935 gcc-4.0.4_1.tar.gz +3d012ad16221f6cd39d35158a5d483002d53e279eed0a4d6a1ad32bac4f2fd52 gcc-4.7.4_0.x86.xbps +d5c08e8f48c78b9f96c38cdbcea321be57a4f5a7e8bf05c9bac5770550aab0ca gettext-0.21_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 gmp-6.2.1_0.links cb28e5554c51291c456027e38f5563cc787c8e2f8656bb1f4dfcc085d0639016 gmp-6.2.1_0.tar.gz 507f79f3c07b212154053caae665ee7ed3a53bc420987ec381cf637339fef7de gperf-3.1_0.x86.xbps @@ -110,17 +110,17 @@ e86436389d960515efdc1ba08c8178c1134dbed693ccce01ea82b05e6d9874f7 guile-3.0.7_0. e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 help2man-1.36.4_0.links 7857bf4cbfabdf0e46a4cd222fb3c526d79661a329b9edf9c704f2ad7585bb49 help2man-1.36.4_0.tar.gz 7eeeb832b400a11419e4ef14bf778b8177bbc6a77f5a37c0c0f2965f66ab4d51 kbd-1.15_0.links -57e582dd60da59a70bb309faf1af5d8d5b7c71e2af2e31699f1a8e90c64ab110 kbd-1.15_0.tar.gz +3b136d1840f66968807e0b4478d95dea584cded12b6582b3191bf11d9a74a6fa kbd-1.15_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 kexec-tools-2.0.22_0.links -a0f11c39a7cc2cb7e12964f58a9bbac5737e331e2bd689a0c21b58ba3caaaf6a kexec-tools-2.0.22_0.tar.gz +d1156eda9b3d01cc65b554de76c99a29df2646541f4d7b2453b3b2a4dec24d74 kexec-tools-2.0.22_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 libarchive-3.5.2_0.links -66778085e702e5ec3842285818c3427c3baffd9f03a4b1b15278f8acccc05917 libarchive-3.5.2_0.tar.gz +ff3f08d39379fec2d1575495ec9c69d846f3e014d2088760c148161d9a50535f libarchive-3.5.2_0.tar.gz 3a9d7649afe75a76583305283c8606e717cbab01b098f094f806e8e37045a658 libatomic_ops-7.6.10_0.x86.xbps 019bf569a1374e7fff7a106b11eb2c91dfd8da7f3a8b04e98d7e9403c27fc781 libffi-3.3_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 libtool-1.4_0.links -9855213a5879dc454a6c502e82d539bc7cf9d45f44553ba64ce1f7795fd4bb89 libtool-1.4_0.tar.gz +1c6698869f0996980b25515fd68ad47d4da7bde04754e3e355059a01a9276bbb libtool-1.4_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 libtool-2.2.4_0.links -6c82e3fb79972507e46cc19e48b3d7e2ba2575f06fbd32db2fbc896206ab564a libtool-2.2.4_0.tar.gz +71f03d2fd3ee2b224d95bfcb438610626f71dc6db98b523ae23b17fcc7f53f55 libtool-2.2.4_0.tar.gz 19bde5b058c188e976f4cfcea35d9f0d897daf593479a7db00eb6a6eabefd131 libunistring-0.9.10_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 linux-4.9.10_0.links 59b2ec2edd1cfc2276187ef9a9ea11048f8fbd5e1b811eaab228a4e34a21da6b linux-4.9.10_0.tar.gz @@ -129,9 +129,9 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 linux-headers- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 m4-1.4.7_0.links 8e6afb2fd2684d9a653ac8f307212dd206fc1c0e1cbf76f85f8eb45c3028ceb2 m4-1.4.7_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 make-3.82_0.links -02b2a143a73ad70f1c15e5d5f6f0ce75192378e5ad66b871808767171cdcddb4 make-3.82_0.tar.gz +7539898e15dc769b899838f65b0358b67b02350094b0170ae129ecc7a51e6678 make-3.82_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 make-4.2.1_0.links -4a95da894bac59cd547469540681e162632a40271c0a07f2710d4a99f4031d94 make-4.2.1_0.tar.gz +8a36a31a26fc7737b10f8944892206e69787b98f6eb94cbaa9b89e5de56f97e5 make-4.2.1_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 mes-0.23_0.links a23eef4bf67c43659f71b3ebe8c106276d97c82f02619a16766037be9cfef27d mes-0.23_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 mpc-1.2.1_0.links @@ -147,28 +147,28 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 musl-1.1.24_2. e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 musl-1.2.2_0.links b4171d36461bfe34df2100583c57d3a328c448d18238829280edc671811cfee6 musl-1.2.2_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 openssl-1.1.1l_0.links -a8f4a00e47e3d5a990575552b93ddb74ff403987a3b5e1c60405e1581dd10878 openssl-1.1.1l_0.tar.gz -c18cdec4ba5292d4770f519d30fc30557eea8d424c83276aa6b180f8af1ea8a6 patch-2.7.6_0.x86.xbps +2e386f4b34188fd7f3a95693fb5fd0c9213c815e7813774ccacf0c31090c10d2 openssl-1.1.1l_0.tar.gz +863e44f0df017895ca6aecfca668971b9c445aa2958ea29134e03cd905502007 patch-2.7.6_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.000_0.links 48303fa5a3dd7b132fbf032e349246a44e21955af64f5f2a3b941269ed931bbb perl-5.000_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.003_0.links 6d54d6258d52af74461c9b15c623fd7641675f603910d7ac71027de614ea14df perl-5.003_0.tar.gz +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.10.1_0.links +39cc484f9920f033605bc74e3b9246e56d574f4a2701f9e1bf4cac0f7d8aeb2f perl-5.10.1_0.tar.gz +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.32.1_0.links +7206b8534ceccb20264ebecd2ea418dbd471d566f50438dc1a715610c9bbf3a0 perl-5.32.1_0.tar.gz +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.6.2_0.links +b3cc813d409a9e45b57d56a796cd38083a72ade5508019cc58012595e7a1bd5e perl-5.6.2_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl5.004-05_0.links b4b808257944bdb611c2f633ca1b5eaf5869173e4782101be7dfa7d4ea248876 perl5.004-05_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl5.005-03_0.links 6f7314054e18bfaa01604e8c06c9688e3cf652760abe2115cc508894268f6faf perl5.005-03_0.tar.gz -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.10.1_0.links -d4ff3906886616fce7c4fa424f99a54cfdcd786357439e8688090ce71fd33684 perl-5.10.1_0.tar.gz -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.32.1_0.links -6209a100d4180e22a61f5267c905645bc7224636b71899ee38ea32b199ba589b perl-5.32.1_0.tar.gz -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.6.2_0.links -b3cc813d409a9e45b57d56a796cd38083a72ade5508019cc58012595e7a1bd5e perl-5.6.2_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 pkg-config-0.29.2_0.links -9492f3ebd1b7f347460f14f39923fc19d0fde80bab96df2413f23b5463ee7ff2 pkg-config-0.29.2_0.tar.gz +8ff0d5eb1c813eafd54180f125b6dcb7da347dacd705171faf034babc3c349f5 pkg-config-0.29.2_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 sed-4.0.9_0.links aa900b99ec2fedc1bf9a1bc366b208f73f3f866c2b82d27ed8f4fccf538cb0e5 sed-4.0.9_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tar-1.34_0.links -18203eec735fc553b24a3b4c404f614a596a54d4aba95d98d9b6d5bce2f5c7e8 tar-1.34_0.tar.gz +d75e019512d08d5eb99963632d9860189623ef19179b6b3f03dec37fefbbdfc5 tar-1.34_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_0.links 66c799097c8dcc5505b383dcb07ce77fc6720b58e8441311fdb4b4dc6ede66ba tcc-0.9.27_0.tar.gz b69c042a33cbf18e5a2a5a886d675ebcced92f57eec95b0f47345df8f1e89cf0 tcc-0.9.27_1.links @@ -177,12 +177,13 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_2.l 2c02ed382ffb88b9ba2236250436915ccfe92f5f34299d93b09d4aefeeadf7c2 tcc-0.9.27_2.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_3.links 766e43802f86f49f63fefec21e9530544a452359298202fc9754979beabe4b2f tcc-0.9.27_3.tar.gz -852e7be426aa5ae63b646fb6f5c8f95a884a143a04548e615289dacb5d0a9970 texinfo-6.7_0.x86.xbps +8cc08f90342fdbfac51c9d3d0219f2b5bbf54ef3272aa16c1cee28a97e281822 texinfo-6.7_0.x86.xbps 970cc84444fecc225becb0db24671a186888a8a8d37daf3f40d827a907181a12 util-linux-2.19.1_0.links -729b4b583accfa2ea2c1404af14e48db085c73fac6a46d23de5c369e6a78c5ef util-linux-2.19.1_0.tar.gz +12bf9cc888eecaf84d8799f01162d825c7c4574a129271272332a8facb65212c util-linux-2.19.1_0.tar.gz +8a93bd58e2463eeb9ec1bf9b647dffee16e4d0d4d12067c82e4124aabd875710 x86-repodata e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 xbps-0.59.1_0.links -a7bed253a8440374ce07481aebef410e9485d5b761e2ba31aa40594e2219acdf xbps-0.59.1_0.tar.gz +0c71ba060376098d4b76aaa22f097cec8525ac010cbc957ad24e60f4175370c9 xbps-0.59.1_0.tar.gz ac8c7b186195ad29d86c2d1608b0c4ba37eeb12daff8f155d69d568239cae237 xz-5.0.5_0.links -922699262f36593b13dce42578ce8d9cedd3eb1dffc3d6107de2cc6d56738185 xz-5.0.5_0.tar.gz +42746b3ac497a4e6aca198657a832e75810e64cc71bc7c40505d76bacae74f3b xz-5.0.5_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 zlib-1.2.11_0.links be2c295f7e55e7f26c2d21a8497d38a2da2f5d2c5f629337531e43e6570c41e1 zlib-1.2.11_0.tar.gz diff --git a/sysglobal/helpers.sh b/sysglobal/helpers.sh index 3294fd1..e8e8c6c 100755 --- a/sysglobal/helpers.sh +++ b/sysglobal/helpers.sh @@ -7,6 +7,9 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +# shellcheck source=/dev/null +. bootstrap.cfg + # Find a list of links get_links() { original="${1:-${PWD}/}" @@ -151,8 +154,7 @@ build() { # Various shenanigans must be implemented for repoducibility # as a result of timestamps - echo "${pkg}: checksumming created package." - _grep "${pkg}_${revision}" "${SOURCES}/SHA256SUMS.pkgs" | sha256sum -c + src_checksum echo "${pkg}: cleaning up." rm -rf "${SOURCES}/${pkg}/build" @@ -272,6 +274,13 @@ src_pkg() { fi } +src_checksum() { + if ! [ "$UPDATE_CHECKSUMS" = True ] ; then + echo "${pkg}: checksumming created package." + _grep "${pkg}_${revision}" "${SOURCES}/SHA256SUMS.pkgs" | sha256sum -c + fi +} + src_apply() { if command -v xbps-install >/dev/null 2>&1; then xbps-install -y -R /usr/src/repo "${pkg%%-[0-9]*}"