X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Frawhide-bootstrap;h=6729a6d416db357b92d8a29e4512609fd362592a;hb=f15d3d19ea40312737e009b52e7359f57c123f8f;hp=05b7325af4cda24c5340816be74596e3d8a0992a;hpb=3c9526ee4b863848fa93ba7a3e17aea75953a688;p=nethome.git

diff --git a/src/rawhide-bootstrap b/src/rawhide-bootstrap
index 05b7325..6729a6d 100755
--- a/src/rawhide-bootstrap
+++ b/src/rawhide-bootstrap
@@ -77,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
@@ -182,6 +184,7 @@ perl
 binutils
 hfsutils
 tcl
+nash
 EOH
 `
 mkdir -p $ROOT/var/lock/rpm
@@ -189,17 +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
 
-# 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:
 # 	rpmdb: Program version 4.2 doesn't match environment version
 # FIXME: Analyse and bugreport:
@@ -226,9 +222,14 @@ yum-metadata-parser
 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 pkg $line|xargs -n1 basename;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
 	sed -e 's/^mirrorlist=/#&/' -e 's/^#\(baseurl=\)/\1/' \
@@ -236,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
@@ -254,6 +254,8 @@ gdb
 EOH
 `
 
+umount $ROOT/proc
+umount $ROOT/selinux
 umount $ROOT/sys
 
 echo OK