Author: zbyniu Date: Fri Sep 29 08:34:09 2006 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- rpm macros need utsrelease.h for external modules; rel 2
---- Files affected:
SPECS:
kernel.spec (1.441.2.1635 -> 1.441.2.1636)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1635 SPECS/kernel.spec:1.441.2.1636
--- SPECS/kernel.spec:1.441.2.1635 Thu Sep 28 17:56:46 2006
+++ SPECS/kernel.spec Fri Sep 29 10:34:03 2006
@@ -99,7 +99,7 @@
%define _udev_ver 071
%define _mkvmlinuz_ver 1.3
-%define _rel 1
+%define _rel 2
%define _old_netfilter_snap 20060504
%define _netfilter_snap 20060829
@@ -725,6 +725,7 @@
Summary: Development files for building kernel modules
Summary(pl): Pliki służące do budowania modułów jądra
Group: Development/Building
+Conflicts: rpmbuild(macros) < 1.321
Requires: %{name}-headers = %{epoch}:%{version}-%{release}
Provides: kernel-module-build = %{epoch}:%{version}-%{release}
Autoreqprov: no
@@ -1184,6 +1185,8 @@
KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP"
rm -rf $KERNEL_INSTALL_DIR
BuildConfig
+%{__make} $CrossOpts include/linux/utsrelease.h
+cp include/linux/utsrelease.h{,.save}
%if %{with up}
BuildKernel
PreInstallKernel
@@ -1264,6 +1267,7 @@
%endif
%{__make} $CrossOpts mrproper
+mv -f include/linux/utsrelease.h.save
$RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/utsrelease.h
%{__make} $CrossOpts include/linux/version.h
install %{SOURCE3}
$RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/autoconf.h
install %{SOURCE4}
$RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/config.h
@@ -1741,6 +1745,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1636 2006/09/29 08:34:03 zbyniu
+- rpm macros need utsrelease.h for external modules; rel 2
+
Revision 1.441.2.1635 2006/09/28 15:56:46 zbyniu
- grsec_minimal re-enabled
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1635&r2=1.441.2.1636&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
