diff options
| author |   Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2009-12-18 12:58:32 +0100 |
|---|---|---|
| committer | Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2009-12-18 12:58:32 +0100 |
| commit | ef1201f8d960f602979b09d6ceeee96488f0ee57 (patch) | |
| tree | ba23b0ccc38cfe6fb3cc8542cefb4d3d3209d752 | |
| parent | Add the PAM directory to the list of directories where .la files are useless. (diff) | |
| download | flameeyes-tinderbox-ef1201f8d960f602979b09d6ceeee96488f0ee57.tar.gz flameeyes-tinderbox-ef1201f8d960f602979b09d6ceeee96488f0ee57.tar.bz2 flameeyes-tinderbox-ef1201f8d960f602979b09d6ceeee96488f0ee57.zip | |
Improve the restart script.
- check for ocaml updates and run ocaml-rebuild.sh if needed;
- use --update rather than --selective to build the updated packages (such
as ghc, ocaml, portage);
- don't fail if ocaml or ghc fail to build;
| -rwxr-xr-x | tinderbox-restart.sh | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh index eb3ad79..a356dc4 100755 --- a/tinderbox-restart.sh +++ b/tinderbox-restart.sh @@ -17,19 +17,31 @@ echo > /etc/portage/package.mask/currentrun reset_emergelog -emerge -1 --selective gcc +emerge -u1 portage + +emerge -u1 gcc if fgrep -q '>>> emerge' /var/log/emerge.log; then ./update-gcc-asneeded.sh fi reset_emergelog -emerge -1 --selective ghc haskell-updater -if fgrep -q '>>> emerge' /var/log/emerge.log; then - echo "running #haskell-updater" +if emerge -u1 ghc haskell-updater && + fgrep -q '>>> emerge' /var/log/emerge.log; then + + echo "running #haskell-updater" | bti /usr/sbin/haskell-updater --upgrade fi -emerge -1 --selective glibc portage bti screen avahi nfs-utils gentoolkit java-dep-check portage-utils +reset_emergelog + +if emerge -u1 dev-lang/ocaml && + fgrep -q '>>> emerge' /var/log/emerge.log; then + + echo "running #ocaml-rebuild" | bti + /usr/sbin/ocaml-rebuild.sh -f +fi + +emerge -u1 glibc bti screen avahi nfs-utils gentoolkit java-dep-check portage-utils reset_emergelog |