[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Fix keymaps-override-ppc pickup in mk-images (#524235)



Ack

--

  Martin Gracik

----- "Martin Sivak" <msivak redhat com> wrote:

> 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.
> ---
>  scripts/mk-images |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index fede441..df3363a 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
> -- 
> 1.6.6
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list redhat com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]