SOURCES (AC-branch): rpm-build-kernel.patch (NEW) - restore ac ker...

[glen]

Author: glen                         Date: Tue Jul  3 22:04:16 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- restore ac kernel macros in rpm.macros

---- Files affected:
SOURCES:
   rpm-build-kernel.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rpm-build-kernel.patch
diff -u /dev/null SOURCES/rpm-build-kernel.patch:1.1.2.1
--- /dev/null	Wed Jul  4 00:04:16 2007
+++ SOURCES/rpm-build-kernel.patch	Wed Jul  4 00:04:11 2007
@@ -0,0 +1,67 @@
+--- ./rpm.macros	2007-07-04 00:59:10.033559000 +0300
++++ ./rpm.macros	2007-07-04 00:59:27.123949791 +0300
+@@ -288,8 +281,10 @@
+ # Requires name = version-release
+ %requires_releq()		%(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/ (none):/ /' | grep -v "is not")
+ 
+-%releq_kernel()		%((LC_ALL="C" rpm -qf --qf '%%{name} = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
+-%requires_releq_kernel(s:)	Requires%{-s:(%{-s*})}: %releq_kernel
++%releq_kernel_up()		%((LC_ALL="C" rpm -qf --qf '%%{name}-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
++%releq_kernel_smp()		%((LC_ALL="C" rpm -qf --qf '%%{name}-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
++%requires_releq_kernel_up(s:)	Requires%{-s:(%{-s*})}: %releq_kernel_up
++%requires_releq_kernel_smp(s:)	Requires%{-s:(%{-s*})}: %releq_kernel_smp
+ 
+ %requires_eq()		%(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+ %requires_eq_to() %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' | grep -v "is not")
+@@ -1235,7 +1210,7 @@
+ 	L="<"; [[ '%{*}' != *$L$L* ]] || PATCH_SH="set -x -e;$(cat)"	\
+ 	set -e -x														\
+ 																	\
+-for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do \
++for cfg in %{?with_dist_kernel:%{?with_smp:smp} %{?with_up:up}}%{!?with_dist_kernel:nondist}; do \
+ 	[ -r "%{_kernelsrcdir}/config-$cfg" ] || exit 1					\
+ 																	\
+ 	rm -rf o														\
+@@ -1245,8 +1220,8 @@
+ 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h \
+ %ifarch ppc ppc64													\
+ 	install -d o/include/asm										\
+-	[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \
+-	[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm	\
++	[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm	\
++	[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \
+ %else																\
+ 	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm \
+ %endif																\
+@@ -1306,8 +1281,8 @@
+ %define KernelD $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}			\
+ %define ModprobeD $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \
+ 																	\
+-install -d %{KernelD}/%{-d*}									\
+-%{?-s:install -d %{ModprobeD}}								\
++install -d %{KernelD}{,smp}/%{-d*}									\
++%{?-s:install -d %{ModprobeD}{,smp}}								\
+ 																	\
+ for MODULE in {%{-m*},}; do											\
+ 	[ -n "${MODULE}" ] || continue									\
+@@ -1318,11 +1293,19 @@
+ 		%{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"					\\\
+ 			>> %{ModprobeD}/%{-n*}.conf}							\
+ 	%else															\
+-		install ${MODULE}-dist.ko										\\\
++	%if %{with up}													\
++		install ${MODULE}-up.ko										\\\
+ 			%{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko				\
+ 		%{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"					\\\
+ 			>> %{ModprobeD}/%{-n*}.conf}							\
+ 	%endif															\
++	%if %{with smp}													\
++		install ${MODULE}-smp.ko									\\\
++			%{KernelD}smp/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko			\
++		%{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"					\\\
++			>> %{ModprobeD}smp/%{-n*}.conf}							\
++	%endif															\
++	%endif															\
+ done																\
+ %{nil}
+ 
================================================================