Fix for ppc.

[nethome.git] / src / rawhide-bootstrap

diff --git a/src/rawhide-bootstrap b/src/rawhide-bootstrap
index 8377f93..21f0a5e 100755 (executable)
--- a/src/rawhide-bootstrap
+++ b/src/rawhide-bootstrap
@@ -5,9 +5,10 @@
 #      http://cvs.jankratochvil.net/viewcvs/nethome/src/rawhide-bootstrap?rev=HEAD
 
 
-RPMS_URL_BASE=http://armstrong.rhts.boston.redhat.com/distros/rawhide-`uname -i`
+uname_i=`uname -i|sed 's/^ppc64$/ppc/'`
+RPMS_URL_BASE=http://armstrong.rhts.boston.redhat.com/distros/rawhide-$uname_i
 wget -q -O - $RPMS_URL_BASE/GPL >/dev/null || \
-RPMS_URL_BASE=http://sunsite.mff.cuni.cz/pub/fedora/development/`uname -i`/os
+RPMS_URL_BASE=http://sunsite.mff.cuni.cz/pub/fedora/development/$uname_i/os
 
 
 if test $# != 1;then echo >&2 "Syntax: $0 <target-root-directory(DELETED!)>";exit 1;fi
@@ -23,12 +24,14 @@ set -ex
 set +x;pkgs="`set -x;wget -q -O - $RPMS_URL_BASE/Fedora/RPMS/ | sed -n 's/^.*<a href="\([^/?][^/]*\)">.*$/\1/p'`";set -x
 function pkg
 {
-       for arch in `uname -m` `uname -i` noarch;do
+       for arch in `uname -m` $uname_i noarch;do
                r="`set +x;echo "$pkgs"|(set +e;grep -P '^\Q'"$1"'\E-[^-]+-[^-]+'".$arch.rpm"'$')`"
                if [ `echo "$r"|wc -l` -ge 2 ];then break;fi
                if [ -n "$r" ];then
                        echo "$RPMS_URL_BASE/Fedora/RPMS/$r"
-                       return
+                       if [ "$arch" != ppc64 ];then
+                               return
+                       fi
                fi
        done
        echo >&2 "ERROR: $1"
@@ -90,7 +93,7 @@ rm -rf $DOWNLOAD
 trap 'rm -rf $DOWNLOAD $KEY' EXIT
 mkdir $DOWNLOAD
 cd $DOWNLOAD
-wget `set +x;while read -r line;do pkg $line;done <<EOH
+wget `set +x;while read -r line;do if [ -n "$line" ];then pkg $line;fi;done <<EOH
 coreutils
 rpm
 bash
@@ -173,6 +176,12 @@ gdbm
 mcstrans
 libcap
 kpartx
+$(if [ $uname_i = ppc ];then echo ppc64-utils;fi)
+$(if [ $uname_i = ppc ];then echo yaboot     ;fi)
+perl
+binutils
+hfsutils
+tcl
 EOH
 `
 mkdir -p $ROOT/var/lock/rpm
@@ -186,6 +195,9 @@ rm -f *
 cd
 rm -rf $DOWNLOAD
 
+# Reported as Bug 206524, occurs on ppc, possibly not a bug:
+rm -f $ROOT/var/lib/rpm/__db.*
+
 chroot $ROOT /bin/rpm --rebuilddb
 
 # Do not install yum(8) just by 'rpm --root', later --rebuilddb would:
@@ -206,7 +218,7 @@ libxml2-python
 gmp
 libxml2
 elfutils
-binutils
+elfutils-libs
 python-elementtree
 python-sqlite
 python-urlgrabber
@@ -215,8 +227,8 @@ elfutils-libs
 EOH
 `"
 chroot $ROOT /usr/bin/wget `set +x;for line in $lines;do pkg $line;done`
-chroot $ROOT /bin/rpm -i `set +x;for line in $lines;do basename $(pkg $line);done`
-chroot $ROOT /bin/rm -f `set +x;for line in $lines;do basename $(pkg $line);done`
+chroot $ROOT /bin/rpm -i `set +x;for line in $lines;do pkg $line|xargs -n1 basename;done`
+chroot $ROOT /bin/rm -f `set +x;for line in $lines;do pkg $line|xargs -n1 basename;done`
 
 for repo in $ROOT/etc/yum.repos.d/*.repo;do
        mv -f $repo $repo-orig