X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=c213e758447f9897d4095897d7cd52e81ebe840d;hb=refs%2Fheads%2FLINUX_2_6_32;hp=9875ffdfa02745f1a21b623cd0b142f0444744db;hpb=3683534da98af141b06e90066db632e41eeacc7f;p=packages%2Fkernel.git diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 9875ffd..c213e75 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -1,23 +1,16 @@ # Conditional build: %bcond_without source # don't build kernel-vanilla-source package -%bcond_without pcmcia # don't build pcmcia %bcond_with verbose # verbose build (V=1) -%bcond_with pae # build PAE (HIGHMEM64G) support on uniprocessor %{?debug:%define with_verbose 1} -%define have_drm 1 -%define have_oss 1 -%define have_sound 1 -%define have_isa 1 - %define _basever 2.6.32 -%define _postver .56 -%define _rel 0.1 +%define _postver .59 +%define _rel 2 %define _enable_debug_packages 0 -%define alt_kernel vanilla%{?with_pae:-pae} +%define alt_kernel vanilla # kernel release (used in filesystem and eventually in uname -r) # modules will be looked from /lib/modules/%{kernel_release} @@ -40,7 +33,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2 # Source0-md5: 260551284ac224c3a43c4adac7df4879 %if "%{_postver}" != "%{nil}" Source1: http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/patch-%{version}.bz2 -# Source1-md5: 53394bf7139e25ca328f7894ad21d1ad +# Source1-md5: 66391ee9becfb0152baaf4fdae1430f4 %endif Source2: kernel-vanilla-autoconf.h @@ -62,11 +55,11 @@ BuildRequires: rpmbuild(macros) >= 1.217 Autoreqprov: no Requires(post): coreutils Requires(post): geninitrd >= 2.57 -Requires(post): module-init-tools >= 0.9.9 +Requires(post): virtual(module-tools) Requires: /sbin/depmod Requires: coreutils Requires: geninitrd >= 2.57 -Requires: module-init-tools >= 0.9.9 +Requires: virtual(module-tools) Obsoletes: kernel%{_alt_kernel}-firmware Obsoletes: kernel%{_alt_kernel}-isdn-mISDN Obsoletes: kernel-misc-acer_acpi @@ -81,7 +74,7 @@ Obsoletes: kernel-smp Conflicts: e2fsprogs < 1.29 Conflicts: isdn4k-utils < 3.1pre1 Conflicts: jfsutils < 1.1.3 -Conflicts: module-init-tools < 0.9.10 +Conflicts: module-init-tools < 3.16 Conflicts: nfs-utils < 1.0.5 Conflicts: oprofile < 0.9 Conflicts: ppp < 1:2.4.0 @@ -91,23 +84,17 @@ Conflicts: reiserfsprogs < 3.6.3 Conflicts: udev < 1:071 Conflicts: util-linux < 2.10o Conflicts: xfsprogs < 2.6.0 -%if %{with pae} -ExclusiveArch: %{ix86} -ExcludeArch: i386 i486 i586 -%else -ExclusiveArch: %{ix86} %{x8664} -%endif +ExclusiveArch: i586 i686 x86_64 ExclusiveOS: Linux BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%ifarch %{ix86} %{x8664} +%ifarch i586 i686 x86_64 %define target_arch_dir x86 -%endif -%ifnarch %{ix86} %{x8664} +%else %define target_arch_dir %{_target_base_arch} %endif -%ifarch %{ix86} +%ifarch i586 i686 %define kernel_config x86 %else %define kernel_config %{_target_base_arch} @@ -365,49 +352,21 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu # 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 %build TuneUpConfigForIX86 () { set -x -%ifarch %{ix86} - pae= - [ "$2" = "yes" ] && pae=yes - %if %{with pae} - pae=yes - %endif - %ifnarch i386 - sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1 - %endif - %ifarch i486 - sed -i 's:# CONFIG_M486 is not set:CONFIG_M486=y:' $1 - %endif +%ifarch i586 i686 %ifarch i586 - sed -i 's:# CONFIG_M586 is not set:CONFIG_M586=y:' $1 - %endif - %ifarch i686 + sed -i "s:# CONFIG_HIGHMEM4G is not set:CONFIG_HIGHMEM4G=y:" $1 + sed -i "s:CONFIG_HIGHMEM64G=y:# CONFIG_HIGHMEM64G is not set:" $1 + sed -i ":CONFIG_X86_PAE=y:d" $1 + %else + sed -i 's:CONFIG_M586=y# CONFIG_M586 is not set::' $1 sed -i 's:# CONFIG_M686 is not set:CONFIG_M686=y:' $1 %endif - %ifarch pentium3 - sed -i 's:# CONFIG_MPENTIUMIII is not set:CONFIG_MPENTIUMIII=y:' $1 - %endif - %ifarch pentium4 - sed -i 's:# CONFIG_MPENTIUM4 is not set:CONFIG_MPENTIUM4=y:' $1 - %endif - %ifarch athlon - sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1 - %endif - %ifarch i686 athlon pentium3 pentium4 - if [ "$pae" = "yes" ]; then - sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1 - sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1 - fi - sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:' $1 - %endif return 0 %endif } @@ -452,10 +411,8 @@ PreInstallKernel() { mkdir -p $KERNEL_INSTALL_DIR/boot install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer -%ifarch %{ix86} %{x8664} install arch/x86/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer -%endif %{__make} %CrossOpts modules_install firmware_install \ %{?with_verbose:V=1} \ @@ -656,29 +613,24 @@ 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 # 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} +%ifarch x86_64 /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* /lib/modules/%{kernel_release}/kernel/sound/sound*.ko* %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/cx88/cx88-alsa.ko* %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* %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/[!p]* @@ -697,7 +649,6 @@ fi %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 %ghost /lib/modules/%{kernel_release}/modules.* # symlinks pointing to kernelsrcdir %ghost /lib/modules/%{kernel_release}/build @@ -708,13 +659,10 @@ fi %defattr(644,root,root,755) /boot/vmlinux-%{kernel_release} -%if %{have_drm} %files drm %defattr(644,root,root,755) /lib/modules/%{kernel_release}/kernel/drivers/gpu/drm -%endif -%if %{with pcmcia} %files pcmcia %defattr(644,root,root,755) %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko* @@ -732,29 +680,22 @@ fi /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 -%if %{have_sound} %files sound-alsa %defattr(644,root,root,755) /lib/modules/%{kernel_release}/kernel/sound %exclude %dir /lib/modules/%{kernel_release}/kernel/sound %exclude /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko* %exclude /lib/modules/%{kernel_release}/kernel/sound/sound*.ko* -%if %{have_oss} %exclude /lib/modules/%{kernel_release}/kernel/sound/oss -%endif /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/video/cx88/cx88-alsa.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko* -%if %{have_oss} %files sound-oss %defattr(644,root,root,755) /lib/modules/%{kernel_release}/kernel/sound/oss -%endif -%endif %files headers %defattr(644,root,root,755)