29 files changed, 77 insertions, 48 deletions
diff --git a/README.BRANCH b/README.BRANCH
index db20d7b..82629bc 100644
--- a/README.BRANCH
+++ b/README.BRANCH
@@ -1,11 +1,7 @@
-This is the HEAD kernel branch.  It will eventually turn into the
-openSUSE 11.2 kernel branch, but for now it is tracking the upstream
-kernel.org releases.
-
-Use this branch at your own risk at this point in time.
+This is the SLE 11 SP1 kernel branch.
 
 The person in charge of this branch is:
-	Jeff Mahoney <jeffm@suse.com>
+	Jiri Kosina <jkosina@suse.cz>
 
 It is the above person's responsiblity for checking in this kernel to
 the build system, anyone else who wishes to do so, needs to get
diff --git a/config.conf b/config.conf
index 25073c7..3406c17 100644
--- a/config.conf
+++ b/config.conf
@@ -9,9 +9,9 @@
 #
 
 +i386		i386/default
-+i386		i386/desktop
++i386 -syms	i386/desktop
 +i386		i386/pae
-+i386 -syms	i386/vmi
++i386		i386/vmi
 +i386 -syms	i386/debug
 +i386		i386/xen
 +i386 -syms	i386/ec2
@@ -24,7 +24,7 @@
 +ia64 -syms	ia64/trace
 
 +x86_64		x86_64/default
-+x86_64		x86_64/desktop
++x86_64	-syms	x86_64/desktop
 +x86_64		x86_64/xen
 +x86_64	-syms	x86_64/ec2
 +x86_64	-syms	x86_64/debug
diff --git a/config/i386/debug b/config/i386/debug
index 95293be..67dc07d 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -53,7 +53,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/i386/default b/config/i386/default
index d21521f..400b613 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -54,7 +54,7 @@ CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/i386/desktop b/config/i386/desktop
index fd27238..e8f3711 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -54,7 +54,7 @@ CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 CONFIG_KERNEL_DESKTOP=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/i386/pae b/config/i386/pae
index ddb029c..347f041 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -54,7 +54,7 @@ CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/i386/trace b/config/i386/trace
index 8b07b58..0bb858f 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -54,7 +54,7 @@ CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/i386/xen b/config/i386/xen
index 176117f..687eef8 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -49,7 +49,7 @@ CONFIG_X86_NO_IDT=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ia64/debug b/config/ia64/debug
index c60f60c..3096fa7 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -2,7 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ia64/default b/config/ia64/default
index 4563fea..7c380de 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -2,7 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ia64/trace b/config/ia64/trace
index afb3610..55a6464 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -2,7 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ppc/default b/config/ppc/default
index f73d32f..a0037cf 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -66,7 +66,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index 1a62e79..01c75a4 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -70,7 +70,7 @@ CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ppc/ps3 b/config/ppc/ps3
index 5ff9054..920b7de 100644
--- a/config/ppc/ps3
+++ b/config/ppc/ps3
@@ -64,7 +64,7 @@ CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
diff --git a/config/ppc64/debug b/config/ppc64/debug
index 9bb1c34..2e79b1f 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -70,7 +70,7 @@ CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ppc64/default b/config/ppc64/default
index 7cbdf4e..24f06c3 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -70,7 +70,7 @@ CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index e5b51c5..8781f9f 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -70,7 +70,7 @@ CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/s390/s390 b/config/s390/s390
index 1fbecad..992727a 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -21,7 +21,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_S390=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/s390x/default b/config/s390x/default
index 0fc9dc0..5d3e870 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -23,7 +23,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_S390=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 10a0dd8..a0a53b6 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -54,7 +54,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/x86_64/default b/config/x86_64/default
index 9d77f0d..0557a2f 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -54,7 +54,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 13ad5ed..3c1219c 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -54,7 +54,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 CONFIG_KERNEL_DESKTOP=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 9fea73b..e6f4376 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -53,7 +53,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/config/x86_64/xen b/config/x86_64/xen
index b65dba6..862042e 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -49,7 +49,7 @@ CONFIG_X86_NO_TSS=y
 CONFIG_X86_NO_IDT=y
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_SUSE_KERNEL=y
-# CONFIG_ENTERPRISE_SUPPORT is not set
+CONFIG_ENTERPRISE_SUPPORT=y
 CONFIG_SPLIT_PACKAGE=y
 # CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
diff --git a/kernel-source.changes b/kernel-source.changes
index 9953239..8ac6fbe 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -344,6 +344,12 @@ Tue Jan  5 22:49:44 CET 2010 - tonyj@suse.de
 - patches.fixes/oprofile_bios_ctr.patch: Update to newer version
 
 -------------------------------------------------------------------
+Mon Jan  4 20:42:57 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: move the x86 /boot/vmlinux-*.gz back
+  to -base (bnc#563905).
+
+-------------------------------------------------------------------
 Wed Dec 30 01:01:25 CET 2009 - nfbrown@suse.de
 
 - patches.fixes/nfs-fix-NFS4ERR_FILE_OPEN-handling:
@@ -1447,6 +1453,11 @@ Fri Dec  4 13:40:29 CET 2009 - trenn@suse.de
   and set pageflagB primitive (fate#307738).
 
 -------------------------------------------------------------------
+Fri Dec  4 13:28:08 CET 2009 - mmarek@suse.cz
+
+- config.conf: Add vmi to kernel-syms.
+
+-------------------------------------------------------------------
 Fri Dec  4 13:12:44 CET 2009 - mmarek@suse.cz
 
 - Add the vmi flavor again.
@@ -2113,6 +2124,11 @@ Fri Nov 20 19:08:56 CET 2009 - jeffm@suse.com
 - Enabled B43_PHY_LP=y for PHY support on certain b43 chips.
 
 -------------------------------------------------------------------
+Fri Nov 20 17:54:23 CET 2009 - mmarek@suse.cz
+
+- config.conf: Remove the -desktop flavor from kernel-syms.
+
+-------------------------------------------------------------------
 Fri Nov 20 17:29:45 CET 2009 - mmarek@suse.cz
 
 - patches.suse/export-sync_page_range: Revert "vfs: Remove
@@ -3187,6 +3203,17 @@ Mon Oct 19 15:21:26 CEST 2009 - mmarek@suse.cz
   dwarfextract for now.
 
 -------------------------------------------------------------------
+Fri Oct 16 23:14:44 CEST 2009 - mmarek@suse.cz
+
+- Update config files: set CONFIG_ENTERPRISE_SUPPORT=y.
+
+-------------------------------------------------------------------
+Fri Oct 16 23:12:38 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix the logic for determining the base
+  package in the %post scripts.
+
+-------------------------------------------------------------------
 Fri Oct 16 19:18:25 CEST 2009 - jeffm@suse.com
 
 - Update config files.
@@ -3209,6 +3236,18 @@ Fri Oct 16 15:51:56 CEST 2009 - mmarek@suse.de
   VME_TSI148 on ia64 to fix build.
 
 -------------------------------------------------------------------
+Fri Oct 16 15:18:35 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: undo the -base merge for now.
+
+-------------------------------------------------------------------
+Fri Oct 16 14:51:42 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-source.spec.in: mark kernel-source as arch dependent
+  again. The content is noarch, but changing the rpm architecture
+  breaks online update.
+
+-------------------------------------------------------------------
 Fri Oct 16 14:19:01 CEST 2009 - jbeulich@novell.com
 
 - patches.xen/xen3-patch-2.6.32-rc4: Fix AGP for PowerPC.
@@ -3448,11 +3487,6 @@ Wed Sep 30 21:51:13 CEST 2009 - gregkh@suse.de
   - security fixes
 
 -------------------------------------------------------------------
-Wed Sep 30 15:50:54 CEST 2009 - mmarek@suse.cz
-
-- rpm/kernel-binary.spec.in: obsolete the sle11 ocfs2-kmp.
-
--------------------------------------------------------------------
 Tue Sep 29 11:17:48 CEST 2009 - trenn@suse.de
 
 - Disabled patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
diff --git a/rpm/config.sh b/rpm/config.sh
index ebd9c2b..d8002a1 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -3,5 +3,5 @@ SRCVERSION=2.6.32
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=
 # buildservice projects to build the kernel against
-OBS_PROJECT=openSUSE:Factory
-IBS_PROJECT=SUSE:Factory:Head
+OBS_PROJECT=
+IBS_PROJECT=SUSE:SLE-11-SP1:GA
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index d987816..0f86619 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -70,9 +70,7 @@ BuildRequires:  fdupes
 Provides:       multiversion(kernel)
 Provides:       %{name}_%_target_cpu = %version-%release
 %if %split_base
-Provides:       kernel-base = %version-%source_rel
-# Obsolete the -base subpackage from 11.1 and 11.2 development phase
-Obsoletes:      %name-base <= 2.6.31
+Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
 # Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2
@@ -201,8 +199,6 @@ Obsoletes:      fnic-kmp-%build_flavor
 Obsoletes:      brocade-bfa-kmp-%build_flavor
 Obsoletes:      kvm-kmp-%build_flavor
 Obsoletes:      perfmon-kmp-%build_flavor
-# sle11
-Obsoletes:      ocfs2-kmp-%build_flavor
 # 11.1
 Obsoletes:      quickcam-kmp-%build_flavor < 0.6.7
 
@@ -452,7 +448,10 @@ add_vmlinux()
 
 for sub in '-base' '' '-extra'; do
     case "$sub" in
-    '-base' | '') base_package=1 ;;
+    '-base') base_package=1 ;;
+%if ! %split_base
+    '') base_package=1 ;;
+%endif
     *) base_package=0 ;;
     esac
     for script in preun postun pre post devel-pre devel-post; do
@@ -630,7 +629,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+for file in %buildroot/boot/symtypes* \
 				%buildroot/lib/modules/*/{build,source}; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
@@ -669,7 +668,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
 rm %my_builddir/tmp
 
 %if %split_base
-    add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+    add_dirs_to_filelist %my_builddir/main-modules \
 	> %my_builddir/kernel-main.files
 %endif
 %if %split_extra
@@ -700,6 +699,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 AutoReqProv:    on
 Provides:       multiversion(kernel)
+Provides:       %name-base_%_target_cpu = %version-%release
 Provides:       kernel-base = %version-%source_rel
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in
index b951db9..45877e9 100644
--- a/rpm/kernel-source.spec.in
+++ b/rpm/kernel-source.spec.in
@@ -99,7 +99,6 @@ Source112:      patches.trace.tar.bz2
 Source113:      patches.kabi.tar.bz2
 Source120:      kabi.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 Prefix:         /usr/src
 
 %(chmod +x %_sourcedir/{guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
diff --git a/scripts/config.sh b/scripts/config.sh
index 7b26fd7..bb095ac 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -8,4 +8,4 @@ if test -e $(dirname -- "$0")/../rpm/config.sh; then
 fi
 BUILD_DIR=kernel-source${VARIANT}
 IGNORE_ARCHS=
-DIST_SET=head
+DIST_SET=sle11-sp1