summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-04-13 14:48:53 +0200
committerDiego Elio Pettenò <flameeyes@gmail.com>2011-04-13 14:48:53 +0200
commit1156ba8cd16cf5e7bede6ad6ae3c274a291edb6a (patch)
tree31ceef67b563b8ae640cc3f221b6c5b59143229d
parentrdeps: Use new URL (diff)
downloadflameeyes-tinderbox-1156ba8cd16cf5e7bede6ad6ae3c274a291edb6a.tar.gz
flameeyes-tinderbox-1156ba8cd16cf5e7bede6ad6ae3c274a291edb6a.tar.bz2
flameeyes-tinderbox-1156ba8cd16cf5e7bede6ad6ae3c274a291edb6a.zip
Add category to package names (screen is ambiguous).
-rwxr-xr-xtinderbox-restart.sh18
1 files changed, 12 insertions, 6 deletions
diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index fbfc4db..5a1a8c8 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -45,9 +45,9 @@ ${tboxdir}/unavailable_installed.py | xargs -r emerge -C
reset_emergelog
-emerge -u1 portage
+emerge -u1 sys-apps/portage
-emerge -u1 gcc
+emerge -u1 sys-devel/gcc
if fgrep -q '>>> emerge' /var/log/emerge.log && gcc-config -l | tail -n 1 | grep -v asneeded; then
${tboxdir}/update-gcc-asneeded.sh
exit 0
@@ -55,7 +55,7 @@ fi
reset_emergelog
-if emerge -u1 perl-cleaner perl &&
+if emerge -u1 app-admin/perl-cleaner perl &&
fgrep -q '>>> emerge' /var/log/emerge.log; then
dent_me "running per-cleaner"
@@ -64,7 +64,7 @@ fi
reset_emergelog
-if emerge -u1 ghc haskell-updater &&
+if emerge -u1 dev-lang/ghc app-admin/haskell-updater &&
fgrep -q '>>> emerge' /var/log/emerge.log; then
dent_me "running #haskell-updater"
@@ -96,10 +96,16 @@ if emerge -u1 sys-kernel/gentoo-sources &&
make -j14 prepare modules_prepare
popd
- emerge -P gentoo-sources
+ emerge -P sys-kernel/gentoo-sources
fi
-emerge -u1 glibc bti screen gentoolkit java-dep-check portage-utils
+emerge -u1 \
+ sys-libs/glibc \
+ net-misc/bti \
+ app-misc/screen \
+ app-portage/gentoolkit \
+ dev-java/java-dep-check \
+ app-portage/portage-utils
reset_emergelog