Author: glen Date: Fri Apr 11 09:16:42 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- naorch separation merge from vanilla kernel
- drop netfilter provides
- kabi stuff from kernel-vanilla
---- Files affected:
SPECS:
kernel-desktop.spec (1.184 -> 1.185)
---- Diffs:
================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.184 SPECS/kernel-desktop.spec:1.185
--- SPECS/kernel-desktop.spec:1.184 Thu Apr 10 22:18:06 2008
+++ SPECS/kernel-desktop.spec Fri Apr 11 11:16:37 2008
@@ -15,6 +15,8 @@
#
# Conditional build:
%bcond_without source # don't build kernel-source package
+%bcond_with noarch # build noarch packages
+%bcond_with verbose # verbose build (V=1)
%bcond_with preemptrt # use realtime-preempt patch
%bcond_without tuxonice # support for tuxonice (ex-suspend2)
%bcond_with fcache # Jens Axboe's fcache patch (ext3 only)
@@ -28,7 +30,6 @@
%bcond_without imq # imq
%bcond_without wrr # wrr support
%bcond_with laptop # build with HZ=100
-%bcond_with verbose # verbose build (V=1)
%bcond_with pae # build PAE (HIGHMEM64G)
support on uniprocessor
%{?debug:%define with_verbose 1}
@@ -43,6 +44,10 @@
%undefine with_pae
%endif
+%if "%{_arch}" == "noarch"
+%define with_noarch 1
+%endif
+
%ifarch %{ix86} ppc
%define have_isa 1
%else
@@ -55,6 +60,16 @@
%define alt_kernel desktop%{?with_preemptrt:_rt}
%endif
+# Our Kernel ABI, increase this when you want out of source modules being
rebuilt
+%define KABI 1
+
+# kernel release (used in filesystem and eventually in uname -r)
+# modules will be looked from /lib/modules/%{kernel_release}
+# _localversion is just that without version for "> localversion"
+%define _localversion %{KABI}
+%define kernel_release %{version}_%{alt_kernel}-%{_localversion}
+%define _kernelsrcdir /usr/src/linux-%{version}_%{alt_kernel}
+
%define _basever 2.6.24
%define _postver .4
%define _rel 0.1
@@ -83,9 +98,8 @@
Source3: kernel-config.py
Source4: kernel-config-update.py
Source5: kernel-multiarch.make
-Source6: %{pname}-autoconf.h
-Source7: %{pname}-config.h
-Source8: %{pname}-module-build.pl
+Source6: %{pname}-config.h
+Source7: %{pname}-module-build.pl
Source9: %{pname}-common.config
Source10: %{pname}-preempt-rt.config
@@ -252,8 +266,7 @@
Requires: module-init-tools >= 0.9.9
%{?with_bootsplash:Suggests: bootsplash}
%{?with_fbsplash:Suggests: splashutils}
-Provides: %{name}(netfilter) = %{netfilter_snap}
-Provides: kernel(netfilter) = %{netfilter_snap}
+Provides: %{name}(vermagic) = %{kernel_release}
Conflicts: e2fsprogs < 1.29
Conflicts: isdn4k-utils < 3.1pre1
Conflicts: jfsutils < 1.1.3
@@ -270,7 +283,8 @@
Conflicts: udev < 1:071
Conflicts: util-linux < 2.10o
Conflicts: xfsprogs < 2.6.0
-ExclusiveArch: %{ix86} %{x8664} ppc
+%{?with_noarch:BuildArch: noarch}
+ExclusiveArch: %{ix86} %{x8664} ppc noarch
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -290,13 +304,6 @@
%define srcdir %{topdir}/linux-%{_basever}
%define objdir %{topdir}/o
-# kernel release (used in filesystem and eventually in uname -r)
-# modules will be looked from /lib/modules/%{kernel_release}
-# _localversion is just that without version for "> localversion"
-%define _localversion %{release}
-%define kernel_release %{version}_%{alt_kernel}-%{_localversion}
-%define _kernelsrcdir /usr/src/linux-%{version}_%{alt_kernel}
-
%define CommonOpts HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall
-Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
%if "%{_target_base_arch}" != "%{_arch}"
%define MakeOpts %{CommonOpts} ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -438,12 +445,21 @@
%description sound-oss -l pl.UTF-8
Sterowniki dźwięku OSS (Open Sound System).
+%package config
+Summary: Kernel config and module symvers
+Group: Development/Building
+Autoreqprov: no
+Conflicts: rpmbuild(macros) < 1.433
+
+%description config
+Kernel config and module symvers.
+
%package headers
Summary: Header files for the Linux kernel
Summary(de.UTF-8): Header Dateien für den Linux-Kernel
Summary(pl.UTF-8): Pliki nagłówkowe jądra Linuksa
Group: Development/Building
-Provides: %{name}-headers(netfilter) = %{netfilter_snap}
+Requires: %{name}-config = %{epoch}:%{version}-%{release}
Autoreqprov: no
%description headers
@@ -543,9 +559,6 @@
%{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
%endif
-# Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}_%{alt_kernel}#g' Makefile
-
%if %{with tuxonice}
%patch1 -p1
%endif
@@ -696,9 +709,13 @@
%patch105 -p1
#%patch106 -p1 # FIND UPDATE
+# Fix EXTRAVERSION in main Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}_%{alt_kernel}#g' Makefile
+
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 |
xargs -0 -r -l512 rm -f
+%if %{without noarch}
%build
cat > multiarch.make <<'EOF'
# generated by %{name}.spec
@@ -840,6 +857,7 @@
# build kernel
%{__make} all
+%endif # arch build
%install
rm -rf $RPM_BUILD_ROOT
@@ -847,6 +865,7 @@
install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
touch
$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/{utsrelease,version,autoconf-dist}.h
+%if %{without noarch}
%{__make} %{MakeOpts} %{!?with_verbose:-s} modules_install \
-C %{objdir} \
%{?with_verbose:V=1} \
@@ -897,7 +916,9 @@
cp -aL %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
cp -a %{objdir}/include/linux/autoconf.h
$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
cp -a %{objdir}/include/linux/{utsrelease,version}.h
$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
+%endif # arch dependant
+%if %{with noarch}
# test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
if cp -al %{srcdir}/COPYING $RPM_BUILD_ROOT/COPYING 2>/dev/null; then
l=l
@@ -906,8 +927,8 @@
cp -a$l %{srcdir}/* $RPM_BUILD_ROOT%{_kernelsrcdir}
install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
-cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf.h
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
+%endif # arch independant
# collect module-build files and directories
# Usage: kernel-module-build.pl $rpmdir $fileoutdir
@@ -1008,6 +1029,7 @@
rm -f /lib/modules/%{kernel_release}/{build,source}
fi
+%if %{without noarch}
%files
%defattr(644,root,root,755)
/boot/vmlinuz-%{kernel_release}
@@ -1043,7 +1065,7 @@
%ghost /lib/modules/%{kernel_release}/source
%dir %{_sysconfdir}/modprobe.d/%{kernel_release}
-%ifarch alpha %{ix86} %{x8664} sparc sparc64
+%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
%files vmlinux
%defattr(644,root,root,755)
/boot/vmlinux-%{kernel_release}
@@ -1081,12 +1103,26 @@
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}/kernel/sound/oss
-%files headers
+%files config
%defattr(644,root,root,755)
%dir %{_kernelsrcdir}
-%{_kernelsrcdir}/include
%{_kernelsrcdir}/config-dist
%{_kernelsrcdir}/Module.symvers-dist
+%dir %{_kernelsrcdir}/include
+%dir %{_kernelsrcdir}/include/linux
+%{_kernelsrcdir}/include/linux/autoconf-dist.h
+%{_kernelsrcdir}/include/linux/utsrelease.h
+%{_kernelsrcdir}/include/linux/version.h
+%endif # noarch package
+
+%if %{with noarch}
+%files headers
+%defattr(644,root,root,755)
+%{_kernelsrcdir}/include/*
+%exclude %dir %{_kernelsrcdir}/include/linux
+%exclude %{_kernelsrcdir}/include/linux/autoconf-dist.h
+%exclude %{_kernelsrcdir}/include/linux/utsrelease.h
+%exclude %{_kernelsrcdir}/include/linux/version.h
%files module-build -f aux_files
%defattr(644,root,root,755)
@@ -1148,6 +1184,7 @@
%{_kernelsrcdir}/README
%{_kernelsrcdir}/REPORTING-BUGS
%endif
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -1155,6 +1192,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.185 2008-04-11 09:16:37 glen
+- naorch separation merge from vanilla kernel
+- drop netfilter provides
+- kabi stuff from kernel-vanilla
+
Revision 1.184 2008-04-10 20:18:06 glen
- -mcpu=440 patch, fix reiser4 bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.184&r2=1.185&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
