Skip to content

Commit

Permalink
Only run ldconfig if available in BUILD_ROOT
Browse files Browse the repository at this point in the history
ldconfig might not be available in a minimal crossbuild sysroot
  • Loading branch information
gollub authored and adrianschroeter committed May 21, 2012
1 parent 4decf74 commit 72e8789
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions init_buildsystem
Expand Up @@ -1148,20 +1148,22 @@ for FILE in /var/run/utmp /var/log/wtmp /etc/fstab ; do
done

echo now finalizing build dir...
CHROOT_RETURN="`chroot $BUILD_ROOT /sbin/ldconfig 2>&1`"
case "$CHROOT_RETURN" in
*warning:*)
chroot $BUILD_ROOT /sbin/ldconfig
echo
echo chroot $BUILD_ROOT /sbin/ldconfig
echo
echo "$CHROOT_RETURN"
echo
echo "Problem with ldconfig. It's better to reinit the build system..."
echo
cleanup_and_exit 1
;;
esac
if test -x $BUILD_ROOT/sbin/ldconfig ; then
CHROOT_RETURN="`chroot $BUILD_ROOT /sbin/ldconfig 2>&1`"
case "$CHROOT_RETURN" in
*warning:*)
chroot $BUILD_ROOT /sbin/ldconfig
echo
echo chroot $BUILD_ROOT /sbin/ldconfig
echo
echo "$CHROOT_RETURN"
echo
echo "Problem with ldconfig. It's better to reinit the build system..."
echo
cleanup_and_exit 1
;;
esac
fi
test -x $BUILD_ROOT/usr/sbin/Check && chroot $BUILD_ROOT /usr/sbin/Check

mkdir -p $BUILD_ROOT/var/adm/packages
Expand Down

0 comments on commit 72e8789

Please sign in to comment.