Author: glen Date: Tue Feb 12 01:09:34 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- arch vs noarch packaging
---- Files affected:
SPECS:
kernel-vanilla.spec (1.124 -> 1.125)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.124 SPECS/kernel-vanilla.spec:1.125
--- SPECS/kernel-vanilla.spec:1.124 Tue Feb 12 01:49:49 2008
+++ SPECS/kernel-vanilla.spec Tue Feb 12 02:09:29 2008
@@ -35,7 +35,7 @@
%define _basever 2.6.24
%define _postver .2
-%define _rel 0.3
+%define _rel 0.4
# for rc kernels basever is the version patch (source1) should be applied to
#%define _ver 2.6.20
@@ -97,12 +97,8 @@
Conflicts: util-linux < 2.10o
Conflicts: xfsprogs < 2.6.0
ExclusiveOS: Linux
-%if %{with noarch}
-BuildArch: noarch
-ExclusiveArch: noarch
-%else
-ExclusiveArch: %{ix86} %{x8664} ppc alpha sparc
-%endif
+ExclusiveArch: %{ix86} %{x8664} ppc alpha sparc noarch
+%{?with_noarch:BuildArch: noarch}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch %{ix86} %{x8664}
@@ -470,13 +466,13 @@
# build kernel
%{__make} all
-%endif # noarch
+%endif # arch build
%install
rm -rf $RPM_BUILD_ROOT
-# needed for arch and noarch builds (exclude list)
+# touch for noarch build (exclude list)
install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-cp -a %{objdir}/include/linux/autoconf.h
$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
+touch $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
%if %{without noarch}
%{__make} %{MakeOpts} %{!?with_verbose:-s} modules_install \
@@ -487,8 +483,8 @@
KERNELRELEASE=%{kernel_release}
mkdir $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/misc
-rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
-rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/source
+rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{build,source}
+touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{build,source}
# /boot
install -d $RPM_BUILD_ROOT/boot
@@ -527,6 +523,7 @@
# maybe package these to -module-build, then -headers could be noarch
cp -a %{objdir}/Module.symvers
$RPM_BUILD_ROOT%{_kernelsrcdir}/Module.symvers-dist
cp -a %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
+cp -a %{objdir}/include/linux/autoconf.h
$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
%endif # arch dependant
%if %{with noarch}
@@ -538,7 +535,6 @@
cp -a$l %{srcdir}/* $RPM_BUILD_ROOT%{_kernelsrcdir}
install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}
-touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{build,source}
cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
%endif # arch independant
@@ -811,6 +807,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.125 2008-02-12 01:09:29 glen
+- arch vs noarch packaging
+
Revision 1.124 2008-02-12 00:49:49 glen
- keep same name for src.rpm, i wonder if it will work with builders
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.124&r2=1.125&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
