- new chroot does not take / anymore but just fails.

This is fixing Ubuntu 14.10 builds (and hopefully breaks nothing else)

1 files changed, 12 insertions, 13 deletions

diff --git a/init_buildsystem b/init_buildsystem
index f61df56..ec1d862 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -37,7 +37,6 @@ export YAST_IS_RUNNING=instsys
 
 # slurp in package binary support
 . "$BUILD_DIR/build-pkg"
-
 # need to restore build root owner for non-root builds
 browner=0
 definesnstuff=()
@@ -209,7 +208,7 @@ preinstall() {
 }
 
 run_pkg_scripts() {
-    chroot $BUILD_ROOT /sbin/ldconfig 2>/dev/null
+    $CHROOT /sbin/ldconfig 2>/dev/null
     for PKG in $PACKAGES_TO_RUNSCRIPTS ; do
 	pkg_runscripts
 	check_exit
@@ -843,7 +842,7 @@ done
 rm -rf "$BUILD_ROOT/installed-pkg"
 mkdir -p "$BUILD_ROOT/installed-pkg"
 
-test -x $BUILD_ROOT/sbin/ldconfig && chroot $BUILD_ROOT /sbin/ldconfig 2>&1
+test -x $BUILD_ROOT/sbin/ldconfig && $CHROOT /sbin/ldconfig 2>&1
 
 MAIN_LIST="$PACKAGES_TO_INSTALL"
 progress_setup MAIN_LIST
@@ -963,12 +962,12 @@ done
 
 echo now finalizing build dir...
 if test -x $BUILD_ROOT/sbin/ldconfig ; then
-	CHROOT_RETURN="`chroot $BUILD_ROOT /sbin/ldconfig 2>&1`"
+	CHROOT_RETURN="`$CHROOT /sbin/ldconfig 2>&1`"
 	case "$CHROOT_RETURN" in
 	    *warning:*)
-		chroot $BUILD_ROOT /sbin/ldconfig
+		$CHROOT /sbin/ldconfig
 		echo
-		echo chroot $BUILD_ROOT /sbin/ldconfig
+		echo $CHROOT /sbin/ldconfig
 		echo
 		echo "$CHROOT_RETURN"
 		echo
@@ -980,7 +979,7 @@ if test -x $BUILD_ROOT/sbin/ldconfig ; then
 fi
 
 if test -x $BUILD_ROOT/usr/sbin/Check && ! grep -q "/usr/sbin/Check is obsolete" $BUILD_ROOT/usr/sbin/Check ; then
-    chroot $BUILD_ROOT /usr/sbin/Check
+    $CHROOT /usr/sbin/Check
 fi
 
 mkdir -p $BUILD_ROOT/var/adm/packages
@@ -988,24 +987,24 @@ touch $BUILD_ROOT/var/adm/packages
 
 if test -x $BUILD_ROOT/sbin/SuSEconfig ; then
     if grep norestarts $BUILD_ROOT/sbin/SuSEconfig > /dev/null ; then
-	chroot $BUILD_ROOT /sbin/SuSEconfig --norestarts --force
+	$CHROOT /sbin/SuSEconfig --norestarts --force
     else
-	chroot $BUILD_ROOT /sbin/SuSEconfig --force
+	$CHROOT /sbin/SuSEconfig --force
     fi
 fi
 
 if test -x $BUILD_ROOT/usr/X11R6/bin/switch2mesasoft ; then
-    chroot $BUILD_ROOT /usr/X11R6/bin/switch2mesasoft
+    $CHROOT /usr/X11R6/bin/switch2mesasoft
 fi
 
 for PROG in /usr/bin/TeX/texhash /usr/bin/texhash ; do
     test -x $BUILD_ROOT/$PROG && \
-	chroot $BUILD_ROOT bash -c ". /etc/profile ; $PROG"
+	$CHROOT bash -c ". /etc/profile ; $PROG"
 done
 
 if test -e $BUILD_ROOT/usr/share/zoneinfo/UTC ; then
     for PROG in /usr/sbin/zic /usr/bin/zic /bin/zic /sbin/zic ; do
-        test -x $BUILD_ROOT/$PROG  && chroot $BUILD_ROOT bash -c "$PROG -l $(readlink -f /usr/share/zoneinfo/UTC)"
+        test -x $BUILD_ROOT/$PROG  && $CHROOT bash -c "$PROG -l $(readlink -f /usr/share/zoneinfo/UTC)"
     done
 fi
 
@@ -1022,7 +1021,7 @@ fi
 # XXX: still needed?
 if test -x $BUILD_ROOT/bin/rpm -a ! -f $BUILD_ROOT/var/lib/rpm/packages.rpm -a ! -f $BUILD_ROOT/var/lib/rpm/Packages ; then
     pkg_initdb_rpm
-    chroot $BUILD_ROOT rpm -q --whatprovides rpm >/dev/null 2>&1	# create provides index
+    $CHROOT rpm -q --whatprovides rpm >/dev/null 2>&1	# create provides index
 fi
 
 rm -f $BUILD_ROOT/.rpmmacros $BUILD_ROOT/root/.rpmmacros