- merge branch 'master' into LINUX_3_2

Conflicts:
	kernel-vanilla.spec

diff --git a/kernel-vanilla-x86.config b/kernel-vanilla-x86.config
index 9add242514659a89df42ba230a647d6386a6eb4a..5a80435e00d2810ddcff8afd0194d32fe050de2a 100644 (file)
--- a/kernel-vanilla-x86.config
+++ b/kernel-vanilla-x86.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.4-vanilla Kernel Configuration
+# Linux/i386 3.2.43-vanilla Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -294,10 +294,10 @@ CONFIG_NO_BOOTMEM=y
 CONFIG_MEMTEST=y
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
-CONFIG_M586=y
+# CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
+CONFIG_M686=y
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
@@ -318,22 +318,24 @@ CONFIG_M586=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
 CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_F00F_BUG=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
-CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_AMD=y
@@ -379,24 +381,16 @@ CONFIG_HIGHMEM=y
 CONFIG_X86_PAE=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_NUMA=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_HAVE_ARCH_BOOTMEM=y
-CONFIG_HAVE_ARCH_ALLOC_REMAP=y
 CONFIG_NEED_NODE_MEMMAP_SIZE=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 # CONFIG_ARCH_MEMORY_PROBE is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK=y
@@ -448,7 +442,6 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 
 #
 # Power management and ACPI options
@@ -480,7 +473,6 @@ CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -3234,6 +3226,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
@@ -4921,7 +4914,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -5036,7 +5028,6 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_USB_FUSB300 is not set
 CONFIG_USB_R8A66597=m
 CONFIG_USB_GADGET_DWC3=m
 CONFIG_USB_M66592=m
@@ -5046,7 +5037,6 @@ CONFIG_USB_NET2272=m
 CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_NET2280=m
 CONFIG_USB_GOKU=m
-# CONFIG_USB_LANGWELL is not set
 CONFIG_USB_EG20T=m
 CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_GADGET_DUALSPEED=y
@@ -5434,6 +5424,8 @@ CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS_PSTORE=y
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5855,7 +5847,7 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_DEBUG_RODATA is not set
-CONFIG_DEBUG_SET_MODULE_RONX=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_STRESS is not set

diff --git a/kernel-vanilla-x86_64.config b/kernel-vanilla-x86_64.config
index 63f0368106b956e4c4c1d88ab43489c4f140f644..25df488fc02c09f87c34324f36277d31d4bb02b7 100644 (file)
--- a/kernel-vanilla-x86_64.config
+++ b/kernel-vanilla-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.4-vanilla Kernel Configuration
+# Linux/x86_64 3.2.43-vanilla Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -359,6 +359,7 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -3017,6 +3018,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
@@ -4623,7 +4625,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -5134,6 +5135,8 @@ CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS_PSTORE=y
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5555,7 +5558,7 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_DEBUG_RODATA is not set
-CONFIG_DEBUG_SET_MODULE_RONX=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index ead928eed132caa251e3b4f83608a3202c4c14a4..102d008c58ad47ba16d8db4dc7f361e69f8d7a76 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -5,7 +5,7 @@
 %{?debug:%define with_verbose 1}
 
 %define                _basever                3.2
-%define                _postver                .21
+%define                _postver                .43
 %define                _rel                    1
 
 %define                _enable_debug_packages                  0
@@ -29,16 +29,17 @@ Release:    %{_rel}
 Epoch:         3
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.bz2
-# Source0-md5: 7ceb61f87c097fc17509844b71268935
+Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.xz
+# Source0-md5: 364066fa18767ec0ae5f4e4abcf9dc51
 %if "%{_postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5: d198f4f761d799c712dc872ddef4860a
+# Source1-md5: c7fb90a2d200f0baf281c54884415e79
 %endif
 
 Source2:       kernel-vanilla-autoconf.h
 Source3:       kernel-vanilla-config.h
 Source4:       kernel-vanilla-module-build.pl
+Source5:       kernel.sysconfig
 
 Source10:      kernel-vanilla-x86.config
 Source11:      kernel-vanilla-x86_64.config
@@ -56,11 +57,11 @@ BuildRequires:      rpm-build >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.217
 Autoreqprov:   no
 Requires(post):        coreutils
-Requires(post):        geninitrd >= 10000-3
+Requires(post):        geninitrd >= 12639-1
 Requires(post):        virtual(module-tools)
 Requires:      /sbin/depmod
 Requires:      coreutils
-Requires:      geninitrd >= 10000-3
+Requires:      geninitrd >= 12639-1
 Requires:      virtual(module-tools)
 Obsoletes:     kernel%{_alt_kernel}-firmware
 Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN
@@ -86,17 +87,17 @@ Conflicts:  reiserfsprogs < 3.6.3
 Conflicts:     udev < 1:071
 Conflicts:     util-linux < 2.10o
 Conflicts:     xfsprogs < 2.6.0
-ExclusiveArch: i586 i686 x86_64
+ExclusiveArch: i686 x86_64
 ExclusiveOS:   Linux
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch i586 i686 x86_64
+%ifarch i686 x86_64
 %define                target_arch_dir         x86
 %else
 %define                target_arch_dir         %{_target_base_arch}
 %endif
 
-%ifarch i586 i686
+%ifarch i686
 %define                kernel_config           x86
 %else
 %define                kernel_config           %{_target_base_arch}
@@ -113,7 +114,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _kernelsrcdir   /usr/src/linux-%{version}-%{alt_kernel}
 
 %if "%{_target_base_arch}" != "%{_arch}"
-       %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
+       %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-tld-linux-
        %define DepMod /bin/true
 
        %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
@@ -350,24 +351,6 @@ sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = -%{alt_kernel}#g' Makefile
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
-TuneUpConfigForIX86 () {
-       set -x
-%ifarch i586 i686
-       %ifarch i586
-       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
-       echo "# CONFIG_OLPC is not set" >> $1
-       echo "CONFIG_CRYPTO_DEV_HIFN_795X=m" >> $1
-       echo "# CONFIG_CRYPTO_DEV_HIFN_795X_RNG is not set" >> $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
-       return 0
-%endif
-}
-
 BuildConfig() {
        %{?debug:set -x}
        # is this a special kernel we want to build?
@@ -375,7 +358,6 @@ BuildConfig() {
        KernelVer=%{kernel_release}
        echo "Building config file using $Config.conf..."
        cat $RPM_SOURCE_DIR/kernel-vanilla-$Config.config > %{defconfig}
-       TuneUpConfigForIX86 %{defconfig}
 
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" %{defconfig}}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" %{defconfig}}
@@ -505,7 +487,8 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
 perl %{SOURCE4} %{_kernelsrcdir} $KERNEL_BUILD_DIR
 
 # ghosted initrd
-touch $RPM_BUILD_ROOT%{initrd_dir}/initrd-%{kernel_release}.gz
+touch $RPM_BUILD_ROOT%{initrd_dir}/initrd-%{kernel_release}.img
+touch $RPM_BUILD_ROOT%{initrd_dir}/initramfs-%{kernel_release}.img
 
 # rpm obeys filelinkto checks for ghosted symlinks, convert to files
 rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{build,source}
@@ -514,6 +497,9 @@ touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{build,source}
 # remove unnecessary dir with dead symlink
 rm -rf $RPM_BUILD_ROOT/arch/i386
 
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/kernel
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -523,35 +509,34 @@ if [ -x /sbin/new-kernel-pkg ]; then
 fi
 
 %post
-mv -f /boot/vmlinuz-%{alt_kernel} /boot/vmlinuz-%{alt_kernel}.old 2> /dev/null > /dev/null
-ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz-%{alt_kernel}
-mv -f /boot/System.map-%{alt_kernel} /boot/System.map-%{alt_kernel}.old 2> /dev/null > /dev/null
-ln -sf System.map-%{kernel_release} /boot/System.map-%{alt_kernel}
-
 %depmod %{kernel_release}
 
-/sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
-mv -f %{initrd_dir}/initrd-%{alt_kernel} %{initrd_dir}/initrd-%{alt_kernel}.old 2> /dev/null > /dev/null
-ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [[ "$USE_GENINITRD" != [Nn][Oo] ]]; then
+       # generate initrd after all dependant modules are installed
+       /sbin/geninitrd -f %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release}
+fi
 
-if [ -x /sbin/new-kernel-pkg ]; then
-       if [ -f /etc/pld-release ]; then
-               title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
-       else
-               title='PLD Linux'
+# if dracut is present then generate full-featured initramfs
+if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
+       /sbin/dracut --force --quiet /boot/initramfs-%{kernel_release}.img %{kernel_release}
+fi
+
+# update boot loaders when old package files are gone from filesystem
+if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
+       if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-no})" = "yes" ]; then
+               /sbin/update-grub >/dev/null
        fi
+fi
 
-       title="$title %{alt_kernel}"
+if [ -x /sbin/new-kernel-pkg ]; then
+       /sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.img --install %{kernel_release} --banner "TLD Linux %{alt_kernel}"
+fi
 
-       /sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install %{kernel_release} --banner "$title"
-elif [ -x /sbin/rc-boot ]; then
+if [ -x /sbin/rc-boot ]; then
        /sbin/rc-boot 1>&2 || :
 fi
 
-%post vmlinux
-mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2> /dev/null > /dev/null
-ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
-
 %post drm
 %depmod %{kernel_release}
 
@@ -599,9 +584,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kernel
 /boot/vmlinuz-%{kernel_release}
 /boot/System.map-%{kernel_release}
-%ghost %{initrd_dir}/initrd-%{kernel_release}.gz
+%ghost %{initrd_dir}/initrd-%{kernel_release}.img
+%ghost %{initrd_dir}/initramfs-%{kernel_release}.img
 /lib/firmware/%{kernel_release}
 %dir /lib/modules/%{kernel_release}
 %dir /lib/modules/%{kernel_release}/kernel
@@ -612,14 +599,9 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
 
 /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 x86_64
-/lib/modules/%{kernel_release}/kernel/mm
-%endif
-
 /lib/modules/%{kernel_release}/kernel/net
 
 %dir /lib/modules/%{kernel_release}/kernel/sound

diff --git a/kernel.sysconfig b/kernel.sysconfig
new file mode 100644 (file)
index 0000000..fc89d67
--- /dev/null
+++ b/kernel.sysconfig
@@ -0,0 +1,9 @@
+# Configuration for TLD kernel packages
+
+# Create /boot/initrd-<kernel version>.img initial ramdisk using geninitrd?
+# Set to "no" if you don't want it.
+#USE_GENINITRD=
+
+# Create /boot/initramfs-<kernel version>.img initial ramfs using dracut?
+# Set to "no" if you don't want it.
+#USE_DRACUT=