X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Frawhide-bootstrap;h=cf0b9db403d863e312a1ecfc50c7a4101ea44ef7;hb=5f2897c0544a008841ae8763e5bd156c9531fd29;hp=161d5c7591dc292a0cfbdb21e221782e58062a6f;hpb=77b97e6c1e949f14fc644163eb47a75519ea52bd;p=nethome.git

diff --git a/src/rawhide-bootstrap b/src/rawhide-bootstrap
index 161d5c7..cf0b9db 100755
--- 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"
@@ -38,7 +41,7 @@ function pkg
 
 KEY=/tmp/fedora-bootstrap-$$-key
 rm -rf $KEY
-trap 'rm -f $KEY' EXIT
+trap 'rm -rf $KEY' EXIT
 mkdir $KEY
 cd $KEY
 # wget(1) due to: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=167483
@@ -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
@@ -137,6 +140,7 @@ readline
 info
 zlib
 fedora-release
+fedora-release-notes
 cracklib-dicts
 mingetty
 iputils
@@ -172,7 +176,12 @@ gdbm
 mcstrans
 libcap
 kpartx
-fedora-release-notes
+$(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
@@ -206,7 +215,6 @@ libxml2-python
 gmp
 libxml2
 elfutils
-binutils
 python-elementtree
 python-sqlite
 python-urlgrabber
@@ -239,6 +247,7 @@ kernel-utils
 gcc
 redhat-rpm-config
 diffutils
+gdb
 EOH
 `