X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Frawhide-bootstrap;h=6729a6d416db357b92d8a29e4512609fd362592a;hb=9e4ac2ba24863738f230a3763826a8a284f0039c;hp=ba2a87198d40c3190fc709b567f7df3a65d5ae7c;hpb=40b4de324373cc08f5f7ce7769c5a7ac5d2e3011;p=nethome.git

diff --git a/src/rawhide-bootstrap b/src/rawhide-bootstrap
index ba2a871..6729a6d 100755
--- a/src/rawhide-bootstrap
+++ b/src/rawhide-bootstrap
@@ -29,7 +29,9 @@ function pkg
 		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"
@@ -75,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
@@ -91,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
@@ -174,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
@@ -181,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:
@@ -207,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
@@ -226,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
@@ -244,6 +254,8 @@ gdb
 EOH
 `
 
+umount $ROOT/proc
+umount $ROOT/selinux
 umount $ROOT/sys
 
 echo OK