SPECS (LINUX_2_6_16): kernel.spec - move build and source symlinks...

[glen]

Author: glen                         Date: Wed Feb 13 09:42:39 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- move build and source symlinks to main pkg and use triggers to make links (fixes grsec and plain module-build collision)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.133 -> 1.441.2.1558.2.134) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.133 SPECS/kernel.spec:1.441.2.1558.2.134
--- SPECS/kernel.spec:1.441.2.1558.2.133	Tue Feb 12 09:34:38 2008
+++ SPECS/kernel.spec	Wed Feb 13 10:42:33 2008
@@ -1325,6 +1325,8 @@
 %if %{with up} || %{with smp}
 # ghosted initrd
 touch $RPM_BUILD_ROOT/boot/initrd-%{kernel_release}{,smp}.gz
+rm -f /lib/modules/%{kernel_release}{,smp}/{build,source}
+touch /lib/modules/%{kernel_release}{,smp}/{build,source}
 %endif
 
 %clean
@@ -1488,6 +1490,24 @@
 	fi
 fi
 
+%triggerin module-build -- %{name} = %{epoch}:%{version}-%{release}
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}/build
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}/source
+
+%triggerun module-build -- %{name} = %{epoch}:%{version}-%{release}
+if [ "$1" = 0 ]; then
+	rm -f /lib/modules/%{kernel_release}/{build,source}
+fi
+
+%triggerin module-build -- %{name}-smp = %{epoch}:%{version}-%{release}
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}smp/build
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}smp/source
+
+%triggerun module-build -- %{name}-smp = %{epoch}:%{version}-%{release}
+if [ "$1" = 0 ]; then
+	rm -f /lib/modules/%{kernel_release}smp/{build,source}
+fi
+
 %if %{with up}
 %files
 %defattr(644,root,root,755)
@@ -1538,6 +1558,9 @@
 %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
@@ -1653,6 +1676,9 @@
 %exclude /lib/modules/%{kernel_release}smp/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
 %ghost /lib/modules/%{kernel_release}smp/modules.*
+# symlinks pointing to kernelsrcdir
+%ghost /lib/modules/%{kernel_release}smp/build
+%ghost /lib/modules/%{kernel_release}smp/source
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}smp
 
 %ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
@@ -1734,15 +1760,6 @@
 
 %files module-build -f aux_files
 %defattr(644,root,root,755)
-# symlinks pointing to kernelsrcdir
-%if %{with up}
-%dir /lib/modules/%{kernel_release}
-/lib/modules/%{kernel_release}/build
-%endif
-%if %{with smp}
-%dir /lib/modules/%{kernel_release}smp
-/lib/modules/%{kernel_release}smp/build
-%endif
 %{_kernelsrcdir}/Kbuild
 %{_kernelsrcdir}/localversion
 %{_kernelsrcdir}/arch/*/kernel/asm-offsets.*
@@ -1809,6 +1826,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.134  2008-02-13 09:42:33  glen
+- move build and source symlinks to main pkg and use triggers to make links (fixes grsec and plain module-build collision)
+
 Revision 1.441.2.1558.2.133  2008-02-12 08:34:38  glen
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1558.2.133&r2=1.441.2.1558.2.134&f=u