mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix execution of post install scripts on cross builds

Browse Source 
Add missing call to register_binfmt before installing packages on
mkrootfs.
This commit is contained in:
Renato Aguiar 2020-02-20 05:54:13 -08:00 committed by Juan RP
parent 9b0805471a
commit a7a20d50d3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib.sh.in
View File

@ -242,7 +242,7 @@ register_binfmt() {
# use the static one always and make sure it shows up at the same # use the static one always and make sure it shows up at the same
# place in the host and the chroot. # place in the host and the chroot.
if [ ! -x "$ROOTFS/usr/bin/$QEMU_BIN" ] ; then if [ ! -x "$ROOTFS/usr/bin/$QEMU_BIN" ] ; then
cp -f "$(which "$QEMU_BIN")" "$ROOTFS/usr/bin" || install -m755 -D "$(which "$QEMU_BIN")" "$ROOTFS/usr/bin/$QEMU_BIN" ||
die "Could not install $QEMU_BIN to $ROOTFS/usr/bin/" die "Could not install $QEMU_BIN to $ROOTFS/usr/bin/"
fi fi
} }

6
mkrootfs.sh.in
View File

@ -136,8 +136,10 @@ run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -
# so we set this here. # so we set this here.
chmod 755 "$ROOTFS" chmod 755 "$ROOTFS"
# The pseudofs mountpoints are needed for the qemu support in cases # The binfmt setup and pseudofs mountpoints are needed for the qemu
# where we are running things that aren't natively executable. # support in cases where we are running things that aren't natively
# executable.
register_binfmt
mount_pseudofs mount_pseudofs
# With everything setup, we can now run the install to load the # With everything setup, we can now run the install to load the