rpms/kernel/devel kernel.spec, 1.537, 1.538 linux-2.6-firewire-git-pending.patch, 1.22, 1.23

[Thorsten Leemhuis]

One comment:

On 25.03.2008 21:43, Jarod Wilson (jwilson) wrote:
> Author: jwilson
> 
> Update of /cvs/pkgs/rpms/kernel/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927
> 
> Modified Files:
> 	kernel.spec linux-2.6-firewire-git-pending.patch 
> Log Message:
> * Tue Mar 25 2008 Jarod Wilson <jwilson at redhat.com>
> - Put %{_target_cpu} into kernel uname, and tack it onto assorted
>   files and directories. Makes it possible to do parallel installs
>   of say both i686 and x86_64 kernels of the same version on x86_64
>   x86_64 hardware (#197065).
> [...] 
> Index: kernel.spec
> ===================================================================
> RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
> retrieving revision 1.537
> retrieving revision 1.538
> diff -u -r1.537 -r1.538
> --- kernel.spec	25 Mar 2008 18:42:30 -0000	1.537
> +++ kernel.spec	25 Mar 2008 20:42:18 -0000	1.538
> [...]
> @@ -1243,11 +1243,11 @@
>      # Pick the right config file for the kernel we're building
>      if [ -n "$Flavour" ] ; then
>        Config=kernel-%{version}-%{_target_cpu}-$Flavour.config
> -      DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour-%{_target_cpu}
> -      DevelLink=/usr/src/kernels/%{KVERREL}$Flavour-%{_target_cpu}
> +      DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour
> +      DevelLink=/usr/src/kernels/%{KVERREL}$Flavour

Just wondering: If we are working in this area why not finally chose one 
of the two variants ("%{KVERREL}-$Flavour" or "%{KVERREL}$Flavour") and 
stick to it everywhere as well? Or even use a "." as delimiter here as 
well?

Then the duplication due to the "if [ -n "$Flavour" ]" could be removed 
in this area of the spec file by using something like this everywhere:

DevelDir=/usr/src/kernels/%{KVERREL}${Flavour:+-${Flavour}}

 > [...]

CU
knurd