Update stage0-posix, help2man fix, refactor

- stage0-posix update to correctly exist on fail.
- help2man reproducibility fix for month.
- refactor some bits into functions.
This commit is contained in:
fosslinux 2022-04-04 20:50:35 +10:00
parent f76fb8259b
commit 7366647595
7 changed files with 116 additions and 79 deletions

View file

@ -17,6 +17,7 @@ bindir=${prefix}/bin
libdir=${prefix}/lib
incdir=${prefix}/include
tmpdir=/tmp # tmpdir is needed for patch to work
TMPDIR=/tmp
# Environmental variables needed for mes
NYACC_PKG=nyacc-1.00.2

View file

@ -0,0 +1,21 @@
SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-only
help2man manpages hardcode the current month and date into the generated
manpage.
This makes manpages not reproducible.
diff --color -ru help2man.PL help2man.PL
--- help2man.PL 2022-04-02 10:20:20.100234930 +1100
+++ help2man.PL 2022-04-02 10:20:21.866247540 +1100
@@ -303,7 +303,7 @@
$_, $ARGV[0]
} $help_option, $version_option;
-my $date = strftime "%B %Y", localtime;
+my $date = "";
(my $program = $ARGV[0]) =~ s!.*/!!;
my $package = $program;
my $version;

View file

@ -92,12 +92,6 @@ fi
echo "Thank you! All done."
# Clear up some RAM space
grep '^pkg=' /after.kaem | sed 's/pkg="//' | sed 's/=$//' | while read -r p ; do
rm -rf "${SOURCES:?}/${p:?}"
done
rm -rf "${SOURCES}/mes"
# Write to bootstrap.cfg
rm "${SOURCES}/bootstrap.cfg"
for var in CHROOT FORCE_TIMESTAMPS DISK ARCH; do
@ -241,6 +235,11 @@ build kbd-1.15
build make-3.82
# Clear up some RAM space
grep '^pkg=' /after.kaem | sed 's/pkg="//' | sed 's/"$//' | while read -r p ; do
rm -rf "${SOURCES:?}/${p:?}"
done
rm -rf "${SOURCES}/mes"
grep '^build' "${SOURCES}/run.sh" | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do
rm -rf "${SOURCES:?}/${p:?}"
done

@ -1 +1 @@
Subproject commit 649b6a555822d83a4cdc8a6d41dc8d9f34a0dec1
Subproject commit 74f1e36f35c28d7854eddfde963917c404764ede