Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-26 08:40:57 +02:00
Code Issues Projects Releases Wiki Activity

profile/scripts: move --newrepo and --changed-use to the updater script to avoid pain with normal emerge runs refusing to rebuild a package with no changes

Browse source
This commit is contained in:
Zero_Chaos 2015-01-22 21:45:18 +00:00
parent 36e6bb4e5a
commit 468dcc3b09
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
profiles/pentoo/base/make.defaults
View file

@ -24,7 +24,6 @@ PENTOO_BINPKG_RESTRICTED="sys-kernel/compat-drivers sys-kernel/ax88179_178a x11-
app-emulation/virtualbox-modules app-emulation/vmware-modules app-emulation/open-vm-tools-kmod sys-kernel/genkernel sys-kernel/pentoo-sources"
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} --changed-use --newrepo"
XFCE_PLUGINS="${XFCE_PLUGINS} brightness menu logout trash"

2
profiles/pentoo/zero-system/package.accept_keywords/media-sound
View file

@ -1 +1 @@
~media-sound/pulseaudio-5.99.2 **
~media-sound/pulseaudio-5.99.3 **

16
scripts/pentoo-updater.sh
View file

@ -20,35 +20,35 @@ safe_exit() {
}
#first we set the python interpreters to match PYTHON_TARGETS (and ensure the versions we set are actually built)
emerge --update --oneshot $(portageq envvar PYTHON_TARGETS | cut -d" " -f 1 | sed -e 's#_#.#' -e 's#python#python:#g') || safe_exit
emerge --update --oneshot --changed-use --newrepo $(portageq envvar PYTHON_TARGETS | cut -d" " -f 1 | sed -e 's#_#.#' -e 's#python#python:#g') || safe_exit
eselect python set --python2 $(portageq envvar PYTHON_TARGETS | cut -d" " -f 1 |sed 's#_#.#') || safe_exit
emerge --update --oneshot $(portageq envvar PYTHON_TARGETS | cut -d" " -f 2 | sed -e 's#_#.#' -e 's#python#python:#g') || safe_exit
emerge --update --oneshot --changed-use --newrepo $(portageq envvar PYTHON_TARGETS | cut -d" " -f 2 | sed -e 's#_#.#' -e 's#python#python:#g') || safe_exit
eselect python set --python3 $(portageq envvar PYTHON_TARGETS | cut -d" " -f 2 |sed 's#_#.#') || safe_exit
$(portageq envvar PYTHON_TARGETS | cut -d" " -f 1 | sed 's#_#.#') -c "from _multiprocessing import SemLock" || emerge -1 --buildpkg=y $(portageq envvar PYTHON_TARGETS | cut -d" " -f 1 | sed -e 's#_#.#' -e 's#python#python:#g')
$(portageq envvar PYTHON_TARGETS | cut -d" " -f 2 | sed 's#_#.#') -c "from _multiprocessing import SemLock" || emerge -1 --buildpkg=y $(portageq envvar PYTHON_TARGETS | cut -d" " -f 2 | sed -e 's#_#.#' -e 's#python#python:#g')
emerge --update --newuse --oneshot portage || safe_exit
emerge --update --newuse --oneshot --changed-use --newrepo portage || safe_exit
if [ -n "${clst_target}" ]; then
emerge @changed-deps || safe_exit
fi
emerge --deep --update --newuse -kb @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 @world || safe_exit
emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit
python-updater -- --buildpkg=y || safe_exit
emerge --deep --update --newuse -kb @world || safe_exit
emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit
#if we are in catalyst, update the extra binpkgs
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 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
@ -58,7 +58,7 @@ if [ $? -ne 0 ]; then
fi
smart-live-rebuild 2>&1 || safe_exit
revdep-rebuild.py -i --no-pretend -- --rebuild-exclude dev-java/swt --exclude dev-java/swt --buildpkg=y || safe_exit
emerge --deep --update --newuse -kb @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