[Frugalware-darcs] frugalware-current: pacman-2.9.7-9-i686

VMiklos vmiklos at frugalware.org
Sun Oct 16 21:51:04 CEST 2005


Sun Oct 16 21:11:16 CEST 2005  VMiklos <vmiklos at frugalware.org>
  * pacman-2.9.7-9-i686
  -chroot.diff: fix building in a chroot, when chrooting from a darcs tree, that
  is not the FST (i.e. the user's private darcs tree)
diff -rN -u old-frugalware-current/source/base/pacman/FrugalBuild new-frugalware-current-1/source/base/pacman/FrugalBuild
--- old-frugalware-current/source/base/pacman/FrugalBuild	2005-10-16 21:49:50.000000000 +0200
+++ new-frugalware-current-1/source/base/pacman/FrugalBuild	2005-10-16 21:14:23.000000000 +0200
@@ -1,4 +1,4 @@
-# Last Modified: Sun, 16 Oct 2005 20:51:14 +0200
+# Last Modified: Sun, 16 Oct 2005 21:09:35 +0200
 # Compiling Time: 0.10 SBU
 # Maintainer: VMiklos <vmiklos at frugalware.org>
 
@@ -64,7 +64,7 @@
 	  '5d8cb60af2c8a069905dcd7bb3dfb2224545b42d' \
 	  '0bf221baa04e2f623ec1a68f8ce92f01ea2745eb' \
 	  'dcb206f7ea1416a0fd8082150ec70b946a069c49' \
-	  '85303ff0de9ad45f0e1510338f414ffb87fd1281' \
+	  '02600e375f987ad924f62571c789a6e3a055b619' \
 	  '5c20c8486d239b1f488cf165318cb85319fe5227' \
 	  '0d982a46ebe9ca49b83f71668a5e0567de00c9cd' \
 	  '9ec5ce0f7d9be552fee75ed7bf001285e198e3d2' \
diff -rN -u old-frugalware-current/source/base/pacman/pacman-2.9.7-chroot.diff new-frugalware-current-1/source/base/pacman/pacman-2.9.7-chroot.diff
--- old-frugalware-current/source/base/pacman/pacman-2.9.7-chroot.diff	2005-10-16 21:49:50.000000000 +0200
+++ new-frugalware-current-1/source/base/pacman/pacman-2.9.7-chroot.diff	2005-10-16 21:14:23.000000000 +0200
@@ -302,16 +302,16 @@
 +	echo "fst ALL=(ALL)       NOPASSWD: ALL" >$CHROOTDIR/etc/sudoers
 +	cp -Ppf /etc/localtime $CHROOTDIR/etc >/dev/null &
 +	cp -pf /etc/services $CHROOTDIR/etc > /dev/null &
-+	# to make Finclude work
-+	if darcs --commands 2>&1|grep -q add; then
-+		[ -d $CHROOTDIR/var/tmp/fst/include/ ] || mkdir -p $CHROOTDIR/var/tmp/fst/include/
-+		[ -d `darcs add . 2>&1|sed -n 's/[^/]*/../g; 4 p'`/source/include ] && cp `darcs add . 2>&1|sed -n 's/[^/]*/../g; 4 p'`/source/include/* $CHROOTDIR/var/tmp/fst/include/
-+	fi
 +	if [ "$?" != "0" ]; then
 +		error "An error occurred while attempting to copy config files to chroot."
 +		chroot_umount
 +		exit 1
 +	fi
++	# to make Finclude work
++	if darcs --commands 2>&1|grep -q add; then
++		[ -d $CHROOTDIR/var/tmp/fst/include/ ] || mkdir -p $CHROOTDIR/var/tmp/fst/include/
++		[ -d `darcs add . 2>&1|sed -n 's/[^/]*/../g; 4 p'`/source/include ] && cp `darcs add . 2>&1|sed -n 's/[^/]*/../g; 4 p'`/source/include/* $CHROOTDIR/var/tmp/fst/include/
++	fi
 +
 +	msg "Copying $pkgname's buildscript to chroot"
 +	cp -a * $CHROOTDIR/var/tmp/fst/



More information about the Frugalware-darcs mailing list