From: Brian Dolbec Date: Sun, 10 Feb 2013 20:06:15 +0000 (-0800) Subject: Fix a bug that portage didn't get rebuilt with the build use flag X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d84b09461eb482228132fe50ee3291c74dc3b46;p=catalyst.git Fix a bug that portage didn't get rebuilt with the build use flag If clst_PGKCACHE is defined, --newuse was not being added to clst_myemergeopts, so then portage was not being rebuilt if portage was already up to date. --- diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 5c30537b..010f5278 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -168,10 +168,11 @@ 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. - # Use --update or portage won't reinstall the same version. + # just let emerge system could merge it. + # Use --update or portage won't reinstall the same version later. + # Use --newuse to make sure it rebuilds with the "build" use flag. [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf - run_merge --oneshot --nodeps --update sys-apps/portage + run_merge --oneshot --nodeps --update --newuse sys-apps/portage sed -i '/USE="${USE} build"/d' /etc/portage/make.conf }