Replace 'system' with '@system' where applicable, to be more greppable.

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index de46bcf60830e24ec19945ab76d50cfc8513a00b..6cf910679fb5db8c126b06dffb276e8503887056 100644 (file)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -5,4 +5,4 @@ source /tmp/chroot-functions.sh
 ## START BUILD
 setup_pkgmgr
 
-run_merge "-e system"
+run_merge "-e @system"

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 0c2611cff22476c361fb8f73063ecd5f3bcc7b16..d183864440245c02608ffb32786425a3aa43cafc 100644 (file)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -6,7 +6,7 @@ source /tmp/chroot-functions.sh
 setup_pkgmgr
 
 echo "Bringing system up to date using profile specific use flags"
-run_merge -u system
+run_merge -u @system
 
 echo "Emerging packages using stage4 use flags"
 

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index cacf5f8914384faddf2dc35b498c90a844aceb93..a46268da76b7544c87c7ef79304e4ee441122de3 100644 (file)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -168,7 +168,7 @@ setup_gcc(){
 setup_pkgmgr(){
        # We need to merge our package manager with USE="build" set in case it is
        # portage to avoid frying our /etc/portage/make.conf file.  Otherwise, we could
-       # just let emerge system could merge it.
+       # just let emerge @system could merge it.
        # Use --update or portage won't reinstall the same version.
        [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf
        run_merge --oneshot --nodeps --update sys-apps/portage

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index fda3e362a4dc3ba49c781ad461bb5e2df34a134d..5aaa38e5119c21671dfd721bc92de6a6024b47b7 100644 (file)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -315,7 +315,7 @@ case ${clst_livecd_type} in
                # This gives us our list of system packages for the installer
                mkdir -p /usr/livecd
                ### XXX: Andrew says we don't need this anymore
-               USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
+               USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
 
                # This is my hack to reduce tmpfs usage
                cp -r /usr/portage/profiles /usr/livecd