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

Re: 2 commits - scripts/mk-images



On Tue, 2010-02-23 at 20:48 +0000, David Cantrell wrote:
> scripts/mk-images |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> New commits:
> commit 4b5cc653db4a189b71d91da429a2772bba1d82d1
> Author: David Cantrell <dcantrell redhat com>
> Date:   Tue Feb 23 10:36:05 2010 -1000
> 
>     When BUILDARCH==ppc64, set BASEARCH to ppc (#524235).
>     
>     We need BASEARCH set to ppc when BUILDARCH is ppc64, otherwise the
>     scripts do not pick up the keymaps-override-ppc.gz file on ppc64
>     platforms.
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index 8188bcb..df22425 100755
> --- a/scripts/mk-images
> +++ b/scripts/mk-images
> @@ -126,6 +126,8 @@ fi
>  
>  if [ "$BUILDARCH" = "sparc64" ]; then
>      BASEARCH=sparc
> +elif [ "$BUILDARCH" = "ppc64" ]; then
> +    BASEARCH=ppc
>  else
>      BASEARCH=$BUILDARCH
>  fi
> 
> 
> commit f264631d276d7749daf0d95320921f061599e666
> Author: David Cantrell <dcantrell redhat com>
> Date:   Tue Feb 23 10:23:33 2010 -1000
> 
>     There is no kernel-PAE package anymore, use kernel for xen (#559347).
>     
>     The kernel-PAE package is no longer in existence, use the 'kernel'
>     package for the [images-xen] portion of .treeinfo files.
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index bc04a98..8188bcb 100755
> --- a/scripts/mk-images
> +++ b/scripts/mk-images
> @@ -1060,10 +1060,11 @@ if [ "$BUILDARCH" = "ppc" ]; then
>  elif [ "$BUILDARCH" = "i386" ]; then
>      arches="i586"
>      efiarch="ia32"
> -    kerneltags="kernel kernel-PAE"
> -    kernelxen="kernel-PAE"
> +    kerneltags="kernel"
> +    kernelxen="kernel"
>  elif [ "$BUILDARCH" = "x86_64" ]; then
>      kerneltags="kernel"
> +    kernelxen="kernel"
>      efiarch="x64"
>  elif [ "$BUILDARCH" = "ia64" ]; then
>      kerneltags="kernel"
> 
> 

It looks like these hit F13, and at least the second patch is wrong.  In
fedora we still have kernel and kernel-PAE, and the way the logic works
in mk-images.x86 if the $kernelxen package is the one being operated on,
we skip making isolinux stuff.  This makes composes fall over badly on
Fedora.  Please revert at least the second part of this so we can get a
new build that I can actually compose with.

-- 
Jesse Keating
Fedora -- FreedomĀ² is a feature!
identi.ca: http://identi.ca/jkeating

Attachment: signature.asc
Description: This is a digitally signed message part


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