SPECS (LINUX_2_6): kernel.spec - killed creating arch/{i386, x86_64...

[Elan Ruusamäe]

On Monday 21 April 2008 13:34, hawk wrote:
> Author: hawk                         Date: Mon Apr 21 10:34:24 2008 GMT
> Module: SPECS                         Tag: LINUX_2_6
> ---- Log message:
> - killed creating arch/{i386,x86_64}/boot symlinks in makefiles, causes
> broken directory deps in -source subpackage
> - killed %ghost /lib/modules/%{kernel_release}/{build,source}, causes
> broken directory deps like /home/users/builder/rpm/BUILD/linux-2.6.24 in
> main kernel package
>
> ---- Files affected:
> SPECS:
>    kernel.spec (1.441.2.1874 -> 1.441.2.1875)
>
> ---- Diffs:
>
> ================================================================
> Index: SPECS/kernel.spec
> diff -u SPECS/kernel.spec:1.441.2.1874 SPECS/kernel.spec:1.441.2.1875
> --- SPECS/kernel.spec:1.441.2.1874	Mon Apr 21 05:07:31 2008
> +++ SPECS/kernel.spec	Mon Apr 21 12:34:19 2008
> @@ -994,6 +994,11 @@
>  # on sparc64 avoid building break due to NULL pointer type warrning
>  sed -i -e 's/^EXTRA_CFLAGS := -Werror/EXTRA_CFLAGS := /'
> arch/sparc64/kernel/Makefile
>
> +# Kill creating obsolete arch/{i386,x86_64}/boot directories
> +# and bzImage symlinks, breaks rpm directory deps
> +sed -i -e '/\/arch\/i386\/boot/d' arch/x86/Makefile_32
> +sed -i -e '/\/arch\/x86_64\/boot/d' arch/x86/Makefile_64
> +
>  # cleanup backups after patching
>  find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 |
> xargs -0 -r -l512 rm -f
>
> @@ -1545,9 +1550,6 @@
>  %exclude
> /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko* %endif
>  %ghost /lib/modules/%{kernel_release}/modules.*
> -# symlinks pointing to kernelsrcdir
> -%ghost /lib/modules/%{kernel_release}/build
> -%ghost /lib/modules/%{kernel_release}/source
>  %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
>
>  %ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
> @@ -1703,6 +1705,13 @@
>  All persons listed below can be reached at <cvs_login>@pld-linux.org
>
>  $Log$
> +Revision 1.441.2.1875  2008-04-21 10:34:19  hawk
> +- killed creating arch/{i386,x86_64}/boot symlinks in makefiles, causes
> broken +  directory deps in -source subpackage
> +- killed %ghost /lib/modules/%{kernel_release}/{build,source}, causes
> broken +  directory deps like /home/users/builder/rpm/BUILD/linux-2.6.24 in
> main +  kernel package
> +

so merge in the missing trigger and NOTE that you should package a ghost FILE 
not SYMLINK

-- 
glen