X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=src%2Frawhide-bootstrap;h=6729a6d416db357b92d8a29e4512609fd362592a;hp=8377f93b026de61d27e54c027e0a95a79bb341b1;hb=dc3afbf1633090347f5f807332407aa0ac3245a5;hpb=33946e08b825c32ec7cdb0ee0e8a818f19adc5e9

diff --git a/src/rawhide-bootstrap b/src/rawhide-bootstrap
index 8377f93..6729a6d 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"
@@ -74,8 +77,10 @@ while read -r key val;do
 EOH
 
 # Workaround coreutils: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199840
-mkdir -p $ROOT/bin
+mkdir -p $ROOT/{bin,etc/rpm}
 cp -p /bin/{cat,rm} $ROOT/bin/
+cp -p /etc/rpm/platform $ROOT/etc/rpm/
+cp -p /etc/rpm/macros $ROOT/etc/rpm/ || echo May be missing
 
 # Prevent:
 # matchpathcon(/var/log/lastlog) failed: No such file or directory
@@ -90,7 +95,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 +178,13 @@ 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
+nash
 EOH
 `
 mkdir -p $ROOT/var/lock/rpm
@@ -180,14 +192,10 @@ mkdir -p $ROOT/{proc,selinux}
 mount -n -t proc      none $ROOT/proc
 mount -n -t selinuxfs none $ROOT/selinux
 $RPM --root=$ROOT -i * 
-umount $ROOT/proc
-umount $ROOT/selinux
 rm -f *
 cd
 rm -rf $DOWNLOAD
 
-chroot $ROOT /bin/rpm --rebuilddb
-
 # Do not install yum(8) just by 'rpm --root', later --rebuilddb would:
 # 	rpmdb: Program version 4.2 doesn't match environment version
 # FIXME: Analyse and bugreport:
@@ -206,17 +214,21 @@ libxml2-python
 gmp
 libxml2
 elfutils
-binutils
+elfutils-libs
 python-elementtree
 python-sqlite
 python-urlgrabber
 yum-metadata-parser
-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`
+$RPM --root=$ROOT -i `set +x;for line in $lines;do for i in $(pkg $line|xargs -n1 basename);do echo $ROOT/$i;done;done`
+chroot $ROOT /bin/rm -f `set +x;for line in $lines;do pkg $line|xargs -n1 basename;done`
+
+# Reported as Bug 206524, occurs on ppc, possibly not a bug:
+rm -f $ROOT/var/lib/rpm/__db.*
+
+chroot $ROOT /bin/rpm --rebuilddb
 
 for repo in $ROOT/etc/yum.repos.d/*.repo;do
 	mv -f $repo $repo-orig
@@ -225,7 +237,6 @@ for repo in $ROOT/etc/yum.repos.d/*.repo;do
 		<$repo-orig >$repo
 done
 
-chroot $ROOT mount /proc
 chroot $ROOT /usr/bin/yum -y update
 
 # For: kernel-2.6.9-11.EL.src.rpm
@@ -243,6 +254,8 @@ gdb
 EOH
 `
 
+umount $ROOT/proc
+umount $ROOT/selinux
 umount $ROOT/sys
 
 echo OK