kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 19:46:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix-bzip2): enforce static install and validate runnable bzip2 during apply

Browse source
This commit is contained in:
vxtls 2026-03-02 19:42:31 -05:00
parent 6dfc8d5c85
commit afec884ea5
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
steps-guix/bzip2-1.0.6/pass1.sh
View file

@ -12,6 +12,10 @@ src_compile() {
} }
src_install() { src_install() {
make PREFIX="${SYSTEM_PREFIX}" DESTDIR="${DESTDIR}" install make CFLAGS="-O2" LDFLAGS="-static" PREFIX="${SYSTEM_PREFIX}" DESTDIR="${DESTDIR}" install
make PREFIX="${SEED_PREFIX}" DESTDIR="${DESTDIR}" install make CFLAGS="-O2" LDFLAGS="-static" PREFIX="${SEED_PREFIX}" DESTDIR="${DESTDIR}" install
# Fail early if either installed binary is not executable in this environment.
"${DESTDIR}${SYSTEM_PREFIX}/bin/bzip2" --help >/dev/null
"${DESTDIR}${SEED_PREFIX}/bin/bzip2" --help >/dev/null
} }

7
steps-guix/helpers.sh
View file

@ -579,6 +579,13 @@ src_apply() {
fi fi
"${BZIP2_PREFIX}bzip2" -dc "/external/repo/${pkg}_${revision}.tar.bz2" | \ "${BZIP2_PREFIX}bzip2" -dc "/external/repo/${pkg}_${revision}.tar.bz2" | \
"${TAR_PREFIX}tar" -C / -xpf - "${TAR_PREFIX}tar" -C / -xpf -
if [[ "${pkg}" == bzip2-* ]]; then
if ! "${PREFIX}/bin/bzip2" --help >/dev/null 2>&1; then
echo "${pkg}: installed ${PREFIX}/bin/bzip2 is not runnable." >&2
mv -f "/tmp/bzip2" "${PREFIX}/bin/bzip2" || true
false
fi
fi
rm -f "/tmp/bzip2" "/tmp/tar" rm -f "/tmp/bzip2" "/tmp/tar"
} }

1
steps-guix/manifest
View file

@ -60,6 +60,7 @@ build: guile-2.2.4
build: mes-minimal-stripped-0.19-i686-linux build: mes-minimal-stripped-0.19-i686-linux
# Build mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz # Build mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz
build: mescc-tools-static-stripped-0.5.2-i686-linux build: mescc-tools-static-stripped-0.5.2-i686-linux
# End of Guix Bootstrap seeds
build: guix-hash-compat-1.5.0 build: guix-hash-compat-1.5.0
improve: guix-1.5.0 improve: guix-1.5.0
build: guix-1.5.0 build: guix-1.5.0