Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=dd8877cd3c817827388927b3173601c59fa63f35
commit dd8877cd3c817827388927b3173601c59fa63f35 Author: Miklos Vajna <[email protected]> Date: Fri Aug 17 09:55:45 2012 +0200 makepkg: fix building wip chroots without a base diff --git a/scripts/makepkg b/scripts/makepkg index 93912b7..d11ff35 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1074,7 +1074,9 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then do repo=$(eval "$ECHO \${${i}_$DB_EXT/.$DB_EXT}") [ -z "$repo" ] && repo="$i" - $ECHO "Include = /etc/pacman-g2/repos/$repo" >>$_F_makepkg_pacconf + # the config parser doesn't know about -r, so we + # need $CHROOTDIR here for this first run + $ECHO "Include = $CHROOTDIR/etc/pacman-g2/repos/$repo" >>$_F_makepkg_pacconf done mkdir -p $CHROOTDIR/{tmp,var/log,etc/pacman-g2/repos} cp -pf /etc/pacman-g2/repos/* $CHROOTDIR/etc/pacman-g2/repos >/dev/null @@ -1089,6 +1091,9 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then exit 1 fi cat $_F_makepkg_pacconf > $CHROOTDIR/etc/pacman-g2.conf + # later runs use 'chroot pacman-g2' instead of + # 'pacman-g2 -r', so get rid of $CHROOTDIR + sed -i "s|$CHROOTDIR||" $CHROOTDIR/etc/pacman-g2.conf rm -f $_F_makepkg_pacconf else msg "Updating the '-$TREE' chroot environment" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
