From: Matt Turner Date: Thu, 25 Jul 2013 05:26:28 +0000 (-0700) Subject: Replace 'system' with '@system' where applicable, to be more greppable. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df25a030e6978940e2474529ed858d86c4489d40;p=catalyst.git 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 de46bcf6..6cf91067 100644 --- 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 0c2611cf..d1838644 100644 --- 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 cacf5f89..a46268da 100644 --- 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 fda3e362..5aaa38e5 100644 --- 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