From ef0ffa763acf4034979f1a80216f7efd817a1661 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 Feb 2012 16:55:01 +0000 Subject: [PATCH] - started work on 3.2.x --- kernel-vanilla.spec | 95 ++++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 9538b78..0260186 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -1,4 +1,4 @@ -# $Revision: 1.43.2.11.2.121 $, $Date: 2010/10/04 15:47:07 $ +# $Revision: 1.43.2.11.2.126 $, $Date: 2011/05/25 08:26:08 $ # # Conditional build: %bcond_without source # don't build kernel-vanilla-source package @@ -13,9 +13,9 @@ %define have_sound 1 %define have_isa 1 -%define _basever 2.6.32 -%define _postver .25 -%define _rel 1 +%define _basever 3.2 +%define _postver .4 +%define _rel 0.1 %define _enable_debug_packages 0 @@ -38,11 +38,11 @@ Release: %{_rel} Epoch: 3 License: GPL v2 Group: Base/Kernel -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2 -# Source0-md5: 260551284ac224c3a43c4adac7df4879 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.bz2 +# Source0-md5: 7ceb61f87c097fc17509844b71268935 %if "%{_postver}" != "%{nil}" -Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2 -# Source1-md5: e3346e3b4b92f048b8ecded829f45cdf +Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 +# Source1-md5: 02adf3e0450969dec6219ca52ff2a68a %endif Source2: kernel-vanilla-autoconf.h @@ -52,6 +52,8 @@ Source4: kernel-vanilla-module-build.pl Source10: kernel-vanilla-x86.config Source11: kernel-vanilla-x86_64.config +Patch0: kernel-vanilla-small_fixes.patch + URL: http://www.kernel.org/ BuildRequires: binutils >= 3:2.18 BuildRequires: /sbin/depmod @@ -364,12 +366,11 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu %{__bzip2} -dc %{SOURCE1} | patch -p1 -s %endif +%patch0 -p1 + # Fix EXTRAVERSION in main Makefile sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile -# on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build -sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig - # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f @@ -485,19 +486,19 @@ KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel" rm -rf $KERNEL_INSTALL_DIR BuildConfig ln -sf %{defconfig} .config +BuildKernel +install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux -rm -f include/linux/autoconf.h -%{__make} %CrossOpts include/linux/autoconf.h -install include/linux/autoconf.h \ - $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-dist.h +install include/generated/autoconf.h \ + $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated/autoconf-dist.h +install include/generated/utsrelease.h \ + $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated/ +install include/linux/version.h \ + $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/ install .config \ $KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-dist -BuildKernel PreInstallKernel -%{__make} %CrossOpts include/linux/utsrelease.h -cp include/linux/utsrelease.h{,.save} -cp include/linux/version.h{,.save} cp scripts/mkcompile_h{,.save} %install @@ -532,23 +533,21 @@ cd $RPM_BUILD_ROOT%{_kernelsrcdir} %{__make} %CrossOpts mrproper archclean \ RCS_FIND_IGNORE='-name build-done -prune -o' -if [ -e $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/autoconf-dist.h ]; then - install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/autoconf-dist.h \ - $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux - install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/config-dist \ - $RPM_BUILD_ROOT%{_kernelsrcdir} -fi - cp -Rdp$l $KERNEL_BUILD_DIR/include/linux/* \ $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux %{__make} %CrossOpts mrproper -mv -f include/linux/utsrelease.h.save $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/utsrelease.h -cp include/linux/version.h{.save,} -cp scripts/mkcompile_h{.save,} -rm -rf include/linux/version.h.save -rm -rf scripts/mkcompile_h.save -install %{SOURCE2} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf.h +install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated +install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/version.h \ + $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/generated/autoconf-dist.h \ + $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/generated/utsrelease.h \ + $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/config-dist \ + $RPM_BUILD_ROOT%{_kernelsrcdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated/autoconf.h install %{SOURCE3} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h # collect module-build files and directories @@ -658,19 +657,22 @@ fi /lib/modules/%{kernel_release}/kernel/arch /lib/modules/%{kernel_release}/kernel/crypto /lib/modules/%{kernel_release}/kernel/drivers + %if %{have_drm} %exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu/drm %endif -/lib/modules/%{kernel_release}/kernel/fs +/lib/modules/%{kernel_release}/kernel/fs # this directory will be removed after disabling rcutorture mod. in 2.6.20. /lib/modules/%{kernel_release}/kernel/kernel - /lib/modules/%{kernel_release}/kernel/lib + %ifarch %{x8664} /lib/modules/%{kernel_release}/kernel/mm %endif + /lib/modules/%{kernel_release}/kernel/net + %if %{have_sound} %dir /lib/modules/%{kernel_release}/kernel/sound /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko* @@ -679,7 +681,9 @@ fi %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko* %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko* %endif + %dir /lib/modules/%{kernel_release}/misc + %if %{with pcmcia} %dir /lib/modules/%{kernel_release}/kernel/drivers/pcmcia /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko* @@ -697,9 +701,11 @@ fi %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko* %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/libertas/*_cs.ko* %exclude /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko* -%exclude /lib/modules/%{kernel_release}/kernel/drivers/serial/serial_cs.ko* %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko* %endif + +/lib/modules/%{kernel_release}/kernel/security + %ghost /lib/modules/%{kernel_release}/modules.* # symlinks pointing to kernelsrcdir %ghost /lib/modules/%{kernel_release}/build @@ -732,7 +738,6 @@ fi /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko* /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/libertas/*_cs.ko* /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko* -/lib/modules/%{kernel_release}/kernel/drivers/serial/serial_cs.ko* /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko* %endif @@ -798,8 +803,11 @@ fi %dir %{_kernelsrcdir}/scripts/selinux %{_kernelsrcdir}/scripts/selinux/Makefile %dir %{_kernelsrcdir}/scripts/selinux/mdp +%dir %{_kernelsrcdir}/scripts/selinux/genheaders %{_kernelsrcdir}/scripts/selinux/mdp/Makefile %{_kernelsrcdir}/scripts/selinux/mdp/*.c +%{_kernelsrcdir}/scripts/selinux/genheaders/Makefile +%{_kernelsrcdir}/scripts/selinux/genheaders/*.c %files doc %defattr(644,root,root,755) @@ -860,6 +868,21 @@ fi All persons listed below can be reached at @pld-linux.org $Log: kernel-vanilla.spec,v $ +Revision 1.43.2.11.2.126 2011/05/25 08:26:08 dzeus +- up to 2.6.38.7 + +Revision 1.43.2.11.2.125 2011/05/20 08:28:21 hawk +- updated to 2.6.38.6 + +Revision 1.43.2.11.2.124 2011/04/29 20:53:02 hawk +- fixed %files + +Revision 1.43.2.11.2.123 2011/04/29 09:09:23 hawk +- updated to 2.6.38.4 + +Revision 1.43.2.11.2.122 2011/04/28 18:18:51 hawk +- updated to 2.6.36.4 + Revision 1.43.2.11.2.121 2010/10/04 15:47:07 hawk - updated to 2.6.32.24 -- 2.46.0