summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2019-10-26 04:47:16 +0200
committerSuren A. Chilingaryan <csa@suren.me>2019-10-26 04:47:16 +0200
commit5405fe336b06678a6a61b7d2689a5f488a7a084b (patch)
tree71356fdee3e7e5dcbfbbaeccd0391a70be4f09a5 /scripts
parent250a0499b8be676f70206042074caa539d098729 (diff)
downloadgentoo-5405fe336b06678a6a61b7d2689a5f488a7a084b.tar.gz
gentoo-5405fe336b06678a6a61b7d2689a5f488a7a084b.tar.bz2
gentoo-5405fe336b06678a6a61b7d2689a5f488a7a084b.tar.xz
gentoo-5405fe336b06678a6a61b7d2689a5f488a7a084b.zip
Don't reuse virtual/* binary packages
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap/builder.sh2
-rw-r--r--scripts/bootstrap/builder_sync.sh9
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/bootstrap/builder.sh b/scripts/bootstrap/builder.sh
index d01a201..4ec722f 100644
--- a/scripts/bootstrap/builder.sh
+++ b/scripts/bootstrap/builder.sh
@@ -8,7 +8,7 @@ bash /etc/portage/scripts/bootstrap/builder_sync.sh
# This is intended as permanent container
while [ 1 ]; do
- emerge --usepkg --buildpkg --keep-going --update --deep --with-bdeps=y --newuse @world
+ emerge --usepkg --usepkg-exclude "virtual/*" --binpkg-changed-deps=y --buildpkg --keep-going --update --deep --with-bdeps=y --newuse @world
status=$?
if [ $status -eq 0 ]; then
diff --git a/scripts/bootstrap/builder_sync.sh b/scripts/bootstrap/builder_sync.sh
index 5c5c24b..f3a5017 100644
--- a/scripts/bootstrap/builder_sync.sh
+++ b/scripts/bootstrap/builder_sync.sh
@@ -5,9 +5,6 @@
cd "/darklin/gentoo" && git pull
cd "/darklin/darklin4" && git pull
-# Update portage
-emerge --sync && eix-sync
-
# Skip binary packages
rm -f /etc/portage/sets/desktop-apps-bin
@@ -18,14 +15,16 @@ rm -f /etc/portage/package.keywords/xdeps-perl*
rm -f /etc/portage/package.keywords/xdeps-firefox*
bash /etc/portage/scripts/gen-world-sets
+# Update portage
+emerge --sync && eix-sync
+emerge -u1 portage
+
# update layman
#bash /etc/portage/scripts/bootstrap/layman_reinit.sh
# reconfigure kernel if necessary
[ -f /usr/src/linux/.config ] || yes "" | make -C /usr/src/linux oldconfig
-emerge -u1 portage
-
# Update extra dist files
[ ! -f /usr/bin/lftp ] && emerge -1 lftp