diff options
| author | Matt Wilson <msw@redhat.com> | 2000-06-14 03:40:40 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-06-14 03:40:40 +0000 |
| commit | 322a73e5c14be4628efdf0c63e8b55d7d61b911e (patch) | |
| tree | b33f2b75ce37b8ec5e534a882894564ebb490267 /scripts/mk-images | |
| parent | 6bb2f40fa779ee70f65e480a22c719660a68c96c (diff) | |
| download | anaconda-322a73e5c14be4628efdf0c63e8b55d7d61b911e.tar.gz anaconda-322a73e5c14be4628efdf0c63e8b55d7d61b911e.tar.xz anaconda-322a73e5c14be4628efdf0c63e8b55d7d61b911e.zip | |
some more tweaks for sparc
Diffstat (limited to 'scripts/mk-images')
| -rwxr-xr-x | scripts/mk-images | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 7f1122a80..13adf3b93 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -27,6 +27,12 @@ TOPDIR=$(cd $TOPDIR; pwd) KERNELROOT=/tmp/updboot.kernel.$$ MODDEPS=$KERNELROOT/moddeps BUILDARCH=$4 + + if [ $BUILDARCH = "sparc64" ]; + BASEARCH=sparc + else + BASEARCH=$BUILDARCH + fi if [ ! -d "$1" ]; then LATEST=latest --arch $BUILDARCH @@ -44,8 +50,8 @@ TOPDIR=$(cd $TOPDIR; pwd) # Stuff that we need TRIMPCITABLE=$IMGPATH/usr/lib/anaconda-runtime/trimpcitable - KEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/keymaps-${BUILDARCH} - FONTS=$IMGPATH/usr/lib/anaconda-runtime/fonts-${BUILDARCH} + KEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/keymaps-${BASEARCH} + FONTS=$IMGPATH/usr/lib/anaconda-runtime/fonts-${BASEARCH} GETMODDEPS=$IMGPATH/usr/lib/anaconda-runtime/moddeps MODLIST=$IMGPATH/usr/lib/anaconda-runtime/modlist MODINFO=$IMGPATH/usr/lib/anaconda-runtime/loader/module-info @@ -84,7 +90,7 @@ findPackage() { name=$2 for n in $dir/$name*; do - thisName=$(rpm --qf '%{NAME}' -qp $n) + thisName=$(rpm --qf '%{NAME}' -qp $n.{${BUILDARCH},noarch}.rpm) if [ -z "$thisName" ]; then return fi |