projects
/
rpmbased-dist-chroot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a69d86a
)
Slightly updated, deal with x86_64 and fix bug in arch handling
author
Brett Parker
<iDunno@sommitrealweird.co.uk>
Tue, 11 Nov 2014 15:02:33 +0000
(15:02 +0000)
committer
Brett Parker
<iDunno@sommitrealweird.co.uk>
Tue, 11 Nov 2014 15:02:33 +0000
(15:02 +0000)
rpmbased-dist-chroot.sh
patch
|
blob
|
history
diff --git
a/rpmbased-dist-chroot.sh
b/rpmbased-dist-chroot.sh
index 7fd9a197336f2deaa5ae643b5c3797292513ed1d..2349b2e6a67dff734f319b5e4ca66eb936af9da3 100755
(executable)
--- a/
rpmbased-dist-chroot.sh
+++ b/
rpmbased-dist-chroot.sh
@@
-24,7
+24,7
@@
RPMArchives=/media/cdrom/Fedora/RPMS
InstallRoot=/mnt/temp/fedora
RPMArchives=/media/cdrom/Fedora/RPMS
InstallRoot=/mnt/temp/fedora
-installpackages="bash coreutils yum"
+installpackages="bash coreutils yum
basesystem redhat-release
"
ourcachedirectory=$(mktemp -d)
ourcachedirectory=$(mktemp -d)
@@
-32,6
+32,9
@@
architecture=$(uname -m)
export ARCH=$architecture
case $architecture in
export ARCH=$architecture
case $architecture in
+ x86_64)
+ architecture="x86_64,i686,i586,i486,i386"
+ ;;
i686)
architecture="i686,i586,i486,i386"
;;
i686)
architecture="i686,i586,i486,i386"
;;
@@
-126,9
+129,11
@@
echo "InstallRoot : $InstallRoot"
function buildcache() {
cd $RPMArchives
function buildcache() {
cd $RPMArchives
- for file in *.{noarch,$architecture}.rpm; do
- rpm -qpl $file | sed 's#^#'$file':#' >> $ourcachedirectory/files-cache
- rpm -qp --provides $file | cut -d " " -f 1 | sed 's#^#'$file':#' >> $ourcachedirectory/package-cache
+ for arch in noarch $(echo $architecture | sed -e 's/,/\n/g'); do
+ for file in *.$arch.rpm; do
+ rpm -qpl $file | sed 's#^#'$file':#' >> $ourcachedirectory/files-cache
+ rpm -qp --provides $file | cut -d " " -f 1 | sed 's#^#'$file':#' >> $ourcachedirectory/package-cache
+ done
done
}
done
}
@@
-216,8
+221,10
@@
for package in $installpackages; do
cd ${RPMArchives} && rpm -r ${InstallRoot} --ignorearch --install $(cat $ourcachedirectory/build-packagelist | cut -d ' ' -f 1)
if ( ! grep " $package\$" $ourcachedirectory/build-packagelist > /dev/null 2>/dev/null ); then
cd ${RPMArchives} && rpm -r ${InstallRoot} --ignorearch --install $(cat $ourcachedirectory/build-packagelist | cut -d ' ' -f 1)
if ( ! grep " $package\$" $ourcachedirectory/build-packagelist > /dev/null 2>/dev/null ); then
- echo rpm -r ${InstallRoot} --ignorearch --install $(findrpm $package) >> $ourcachedirectory/install-log
- cd ${RPMArchives} && rpm -r ${InstallRoot} --ignorearch --install $(findrpm $package)
+ packages="$(findrpm $package)"
+ echo rpm -r ${InstallRoot} --ignorearch --install "${packages}" >> $ourcachedirectory/install-log
+ echo "${packages}" >> $ourcachedirectory/packages-installed
+ cd ${RPMArchives} && rpm -r ${InstallRoot} --ignorearch --install ${packages}
fi
else
echo " Failed to find the RPM providing $package - skipping"
fi
else
echo " Failed to find the RPM providing $package - skipping"