From 16f97005c8f750989f6f08b04f9f26521375e0cc Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 7 Feb 2018 14:50:48 -0500 Subject: [PATCH] Revert "profile: drop rsync-verify during bootstrap, add --newuse to defaults, we always want it, we run an overlay" This reverts the entirely misguided commit 8f4dbea8da1d1357f00f429455bf780aa497683c. --- profiles/pentoo/base/make.defaults | 2 +- profiles/pentoo/bootstrap/package.use | 2 -- scripts/pentoo-updater.sh | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/profiles/pentoo/base/make.defaults b/profiles/pentoo/base/make.defaults index 6c4af42e9..5078cb531 100644 --- a/profiles/pentoo/base/make.defaults +++ b/profiles/pentoo/base/make.defaults @@ -25,7 +25,7 @@ PENTOO_BINPKG_RESTRICTED="sys-kernel/compat-drivers sys-kernel/ax88179_178a x11- sys-kernel/pentoo-sources dev-python/twisted-web net-analyzer/metasploit sci-libs/lapack-reference x11-base/xorg-drivers app-admin/genmenu" EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --ask-enter-invalid --keep-going=y --binpkg-respect-use=y --tree --verbose --with-bdeps=y --autounmask=n" EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --buildpkg-exclude \"${PENTOO_BINPKG_RESTRICTED}\" --usepkg-exclude \"${PENTOO_BINPKG_RESTRICTED}\"" -EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --binpkg-changed-deps=y --newrepo" +EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --binpkg-changed-deps=y" XFCE_PLUGINS="${XFCE_PLUGINS} brightness menu logout trash" diff --git a/profiles/pentoo/bootstrap/package.use b/profiles/pentoo/bootstrap/package.use index b00fda7cc..bd0872554 100644 --- a/profiles/pentoo/bootstrap/package.use +++ b/profiles/pentoo/bootstrap/package.use @@ -10,5 +10,3 @@ dev-lang/python -tk sys-libs/ncurses -gpm dev-util/pkgconfig internal-glib - -sys-apps/portage -rsync-verify diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh index 029c587a3..f432c9cef 100755 --- a/scripts/pentoo-updater.sh +++ b/scripts/pentoo-updater.sh @@ -69,11 +69,11 @@ if [ -n "${clst_target}" ]; then emerge @changed-deps || safe_exit fi -emerge --deep --update --newuse -kb --with-bdeps @world || safe_exit +emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit perl-cleaner --ph-clean --modules -- --buildpkg=y || safe_exit -emerge --deep --update --newuse -kb --with-bdeps @world || safe_exit +emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit if [ ${RESET_PYTHON} = 1 ]; then eselect python set --python2 ${PYTHON2} || safe_exit @@ -85,7 +85,7 @@ if [ -n "${clst_target}" ]; then #add kde and mate use flags echo "pentoo/pentoo kde mate" >> /etc/portage/package.use emerge @changed-deps || safe_exit - emerge --buildpkg --usepkg --onlydeps --oneshot --deep --update --newuse --with-bdeps pentoo/pentoo || safe_exit + emerge --buildpkg --usepkg --onlydeps --oneshot --deep --update --newuse --changed-use --newrepo pentoo/pentoo || safe_exit etc-update --automode -5 || safe_exit fi @@ -95,7 +95,7 @@ if [ $? = 0 ]; then fi smart-live-rebuild 2>&1 || safe_exit revdep-rebuild -i -- --rebuild-exclude dev-java/swt --exclude dev-java/swt --buildpkg=y || safe_exit -emerge --deep --update --newuse -kb --changed-use @world || safe_exit +emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit #we need to do the clean BEFORE we drop the extra flags otherwise all the packages we just built are removed emerge --depclean || safe_exit portageq list_preserved_libs /