diff options
| author | Martin Sivak <msivak@redhat.com> | 2010-02-03 16:01:05 +0100 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2010-02-03 16:45:51 -0600 |
| commit | 40d76578affaa958c125bcd3910fbcb45d58c99c (patch) | |
| tree | 91d8a90965ae3d098194b5e3ad6d1f78d0489d7e /scripts | |
| parent | 1121455290fca50ae42ae5c6e40fa4ee95da3302 (diff) | |
| download | anaconda-40d76578affaa958c125bcd3910fbcb45d58c99c.tar.gz anaconda-40d76578affaa958c125bcd3910fbcb45d58c99c.tar.xz anaconda-40d76578affaa958c125bcd3910fbcb45d58c99c.zip | |
Fix keymaps-override-ppc pickup in mk-images (#524235)
We have to use BASEARCH, because during the build the ARCH is set to ppc
and the BUILDARCH is ppc64 so we couldn't find the file.
RPMUtils map the BASEARCH correctly to ppc. So we will find the file.
It also works correctly for i686 -> i386 and x86_64 -> x86_64.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 846e16e8a..1a096ea18 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -195,9 +195,9 @@ if [ -n "$dieLater" ]; then exit 1; fi if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then # go ahead and create the keymaps so we only have to do it once - if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH ]; then + if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BASEARCH ]; then echo "Found keymap override, using it" - cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH $KEYMAPS + cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BASEARCH $KEYMAPS else echo "Running: $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH" $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH |