openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makedist.inc.sh: install qemu wrapper sooner to fix arm/aarch64 targets

Browse Source
This commit is contained in:
Silvan Calarco 2021-06-23 18:05:57 +02:00
parent a0807e6b99
commit b676586c07
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makedist.inc.sh
View File

@ -15,7 +15,12 @@ create_rpm_database
echo "Installing preparation packages..." echo "Installing preparation packages..."
install_rpms "filesystem gzip texinfo ldconfig chkconfig bash libreadline glibc libncurses setup coreutils \ install_rpms "filesystem gzip texinfo ldconfig chkconfig bash libreadline glibc libncurses setup coreutils \
libacl libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam" "--nodeps --noorder --noscripts" libacl libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam" "--nodeps --noorder --noscripts"
# pam initscripts
if [ "$BUILDARCH" != "$ARCH" ]; then
pre_qemu
QEMU_COPIED_FOR_INST=1
fi
chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20 chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20
[ -e $TARGETDIR/platforms/$PLATFORM/pre-packages.inc.sh ] && . $TARGETDIR/platforms/$PLATFORM/pre-packages.inc.sh [ -e $TARGETDIR/platforms/$PLATFORM/pre-packages.inc.sh ] && . $TARGETDIR/platforms/$PLATFORM/pre-packages.inc.sh
@ -68,11 +73,6 @@ INSTALLED="texinfo"
# NOSCRIPTARG="--noscripts" # NOSCRIPTARG="--noscripts"
#fi #fi
if [ "$BUILDARCH" != "$ARCH" ]; then
pre_qemu
QEMU_COPIED_FOR_INST=1
fi
install_rpms_by_target "Installing base packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-base "--replacepkgs ${RPMEXTRAARGS} ${NOSCRIPTARG}" install_rpms_by_target "Installing base packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-base "--replacepkgs ${RPMEXTRAARGS} ${NOSCRIPTARG}"
pre_install_rpms pre_install_rpms