commit: b760b3eb2b4aaf33c7842e586797bb7ac924cb5e parent 9543a47f1be9a0222a9d0a455a61d65f3bab3645 Author: fosslinux <fosslinux@aussies.space> Date: Mon, 7 Mar 2022 18:58:20 +1100 Final fixes: - All QEMU reproducibility issues resolved - Added SPDX licensing - Couple other small issues - Fix guile reproducbilityDiffstat:
78 files changed, 287 insertions(+), 56 deletions(-)diff --git a/.reuse/dep5 b/.reuse/dep5@@ -9,6 +9,6 @@ Source: https://github.com/fosslinux/live-bootstrap # Copyright: $YEAR $NAME <$CONTACT> # License: ... -Files: SHA256SUMS.sources sysa/pre-sha.sha256sums sysa/*/checksums sysa/*/checksums/* sysc/*/checksums sysc/*/checksums/* +Files: SHA256SUMS.sources sysa/pre-sha.sha256sums sysa/*/checksums sysglobal/SHA256SUMS.pkgs Copyright: none License: MITdiff --git a/sysa/autoconf-2.12/autoconf-2.12.sh b/sysa/autoconf-2.12/autoconf-2.12.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/autoconf-2.13/autoconf-2.13.sh b/sysa/autoconf-2.13/autoconf-2.13.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/autoconf-2.52/stage1.sh b/sysa/autoconf-2.52/stage1.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/automake-1.10.3/automake-1.10.3.sh b/sysa/automake-1.10.3/automake-1.10.3.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/automake-1.6.3/stage1.sh b/sysa/automake-1.6.3/stage1.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/automake-1.6.3/stage2.sh b/sysa/automake-1.6.3/stage2.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/bash-2.05b/bash-2.05b.kaem b/sysa/bash-2.05b/bash-2.05b.kaem@@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/bison-3.4.1/mk/main.mk b/sysa/bison-3.4.1/mk/main.mk@@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: 2020 Giovanni Mascellani gio@debian.org # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.sh b/sysa/bzip2-1.0.8/bzip2-1.0.8.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/coreutils-5.0/coreutils-5.0.kaem b/sysa/coreutils-5.0/coreutils-5.0.kaem@@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/coreutils-5.0/coreutils-5.0.sh b/sysa/coreutils-5.0/coreutils-5.0.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/coreutils-5.0/mk/pass2.mk b/sysa/coreutils-5.0/mk/pass2.mk@@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/coreutils-6.10/mk/main.mk b/sysa/coreutils-6.10/mk/main.mk@@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/diffutils-2.7/mk/main.mk b/sysa/diffutils-2.7/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/findutils-4.2.33/findutils-4.2.33.sh b/sysa/findutils-4.2.33/findutils-4.2.33.sh@@ -1,11 +1,12 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later src_prepare() { . ../../import-gnulib.sh - default_src_prepare + default autoreconf-2.61 -f @@ -15,7 +16,10 @@ src_prepare() { src_configure() { # Musl is not recognized, pretend to be uClibc - CC=tcc ./configure --prefix="${PREFIX}" CPPFLAGS="-D__UCLIBC__" + # Must use --host for config.charset reproducibility + CC=tcc ./configure --prefix="${PREFIX}" \ + --host=i386-unknown-linux-gnu \ + CPPFLAGS="-D__UCLIBC__" } src_compile() {diff --git a/sysa/flex-2.5.11/mk/main.mk b/sysa/flex-2.5.11/mk/main.mk@@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2019-2020 Giovanni Mascellani <gio@debian.org> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/flex-2.6.4/mk/main.mk b/sysa/flex-2.6.4/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/gawk-3.0.4/mk/main.mk b/sysa/gawk-3.0.4/mk/main.mk@@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh@@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh@@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/grep-2.4/mk/main.mk b/sysa/grep-2.4/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/gzip-1.2.4/gzip-1.2.4.kaem b/sysa/gzip-1.2.4/gzip-1.2.4.kaem@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/help2man-1.36.4/help2man-1.36.4.sh b/sysa/help2man-1.36.4/help2man-1.36.4.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/kbd-1.15/patches/resizecons.patch b/sysa/kbd-1.15/patches/resizecons.patch@@ -0,0 +1,34 @@ +SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> + +SPDX-License-Identifier: GPL-2.0-or-later + +Don't build resizecons (will not build in chroot). + +--- src/Makefile.am 2022-02-26 14:11:22.577168053 +1100 ++++ src/Makefile.am 2022-02-26 14:11:34.641835790 +1100 +@@ -10,10 +10,6 @@ + PROGS += getkeycodes setkeycodes + endif + +-if RESIZECONS_PROGS +-PROGS += resizecons +-endif +- + if OPTIONAL_PROGS + PROGS += \ + screendump setlogcons setvesablank spawn_console spawn_login \ +--- configure.ac 2022-02-26 14:10:50.047367229 +1100 ++++ configure.ac 2022-02-26 14:11:15.310765839 +1100 +@@ -53,12 +53,6 @@ + esac + AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes") + +-case $host_cpu in +- i?86*) RESIZECONS_PROGS=yes ;; +- *) RESIZECONS_PROGS=no ;; +-esac +-AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes") +- + AC_ARG_ENABLE(optional-progs, + AS_HELP_STRING(--enable-optional-progs, [Build and install a optional programs]), + [OPTIONAL_PROGS=$enableval],[OPTIONAL_PROGS=no])diff --git a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -9,5 +9,6 @@ src_prepare() { } src_configure() { - ./configure --prefix=${PREFIX} + ./configure --prefix=${PREFIX} \ + --sbindir="${PREFIX}/bin" }diff --git a/sysa/libtool-1.4/patches/hostname.patch b/sysa/libtool-1.4/patches/hostname.patch@@ -0,0 +1,17 @@ +SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> + +SPDX-License-Identifier: GPL-2.0-only + +Remove hostname from libtool script. + +--- libtool.m4 2022-02-26 10:25:54.265298039 +1100 ++++ libtool.m4 2022-02-26 10:26:26.909344391 +1100 +@@ -2357,8 +2357,6 @@ + + # ### BEGIN LIBTOOL CONFIG + +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- + # Shell to use when invoking shell scripts. + SHELL=$lt_SHELL +diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/sysa/libtool-2.2.4/libtool-2.2.4.sh@@ -1,8 +1,11 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later src_prepare() { + default + rm libltdl/config/ltmain.sh rm doc/*.info @@ -18,10 +21,10 @@ src_configure() { --host=i386-unknown-linux \ --target=i386-unknown-linux \ --build=i386-unknown-linux \ - ac_path_EGREP="/usr/bin/grep -E" \ - ac_path_FGREP="/usr/bin/grep -F" \ - ac_path_GREP="/usr/bin/grep" \ - ac_path_SED="/usr/bin/sed" + ac_path_EGREP="egrep" \ + ac_path_FGREP="fgrep" \ + ac_path_GREP="grep" \ + ac_path_SED="sed" } src_compile() { @@ -30,4 +33,10 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" + + sed -i -e "s/{EGREP=.*/{EGREP='egrep'}/" \ + -e "s/{FGREP=.*/{FREGP='fgrep'}/" \ + -e "s/{GREP=.*/{GREP='grep'}/" \ + -e "s/{SED=.*/{SED='sed'}/" \ + "${DESTDIR}/usr/bin/libtool" }diff --git a/sysa/libtool-2.2.4/patches/hostname.patch b/sysa/libtool-2.2.4/patches/hostname.patch@@ -0,0 +1,16 @@ +SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> + +SPDX-License-Identifier: GPL-2.0-only + +Remove hostname from libtool script. + +--- libltdl/m4/libtool.m4 2022-02-26 10:27:30.649198752 +1100 ++++ libltdl/m4/libtool.m4 2022-02-26 10:28:39.458342624 +1100 +@@ -684,7 +684,6 @@ + + # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. + # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # + _LT_COPYINGdiff --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@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/m4-1.4.7/mk/main.mk b/sysa/m4-1.4.7/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/make-3.80/make-3.80.kaem b/sysa/make-3.80/make-3.80.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-laterdiff --git a/sysa/make-3.82/make-3.82.sh b/sysa/make-3.82/make-3.82.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -15,6 +15,7 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ + --build=i386-unknown-linux-gnu \ --disable-nls }diff --git a/sysa/mes-0.23/mes-libc-0.23.sh b/sysa/mes-0.23/mes-libc-0.23.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/patch-2.5.9/patch-2.5.9.kaem b/sysa/patch-2.5.9/patch-2.5.9.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-laterdiff --git a/sysa/perl-5.000/mk/main.mk b/sysa/perl-5.000/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl-5.000/perl-5.000.sh b/sysa/perl-5.000/perl-5.000.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl-5.003/mk/main.mk b/sysa/perl-5.003/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl-5.003/perl-5.003.sh b/sysa/perl-5.003/perl-5.003.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl-5.6.2/files/config.sh b/sysa/perl-5.6.2/files/config.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl-5.6.2/mk/main.mk b/sysa/perl-5.6.2/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl-5.6.2/perl-5.6.2.sh b/sysa/perl-5.6.2/perl-5.6.2.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl5.004-05/mk/main.mk b/sysa/perl5.004-05/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl5.004-05/perl5.004-05.sh b/sysa/perl5.004-05/perl5.004-05.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl5.005-03/mk/main.mk b/sysa/perl5.005-03/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/perl5.005-03/perl5.005-03.sh b/sysa/perl5.005-03/perl5.005-03.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/run.sh b/sysa/run.sh@@ -1,7 +1,7 @@ #!/bin/bash # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -25,6 +25,7 @@ create_sysb() { cp -rl "${PREFIX}/${d}" "/sysb/usr/${d}" done cp "${SOURCES}/bootstrap.cfg" /sysb/usr/src/bootstrap.cfg + cp -rl "/usr/src/repo" /sysb/usr/src/repo populate_device_nodes /sysb echo "Creating sysb initramfs" gen_initramfs_list.sh -o "${PREFIX}/boot/initramfs-sysb.cpio.gz" /sysbdiff --git a/sysa/sed-4.0.9/mk/main.mk b/sysa/sed-4.0.9/mk/main.mk@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/sed-4.0.9/sed-4.0.9.kaem b/sysa/sed-4.0.9/sed-4.0.9.kaem@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/tar-1.12/tar-1.12.kaem b/sysa/tar-1.12/tar-1.12.kaem@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/tcc-0.9.27/tcc-0.9.27.kaem b/sysa/tcc-0.9.27/tcc-0.9.27.kaem@@ -1,6 +1,6 @@ #!/bin/sh -# 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-laterdiff --git a/sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh b/sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh@@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/tcc-0.9.27/tcc-musl-pass1.sh b/sysa/tcc-0.9.27/tcc-musl-pass1.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/tcc-0.9.27/tcc-musl-pass2.sh b/sysa/tcc-0.9.27/tcc-musl-pass2.sh@@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/tcc-0.9.27/tcc-musl-pass3.sh b/sysa/tcc-0.9.27/tcc-musl-pass3.sh@@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -14,6 +14,7 @@ src_configure() { --bindir="${PREFIX}/bin" \ --sbindir="${PREFIX}/bin" \ --libdir="${PREFIX}/lib/musl" \ + --build=i386-unknown-linux-gnu \ --disable-libuuid \ --without-ncurses \ --enable-static \diff --git a/sysb/run.sh b/sysb/run.sh@@ -1,6 +1,6 @@ #!/usr/bin/bash -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc.py b/sysc.py@@ -1,7 +1,7 @@ #!/usr/bin/env python3 """System C""" # SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> import osdiff --git a/sysc/autoconf-2.69/autoconf-2.69.sh b/sysc/autoconf-2.69/autoconf-2.69.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/automake-1.11.2/automake-1.11.2.sh b/sysc/automake-1.11.2/automake-1.11.2.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/automake-1.15.1/automake-1.15.1.sh b/sysc/automake-1.15.1/automake-1.15.1.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/bash-5.1/bash-5.1.sh b/sysc/bash-5.1/bash-5.1.sh@@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Bastian Bittorf <bb@npl.de> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/bison-3.4.2/bison-3.4.2.sh b/sysc/bison-3.4.2/bison-3.4.2.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/flex-2.5.33/flex-2.5.33.sh b/sysc/flex-2.5.33/flex-2.5.33.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/gcc-4.7.4/gcc-4.7.4.sh b/sysc/gcc-4.7.4/gcc-4.7.4.sh@@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/gettext-0.21/gettext-0.21.sh b/sysc/gettext-0.21/gettext-0.21.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/guile-3.0.7/guile-3.0.7.sh b/sysc/guile-3.0.7/guile-3.0.7.sh@@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021 Michael Schierl <schierlm@gmx.de> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -33,6 +34,7 @@ src_configure() { PKG_CONFIG_PATH="${PREFIX}/lib/musl/pkgconfig" ./configure \ --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib/musl" \ + --build=i386-unknown-linux-musl \ --disable-shared \ --disable-jit }diff --git a/sysc/openssl-1.1.1l/openssl-1.1.1l.sh b/sysc/openssl-1.1.1l/openssl-1.1.1l.sh@@ -1,10 +1,13 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later src_prepare() { default + # Remove two useless manpages that code in hostname + rm doc/man5/x509v3_config.pod doc/man5/config.pod + # Remove a bunch of pregenerated files # thanks for making these easy to find :) find . -name build.info -exec grep 'GENERATE\[' {} \; | sed 's/.*\[//' | sed 's/\].*$//' | xargs -I{} find . -name {} -deletediff --git a/sysc/perl-5.10.1/perl-5.10.1.sh b/sysc/perl-5.10.1/perl-5.10.1.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysc/perl-5.32.1/patches/reproducibility.patch b/sysc/perl-5.32.1/patches/reproducibility.patch@@ -0,0 +1,49 @@ +SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> + +SPDX-License-Identifier: Artistic-1.0 + +Set some things that cannot be overriden in the perl Configure script to +generate with correct values for live-bootstrap. + +NOTE: this patch CANNOT be applied to a non-live-bootstrap environment. + +--- ../perl-5f2dc80/regen-configure/U/threads/archname.U 2022-02-27 21:30:03.155396204 +1100 ++++ ../perl-5f2dc80/regen-configure/U/threads/archname.U 2022-02-27 21:30:49.392396204 +1100 +@@ -79,7 +79,7 @@ + ?X: Very GCCian. + *) archname=`echo $targetarch|sed 's,^[^-]*-,,'` ;; + esac +-myarchname="$tarch" ++myarchname="i686-linux" + case "$archname" in + '') dflt="$tarch";; + *) dflt="$archname";; +--- ../perl-5f2dc80/regen-configure/U/modified/Oldconfig.U 2022-02-27 21:31:26.911396204 +1100 ++++ ../perl-5f2dc80/regen-configure/U/modified/Oldconfig.U 2022-02-27 21:32:31.846396204 +1100 +@@ -117,16 +117,13 @@ + ?X: on some machines to avoid the error message when uname is not found; e.g. + ?X: old SUN-OS 3.2 would not execute hostname in (uname -a || hostname). Sigh! + ?X: Now not using a subshell but instead $test. +-myuname=`$uname -a 2>/dev/null` +-$test -z "$myuname" && myuname=`hostname 2>/dev/null` + # Downcase everything to avoid ambiguity. + # Remove slashes and single quotes so we can use parts of this in + # directory and file names. + # Remove newlines so myuname is sane to use elsewhere. + # tr '[A-Z]' '[a-z]' would not work in EBCDIC + # 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" + ?X: Save the value we just computed to reset myuname after we get done here. + newmyuname="$myuname" + dflt=n +@@ -336,7 +333,7 @@ + ?X: Note the hostname on the second one, which will fool Configure + ?X: into using the SysV case! + gnu) osname=gnu +- osvers="$3" ;; ++ osvers="4.9.10-gnu_1" ;; + ?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'.diff --git a/sysc/perl-5.32.1/patches/reproducibility2.patch b/sysc/perl-5.32.1/patches/reproducibility2.patch@@ -0,0 +1,47 @@ +SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> + +SPDX-License-Identifier: Artistic-1.0 + +Set some things that cannot be overriden in the perl Configure script to +generate with correct values for live-bootstrap. + +NOTE: this patch CANNOT be applied to a non-live-bootstrap environment. + +--- ../perl-5f2dc80/regen-configure/dist/U/archname.U 2022-02-26 10:51:45.343097807 +1100 ++++ ../perl-5f2dc80/regen-configure/dist/U/archname.U 2022-02-26 10:51:51.742527859 +1100 +@@ -72,5 +72,5 @@ + rp='What is your architecture name' + . ./myread + archname="$ans" +-myarchname="$tarch" ++myarchname="i386" + +--- ../perl-5f2dc80/regen-configure/dist/U/Oldconfig.U 2022-02-27 10:55:04.890396204 +1100 ++++ ../perl-5f2dc80/regen-configure/dist/U/Oldconfig.U 2022-02-27 11:00:31.324396204 +1100 +@@ -109,16 +109,13 @@ + ?LINT:extern hostarch libswanted libs + ?LINT:change hostarch libswanted libs + : Determine the name of the machine +-myuname=`$uname -a 2>/dev/null` +-$test -z "$myuname" && myuname=`hostname 2>/dev/null` + ?X: Special mention for Xenix, whose 'uname -a' gives us output like this: + ?X: sysname=XENIX + ?X: nodename=whatever + ?X: release=2.3.2 .. etc... + ?X: Therefore, we strip all this variable assignment junk and remove all the + ?X: new lines to keep the myuname variable sane... --RAM +-myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \ +- ./tr '[A-Z]' '[a-z]' | $tr $trnl ' '` ++myuname="" + ?X: Save the value we just computed to reset myuname after we get done here. + newmyuname="$myuname" + has_uname= +@@ -277,7 +274,7 @@ + ;; + linux) osname=linux + case "$3" in +- *) osvers="$3" ;; ++ *) osvers="4.9.10-gnu_1" ;; + esac + ;; + MiNT) osname=mintdiff --git a/sysc/perl-5.32.1/perl-5.32.1.sh b/sysc/perl-5.32.1/perl-5.32.1.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -35,7 +36,9 @@ src_configure() { -Dusedl=false \ -Ddate=':' \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" + -Darchname="i386-linux" \ + -Dmyhostname="(none)" \ + -Dmaildomain="(none)" } src_install() {diff --git a/sysc/run.sh b/sysc/run.sh@@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -20,13 +20,11 @@ export DESTDIR=/tmp/destdir create_fhs() { # Add the rest of the FHS that we will use and is not created pre-boot + rm -rf /sbin /usr/sbin + ln -s bin /usr/sbin for d in bin lib sbin; do ln -s "usr/${d}" "/${d}" done - mv /usr/sbin/* /usr/bin/ - rm -r /sbin /usr/sbin - ln -s bin /usr/sbin - ln -s bin /sbin mkdir /etc /proc /run /sys /tmp /var mount -t proc proc /proc mount -t sysfs sysfs /sysdiff --git a/sysc/run2.sh b/sysc/run2.sh@@ -85,7 +85,7 @@ build libatomic_ops-7.6.10 build gc-8.0.4 -#build guile-3.0.7 +build guile-3.0.7 if [ "$FORCE_TIMESTAMPS" = True ] ; then echo 'Forcing all files timestamps to be 0 unix time.'diff --git a/sysc/tar-1.34/tar-1.34.sh b/sysc/tar-1.34/tar-1.34.sh@@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-laterdiff --git a/sysglobal/SHA256SUMS.pkgs b/sysglobal/SHA256SUMS.pkgs@@ -27,16 +27,16 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 autoconf-2.61_ 48032a5174c2d346f43f43e00e82610cda23ca868c1202f001e241033d15a206 autoconf-2.64_0.links a13a7569b9b9a050b0278c066ec86e7d65966af27e3808a4da7ae4934e73421c autoconf-2.64_0.tar.gz 6c73d920d88a96d1f971f98afe04dbc456522383777a42bb758f765630019f26 autoconf-2.69_0.links -c7a2dba15a94a1b7a32316cd399d0c120a018f563e34a32ccad822fbe6f31734 autoconf-2.69_0.tar.gz +0ee2fad2079801d00720707f43848d2da7a8f825316f5a705d54497486f4f989 autoconf-2.69_0.tar.gz d713ac1840e82250414ee4f7cd75c79ee44ecb4e8dfc659704eed3d75e7d348c autoconf-2.71_0.x86.xbps 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 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.11.2_0.links -9d6f0a64e70e0f364ce7e167964dc36f1b4fe9589c1db63323970c0b1db79e8f automake-1.11.2_0.tar.gz +59852e998868383fc1708b1d9494c6a2b29cabf8d0718070421885291066a02f automake-1.11.2_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.15.1_0.links -8e2f726169e3a5dce84dcb1ed65bb741d9ed0a517ccfb9893c178bbd5ba81d36 automake-1.15.1_0.tar.gz +14276d441c54ae77bb5365bac03730a85c01a701ea92da3d5c6fc31c54be2c3a automake-1.15.1_0.tar.gz 708d854632c90e3706194a1a7555a3dc2fafb7ccae65872ad3420083f2781143 automake-1.16.3_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 automake-1.4-p6_0.links 2e603260980ec9d6f0cd560e02350a002575bb6fb2279229430c57d45cb29f86 automake-1.4-p6_0.tar.gz @@ -71,7 +71,7 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_1. e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.1_2.links d0a309628ecc5a9f331a8e4275412689b1c27509f7ebf255a8df2324a591381c bison-3.4.1_2.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bison-3.4.2_0.links -2b7be2283e510186466c92cb3714ba68c41a949cbf00bb5d0e5dc1ef7021ee0b bison-3.4.2_0.tar.gz +49164d8663e149da80511684d2fb8d4ae9f6d7ab6f96c6ed85f6e98fefef1ad5 bison-3.4.2_0.tar.gz 07fee627dcf30aaa9beab40ffeacc3bec7afe3488d2fbc7e8a72ae782a85869a bzip2-1.0.8_0.links 02c4d6e6a01c911593eb20bdbc72761cdc977ff48c3ca3b46af4255083cd2679 bzip2-1.0.8_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 coreutils-5.0_0.links @@ -106,25 +106,30 @@ cb28e5554c51291c456027e38f5563cc787c8e2f8656bb1f4dfcc085d0639016 gmp-6.2.1_0.ta 507f79f3c07b212154053caae665ee7ed3a53bc420987ec381cf637339fef7de gperf-3.1_0.x86.xbps ae0b200220b4a6d40571764d065ddf35d9535e94582c6bdb2c95316d937c4dce grep-2.4_0.links 5e48a54d2cfcdfea2803d7f60d6a57b1fd563920064beb6b13fa8bb96155bb5b grep-2.4_0.tar.gz +e86436389d960515efdc1ba08c8178c1134dbed693ccce01ea82b05e6d9874f7 guile-3.0.7_0.x86.xbps 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 +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 kexec-tools-2.0.22_0.links +a0f11c39a7cc2cb7e12964f58a9bbac5737e331e2bd689a0c21b58ba3caaaf6a kexec-tools-2.0.22_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 libarchive-3.5.2_0.links 66778085e702e5ec3842285818c3427c3baffd9f03a4b1b15278f8acccc05917 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 -b2f76514d849adaa13083379f76f36f868d147949b7a2fe34e72b45bce152fb2 libtool-1.4_0.tar.gz +9855213a5879dc454a6c502e82d539bc7cf9d45f44553ba64ce1f7795fd4bb89 libtool-1.4_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 libtool-2.2.4_0.links -f767954832cd08d4cc9622bc41ef363638f96e09900b17b7ad2a9a1838e383b1 libtool-2.2.4_0.tar.gz +6c82e3fb79972507e46cc19e48b3d7e2ba2575f06fbd32db2fbc896206ab564a 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 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 linux-headers-5.10.41_0.links 16218b84f6958608e1163954cb3c50ed64dcbb9c280a85e2ff1ec07b4e15619b linux-headers-5.10.41_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 m4-1.4.7_0.links 8e6afb2fd2684d9a653ac8f307212dd206fc1c0e1cbf76f85f8eb45c3028ceb2 m4-1.4.7_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 make-3.82_0.links -6fa898ded9f7a256d6ca68a5123aab2dd4a46b99d25952b11462dd165af5d164 make-3.82_0.tar.gz +02b2a143a73ad70f1c15e5d5f6f0ce75192378e5ad66b871808767171cdcddb4 make-3.82_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 make-4.2.1_0.links 4a95da894bac59cd547469540681e162632a40271c0a07f2710d4a99f4031d94 make-4.2.1_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 mes-0.23_0.links @@ -142,7 +147,7 @@ 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 -0d268cb5cc4a9f2ac85b0cc6ba4900bbe3088a2db658bb85043ac09bcdb4079b openssl-1.1.1l_0.tar.gz +a8f4a00e47e3d5a990575552b93ddb74ff403987a3b5e1c60405e1581dd10878 openssl-1.1.1l_0.tar.gz c18cdec4ba5292d4770f519d30fc30557eea8d424c83276aa6b180f8af1ea8a6 patch-2.7.6_0.x86.xbps e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.000_0.links 48303fa5a3dd7b132fbf032e349246a44e21955af64f5f2a3b941269ed931bbb perl-5.000_0.tar.gz @@ -155,7 +160,7 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl5.005-03_0 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.10.1_0.links d4ff3906886616fce7c4fa424f99a54cfdcd786357439e8688090ce71fd33684 perl-5.10.1_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.32.1_0.links -b498f1220fbb2d90692e1d4bc77e03bde9f9df56918445f97f8e3dadd6bb8efe perl-5.32.1_0.tar.gz +6209a100d4180e22a61f5267c905645bc7224636b71899ee38ea32b199ba589b perl-5.32.1_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 perl-5.6.2_0.links 97fb27fce8feee45fccc96067a368bc3dfe0e5a967a79e6cd37de578375d6f4f perl-5.6.2_0.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 pkg-config-0.29.2_0.links @@ -173,8 +178,9 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_2.l e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 tcc-0.9.27_3.links 766e43802f86f49f63fefec21e9530544a452359298202fc9754979beabe4b2f tcc-0.9.27_3.tar.gz 852e7be426aa5ae63b646fb6f5c8f95a884a143a04548e615289dacb5d0a9970 texinfo-6.7_0.x86.xbps -17bf011cce3ddcfdbebbfbac05f2534adc6e569188716a7ed092e2ecab19ba55 util-linux-2.19.1_0.links -2047bb4b402dcc3bedbc426d6b520fce02276949859b7a71ddf42480424c7225 util-linux-2.19.1_0.tar.gz +970cc84444fecc225becb0db24671a186888a8a8d37daf3f40d827a907181a12 util-linux-2.19.1_0.links +729b4b583accfa2ea2c1404af14e48db085c73fac6a46d23de5c369e6a78c5ef util-linux-2.19.1_0.tar.gz +d1b213b58b1d2d9e40dc9966ab8e2b97475118a457f360d335c2cec782844177 x86-repodata e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 xbps-0.59.1_0.links a7bed253a8440374ce07481aebef410e9485d5b761e2ba31aa40594e2219acdf xbps-0.59.1_0.tar.gz ac8c7b186195ad29d86c2d1608b0c4ba37eeb12daff8f155d69d568239cae237 xz-5.0.5_0.linksdiff --git a/sysglobal/helpers.sh b/sysglobal/helpers.sh@@ -1,7 +1,7 @@ #!/bin/bash -e # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space> +# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com> # SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com> # @@ -46,7 +46,7 @@ reset_timestamp() { # A rudimentary find implementation that does the trick fs= if [ -n "$(ls 2>/dev/null)" ]; then - fs=$(echo *) + fs=$(echo ./*) fi if [ -n "$(ls .[0-z]* 2>/dev/null)" ]; then fs="${fs} $(echo .[0-z]*)" @@ -66,6 +66,7 @@ reset_timestamp() { fake_grep() { text="${1}" fname="${2}" + # shellcheck disable=SC2162 while read line; do case "${line}" in *"${text}"*) echo "${line}" ;; @@ -151,7 +152,7 @@ build() { cd "${DESTDIR}" get_links > "/usr/src/repo/${pkg}_${revision}.links" if command -v find >/dev/null 2>&1 && command -v sort >/dev/null 2>&1; then - find -print0 | LC_ALL=C sort -z > /tmp/filelist.txt + find . -print0 | LC_ALL=C sort -z > /tmp/filelist.txt fi cd /usr/src/repo if tar --help | grep ' \-\-sort' >/dev/null 2>&1; then @@ -189,6 +190,7 @@ build() { xbps-install -y -R /usr/src/repo "${pkg%%-[0-9]*}" else # Overwriting files is mega busted, so do it manually + # shellcheck disable=SC2162 while IFS= read -d $'\0' file; do rm -f "/${file}" >/dev/null 2>&1 || true done < /tmp/filelist.txt