OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=66

TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS

@@ -1 +0,0 @@
-

config.conf

@@ -12,7 +12,7 @@
 +i386		i386/desktop
 +i386		i386/pae
 +i386		i386/debug
-+i386 -		i386/xen
++i386		i386/xen
 +i386 		i386/vanilla
 +i386 -syms	i386/trace
 
@@ -23,7 +23,7 @@
 
 +x86_64		x86_64/default
 +x86_64		x86_64/desktop
-+x86_64 -	x86_64/xen
++x86_64		x86_64/xen
 +x86_64		x86_64/debug
 +x86_64		x86_64/vanilla
 +x86_64 -syms	x86_64/trace

config.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df76508b19646ac683b1306195509d83707eadf6d87fc8eab2515d3e5a906e8c
+oid sha256:c4e25e1f6ea0c60d61f6c674b5cefcf6eba1f9b3c844ab10cf1cd6f02ba14670
-size 155326
+size 154435

kernel-binary.spec.in

@@ -42,9 +42,10 @@
 
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 
 %ifarch %ix86 x86_64
 %define install_vdso 1
@@ -67,7 +68,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -137,6 +138,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:	kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -420,15 +422,17 @@ add_vmlinux()
 %endif
 
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -530,7 +534,7 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -538,6 +542,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 
 %else
     (   cd %buildroot
@@ -647,8 +654,10 @@ done
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
 
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 
@@ -662,7 +671,7 @@ done
 %post -f post.sh
 
 
-%if %split_packages
+%if %split_base
 %files -f kernel-main.files
 %else
 %files -f kernel-base.files
@@ -697,7 +706,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 %post base -f post-base.sh
 
-%if %split_packages
+%if %split_base
 %files base -f kernel-base.files
 %defattr(-, root, root)
 %endif
@@ -733,7 +742,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 %post extra -f post-extra.sh
 
-%if %split_packages
+%if %split_extra
 %files extra -f kernel-extra.files
 %defattr(-, root, root)
 %endif

kernel-debug.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	debug
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-debug
 Summary:        A Debug Version of the Kernel
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -125,6 +126,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -374,15 +376,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -467,7 +471,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -475,6 +479,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -574,8 +581,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -589,7 +598,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -629,7 +638,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -669,7 +678,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-default.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	default
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-default
 Summary:        The Standard Kernel
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -141,6 +142,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -389,15 +391,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -482,7 +486,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -490,6 +494,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -589,8 +596,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -604,7 +613,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -643,7 +652,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -682,7 +691,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-desktop.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	desktop
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-desktop
 Summary:        Kernel optimized for the desktop
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -125,6 +126,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -384,15 +386,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -477,7 +481,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -485,6 +489,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -584,8 +591,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -599,7 +608,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -649,7 +658,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -699,7 +708,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-kdump.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	kdump
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-kdump
 Summary:        kernel for kdump
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -125,6 +126,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -376,15 +378,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -469,7 +473,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -477,6 +481,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -576,8 +583,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -591,7 +600,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -633,7 +642,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -675,7 +684,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-pae.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	pae
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-pae
 Summary:        Kernel with PAE Support
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -129,6 +130,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -384,15 +386,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -477,7 +481,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -485,6 +489,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -584,8 +591,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -599,7 +608,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -645,7 +654,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -691,7 +700,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-ppc64.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	ppc64
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-ppc64
 Summary:        Kernel for ppc64 Systems
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -129,6 +130,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -384,15 +386,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -477,7 +481,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -485,6 +489,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -584,8 +591,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -599,7 +608,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -645,7 +654,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -691,7 +700,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-ps3.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	ps3
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-ps3
 Summary:        kernel for ps3 bootloader
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -125,6 +126,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -376,15 +378,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -469,7 +473,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -477,6 +481,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -576,8 +583,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -591,7 +600,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -633,7 +642,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -675,7 +684,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-s390.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	s390
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-s390
 Summary:        The Standard Kernel
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -129,6 +130,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -377,15 +379,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -470,7 +474,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -478,6 +482,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -577,8 +584,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -592,7 +601,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -631,7 +640,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -670,7 +679,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-source.spec

@@ -19,7 +19,7 @@
 # icecream 0
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define src_install_dir usr/src/linux-%kernelrelease%variant
@@ -30,7 +30,7 @@
 Name:           kernel-source
 Summary:        The Linux Kernel Sources
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -79,6 +79,7 @@ Source57:       compute-PATCHVERSION.sh
 Source58:       old-packages.conf
 Source59:       arch-symbols
 Source60:       package-descriptions
+Source61:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2

kernel-source.spec.in

@@ -83,6 +83,7 @@ Source57:       compute-PATCHVERSION.sh
 Source58:       old-packages.conf
 Source59:       arch-symbols
 Source60:       package-descriptions
+Source61:	kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2

kernel-syms.spec

@@ -23,7 +23,7 @@
 Name:           kernel-syms
 Summary:        Kernel Symbol Versions (modversions)
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
@@ -54,6 +54,9 @@ Requires:       kernel-ps3-devel = %version-%source_rel
 %ifarch s390
 Requires:       kernel-s390-devel = %version-%source_rel
 %endif
+%ifarch %ix86 x86_64
+Requires:       kernel-xen-devel = %version-%source_rel
+%endif
 Source:         README.KSYMS
 Requires:       kernel-source%variant = %version-%source_rel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

kernel-trace.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	trace
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-trace
 Summary:        The Realtime Linux Kernel
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -125,6 +126,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -373,15 +375,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -466,7 +470,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -474,6 +478,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -573,8 +580,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -588,7 +597,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -627,7 +636,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -666,7 +675,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-vanilla.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.30
-%define patchversion 2.6.31-rc4
+%define patchversion 2.6.31-rc5-git3
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	vanilla
@@ -36,9 +36,10 @@
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_packages (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
 %ifarch %ix86 x86_64
 %define install_vdso 1
 %else
@@ -48,7 +49,7 @@
 Name:           kernel-vanilla
 Summary:        The Standard Kernel - without any SUSE patches
 Version:        2.6.31
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -59,7 +60,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
-%if %split_packages
+%if %split_base
 Requires:       %name-base_%_target_cpu = %version-%release
 %endif
 Requires(pre):  coreutils awk
@@ -133,6 +134,7 @@ Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
 Source48:       split-modules
+Source49:       kernel-spec-macros
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -381,15 +383,17 @@ add_vmlinux()
 # end of build_kdump
 %endif
 for sub in '-base' '' '-extra'; do
-%if %split_packages
+    if \
-    if [ "x$sub" = "x-base" ]; then
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
         base_package=1
     else
         base_package=0
     fi
-%else
-    base_package=1
-%endif
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -474,7 +478,7 @@ if [ %CONFIG_MODULES = y ]; then
     if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
 	exit 1
     fi
-%if %split_packages
+%if %split_base
     %_sourcedir/split-modules -d %buildroot \
 %if ! %supported_modules_check
 	-i \
@@ -482,6 +486,9 @@ if [ %CONFIG_MODULES = y ]; then
 	-o %my_builddir \
 	-b %kernel_build_dir/Module.base \
 	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -581,8 +588,10 @@ done
 	echo "%%%%doc %_docdir/%name"
     fi
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
-%if %split_packages
+%if %split_base
     add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
 %endif
 # Hardlink duplicate files automatically (from package fdupes): It doesn't save
@@ -596,7 +605,7 @@ done
 %pre -f pre.sh
 
 %post -f post.sh
-%if %split_packages
+%if %split_base
 
 %files -f kernel-main.files
 %else
@@ -635,7 +644,7 @@ This package contains only the base modules, required in all installs.
 %pre base -f pre-base.sh
 
 %post base -f post-base.sh
-%if %split_packages
+%if %split_base
 
 %files base -f kernel-base.files
 %defattr(-, root, root)
@@ -674,7 +683,7 @@ This package contains additional modules not supported by Novell.
 %pre extra -f pre-extra.sh
 
 %post extra -f post-extra.sh
-%if %split_packages
+%if %split_extra
 
 %files extra -f kernel-extra.files
 %defattr(-, root, root)

kernel-xen.spec

@@ -0,0 +1,757 @@
+#
+# spec file for package kernel-xen (Version 2.6.31)
+#
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc5-git3
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
+%define build_flavor	xen
+%define build_kdump	(%build_flavor == "kdump")
+%define build_xen	(%build_flavor == "xen")
+%define build_vanilla	(%build_flavor == "vanilla")
+%define build_ps3	(%build_flavor == "ps3")
+%define build_src_dir %my_builddir/linux-%srcversion
+%define src_install_dir /usr/src/linux-%kernelrelease%variant
+%define obj_install_dir %src_install_dir-obj
+%define rpm_install_dir %buildroot%obj_install_dir
+%define kernel_build_dir %my_builddir/linux-obj
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
+# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
+# defining them all at once.)
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+%ifarch %ix86 x86_64
+%define install_vdso 1
+%else
+%define install_vdso 0
+%endif
+
+Name:           kernel-xen
+Summary:        The Xen Kernel
+Version:        2.6.31
+Release:        1
+%if %using_buildservice
+%else
+%endif
+License:        GPL v2 only
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+BuildRequires:  coreutils module-init-tools sparse
+BuildRequires:  fdupes
+Provides:       %{name}_%_target_cpu = %version-%release
+%if %split_base
+Requires:       %name-base_%_target_cpu = %version-%release
+%endif
+Requires(pre):  coreutils awk
+Requires(post): module-init-tools
+# This Requires is wrong, because the post/postun scripts have a
+# test -x update-bootloader, having perl-Bootloader is not a hard requirement.
+# But, there is no way to tell rpm or yast to schedule the installation
+# of perl-Bootloader before kernel-binary.rpm if both are in the list of
+# packages to install/update. Likewise, this is true for mkinitrd.
+# A specific version of perl-Bootloader is not required, because the post/postun
+# scripts handle the two API versions of 10.1/SLES10 GA and 10.2/SLES10 SP1
+Requires(post): perl-Bootloader
+Requires(post): mkinitrd
+#!BuildIgnore:  perl-Bootloader mkinitrd
+%ifarch ia64
+# arch/ia64/scripts/unwcheck.py
+BuildRequires:  python
+%endif
+%ifarch s390 s390x
+BuildRequires:  dwarfextract
+%endif
+%if %build_xen
+%ifarch %ix86
+Provides:       kernel-xenpae = %version
+Obsoletes:      kernel-xenpae <= %version
+%endif
+#!BuildIgnore:  xen
+%endif
+Provides:       %name-nongpl
+Obsoletes:      %name-nongpl
+%if %build_vanilla
+# force bzip2 instead of lzma compression to allow install on older dist versions
+%define _binary_payload w9.bzdio
+%endif
+# dead network if installed on SLES10, otherwise it will work (mostly)
+Conflicts:      sysfsutils < 2.0
+%if ! %build_vanilla
+Conflicts:      apparmor-profiles <= 2.1
+Conflicts:      apparmor-parser < 2.3
+# root-lvm only works with newer udevs
+Conflicts:      udev < 118
+Conflicts:      lvm2 < 2.02.33
+%endif
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+Provides:       kernel = %version-%source_rel
+Source0:        http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source10:       preun.sh
+Source11:       postun.sh
+Source12:       pre.sh
+Source13:       post.sh
+Source20:       series.conf
+Source22:       supported.conf
+Source30:       arch-symbols
+Source31:       guards
+Source33:       check-for-config-changes
+Source34:       check-supported-list
+Source40:       source-timestamp
+Source41:       built-in-where
+Source44:       find-provides
+Source45:       module-renames
+Source46:       modversions
+Source47:       symsets.pl
+Source48:       split-modules
+Source49:       kernel-spec-macros
+Source100:      config.tar.bz2
+Source101:      patches.arch.tar.bz2
+Source102:      patches.drivers.tar.bz2
+Source103:      patches.fixes.tar.bz2
+Source104:      patches.rpmify.tar.bz2
+Source105:      patches.suse.tar.bz2
+Source107:      patches.xen.tar.bz2
+Source108:      patches.addon.tar.bz2
+Source109:      patches.kernel.org.tar.bz2
+Source110:      patches.apparmor.tar.bz2
+Source111:      patches.rt.tar.bz2
+Source112:      patches.trace.tar.bz2
+Source113:      patches.kabi.tar.bz2
+Source120:      kabi.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch:  %ix86 x86_64
+# These files are found in the kernel-source package:
+NoSource:       0
+NoSource:       100
+NoSource:       101
+NoSource:       102
+NoSource:       103
+NoSource:       104
+NoSource:       105
+NoSource:       107
+NoSource:       108
+NoSource:       109
+NoSource:       110
+NoSource:       111
+NoSource:       120
+# The following KMPs have been integrated into the kernel package.
+# sles10 / 10.3
+Obsoletes:      iwlwifi-kmp
+Obsoletes:      ipw3945-kmp
+# sles10 / 11.0
+Obsoletes:      uvcvideo-kmp
+# 10.3
+Obsoletes:      adm8211-kmp
+Obsoletes:      rt2x00-kmp
+Obsoletes:      rfswitch-kmp
+# 11.0
+Obsoletes:      atl2-kmp
+Obsoletes:      wlan-ng-kmp
+Obsoletes:      et131x-kmp
+Obsoletes:      ivtv-kmp
+Obsoletes:      at76_usb-kmp
+Obsoletes:      pcc-acpi-kmp
+Obsoletes:      btusb-kmp
+# Provide the exported symbols as "ksym(symbol) = hash"
+%define __find_provides %_sourcedir/find-provides %name
+# Will modules not listed in supported.conf abort the kernel build (0/1)?
+%define supported_modules_check 0
+# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15,
+# 31 is the maximum; see scripts/kabi-checks)
+%define tolerate_kabi_changes 6
+
+%description
+The Linux kernel for Xen paravirtualization.
+
+This kernel can be used both as the domain0 ("xen0") and as an
+unprivileged ("xenU") kernel.
+
+
+%source_timestamp
+%prep
+if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
+    echo "The %name-%version.nosrc.rpm package does not contain the" \
+	 "complete sources. Please install kernel-source-%version.src.rpm."
+    exit 1
+fi
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+	SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
+# Unpack all sources and patches
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+mkdir -p %kernel_build_dir
+supported_conf() {
+	%_sourcedir/guards $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
+}
+# Generate the list of modules to be marked as supported
+{   supported_conf base
+    supported_conf --default=0 external | sed 's/$/ external/'
+} > %kernel_build_dir/Module.supported
+supported_conf --default=0 base >%kernel_build_dir/Module.base
+cd linux-%srcversion
+# Apply patches
+echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+%if %build_vanilla
+    egrep '^patches\.(kernel\.org|rpmify)/' | \
+%endif
+    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+    >>../apply-patches.sh
+bash -ex ../apply-patches.sh
+cd %kernel_build_dir
+if [ -f %_sourcedir/localversion ] ; then
+    cat %_sourcedir/localversion > localversion
+fi
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+	--enable  CONFIG_SUSE_KERNEL \
+%if 0%{?__debug_package:1}
+	--enable  CONFIG_DEBUG_INFO
+%else
+	--disable CONFIG_DEBUG_INFO
+%endif
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
+    yes '' | make oldconfig $MAKE_ARGS
+else
+    cp .config .config.orig
+    make silentoldconfig $MAKE_ARGS < /dev/null
+    %_sourcedir/check-for-config-changes .config.orig .config
+    rm .config.orig
+fi
+make prepare $MAKE_ARGS
+make scripts $MAKE_ARGS
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
+    echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
+    exit 1
+fi
+make clean $MAKE_ARGS
+rm -f source
+find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+cat > .kernel-binary.spec.buildenv <<EOF
+# Override the timestamp 'uname -v' reports with the build
+# timestamp.
+export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
+export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
+# The following branch/timestamp will end up in Oopses.
+export OOPS_TIMESTAMP="$(
+    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
+		  %_sourcedir/source-timestamp)
+    head -n 1 %_sourcedir/source-timestamp \
+	| tr -dc 0-9)"
+export KBUILD_VERBOSE=0
+export KBUILD_SYMTYPES=1
+export KBUILD_OVERRIDE=1
+EOF
+
+%build
+cd %kernel_build_dir
+source .kernel-binary.spec.buildenv
+# create *.symref files in the tree
+if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
+    %_sourcedir/modversions --unpack . < $_
+fi
+%if %CONFIG_KMSG_IDS == "y"
+    chmod +x scripts/kmsg-doc
+    make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
+%else
+    make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
+%endif
+
+%install
+# get rid of /usr/lib/rpm/brp-strip-debug
+# strip removes too much from the vmlinux ELF binary
+export NO_BRP_STRIP_DEBUG=true
+# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
+# kernel-source package is installed. Don't check for stale symlinks
+# in the brp-symlink check:
+export NO_BRP_STALE_LINK_ERROR=yes
+cd %kernel_build_dir
+mkdir -p %buildroot/boot
+# (Could strip out non-public symbols.)
+cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+add_vmlinux()
+{
+    local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
+%if 0%{?__debug_package:1}
+    local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+    mkdir -p $(dirname %buildroot/$vmlinux_debug)
+    cp vmlinux %buildroot/$vmlinux
+    /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
+			   -l vmlinux.sourcefiles %buildroot/$vmlinux
+    # FIXME: create and package build-id symlinks
+    objcopy --only-keep-debug \
+	    %buildroot/$vmlinux \
+	    %buildroot/$vmlinux_debug || :
+    objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+	    --strip-debug \
+	    %buildroot/$vmlinux || :
+    mkdir -p %buildroot/usr/src/debug
+    LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
+	| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
+    find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
+    find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+    echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
+%else
+    cp vmlinux %buildroot/$vmlinux
+%endif
+    if [ "$1" = --compressed ]; then
+	gzip -9 %buildroot/$vmlinux
+        chmod a-x %buildroot/$vmlinux.gz
+    fi
+}
+%if %build_kdump
+    add_vmlinux
+    chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
+    image=vmlinux
+%else
+# architecture specifics
+%ifarch %ix86 x86_64
+    add_vmlinux --compressed
+%if %build_xen
+    image=vmlinuz
+%else
+    image=bzImage
+%endif
+    cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch alpha
+    add_vmlinux --compressed
+    cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch ppc ppc64
+    add_vmlinux
+    chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
+    image=vmlinux
+%endif
+%ifarch ia64
+    add_vmlinux --compressed
+    mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
+       %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch s390 s390x
+    add_vmlinux --compressed
+    cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
+    image=image
+    if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
+	dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
+    fi
+%if %CONFIG_KMSG_IDS == "y"
+    mkdir -p %buildroot/usr/share/man/man9
+    find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
+%endif
+%endif
+    if [ -e init/kerntypes.o ]; then
+	cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
+    fi
+# end of build_kdump
+%endif
+for sub in '-base' '' '-extra'; do
+    if \
+%if %split_base
+        [ "x$sub" = "x-base" ];
+%else
+        [ "x$sub" = "x" ];
+%endif
+    then
+        base_package=1
+    else
+        base_package=0
+    fi
+    for script in preun postun pre post devel-pre devel-post; do
+        sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
+            -e "s:@IMAGE@:$image:g" \
+            -e "s:@FLAVOR""@:%build_flavor:g" \
+            -e "s:@SUBPACKAGE@:%name$sub:g" \
+            -e "s:@BASE_PACKAGE@:$base_package:g" \
+            -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+            -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
+	    -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
+            -e "s:@SRCVARIANT@:%variant:g" \
+            %_sourcedir/$script.sh > %my_builddir/$script$sub.sh
+    done
+done
+%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
+# keep this -suffix list in sync with post.sh and postun.sh
+suffix=-%build_flavor
+%endif
+ln -s $image$suffix %buildroot/boot/$image$suffix
+ln -s initrd$suffix %buildroot/boot/initrd$suffix
+cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+%if %install_vdso
+# Install the unstripped vdso's that are linked in the kernel image
+make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+%endif
+# Create a dummy initrd with roughly the size the real one will have.
+# That way, YaST will know that this package requires some additional
+# space in /boot.
+dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
+	bs=1024 seek=2047 count=1
+if [ %CONFIG_MODULES = y ]; then
+    mkdir -p %rpm_install_dir/%cpu_arch_flavor
+    mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
+    ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+    # Figure out where the symbols that vmlinux exports are defined.
+    %_sourcedir/built-in-where < Module.symvers > Module.symvers.split
+    gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+    make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+    if ! %_sourcedir/check-supported-list \
+	    %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
+%if %supported_modules_check
+	exit 1
+%endif
+	echo "Consistency check error: please update supported.conf."
+    fi
+%ifarch s390 s390x
+    if [ -x "$(which dwarfextract 2>/dev/null)" -a \
+	-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
+	find %buildroot -name "*.ko" > kofiles.list
+	dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list
+    fi
+%endif
+    # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
+    # so that kernel-source + kernel-%build_flavor is sufficient for building
+    # modules that have modversions as well.
+    mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
+    cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+    # Table of types used in exported symbols (for modversion debugging).
+    %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
+	gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    else
+	rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    fi
+    # Some architecture's $(uname -m) output is different from the ARCH
+    # parameter that needs to be passed to kbuild. Create symlinks from
+    # $(uname -m) to the ARCH directory.
+    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
+	ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
+	ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    fi
+    # We were building in %my_builddir/linux-%srcversion, but the sources will
+    # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
+    # build symlink.
+    rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
+    ln -s %src_install_dir \
+	%buildroot/lib/modules/%kernelrelease-%build_flavor/source
+    ln -s %obj_install_dir/%cpu_arch/%build_flavor \
+	%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+    # Abort if there are any undefined symbols
+    msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
+			-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
+    if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
+	exit 1
+    fi
+%if %split_base
+    %_sourcedir/split-modules -d %buildroot \
+%if ! %supported_modules_check
+	-i \
+%endif
+	-o %my_builddir \
+	-b %kernel_build_dir/Module.base \
+	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
+%else
+    (   cd %buildroot
+	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
+    ) > %my_builddir/base-modules
+%endif
+    # check for kabi changes
+    if [ -z "fixme-broken" ]; then
+        %_sourcedir/symsets.pl --check-kabi \
+            $reference \
+            --symvers=Module.symvers.split \
+            --modules=%my_builddir/base-modules-br \
+            --modules=%my_builddir/main-modules-br \
+            --modules=%my_builddir/unsupported-modules-br \
+            --commonsyms=%my_builddir/kabi/commonsyms \
+            --usedsyms=%my_builddir/kabi/usedsyms \
+            --severities=%my_builddir/kabi/severities \
+            --max-badness=%tolerate_kabi_changes
+    fi
+    if [ $? -ne 0 ]; then
+	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
+		 "directory to build this kernel even though its badness is" \
+		 "higher than allowed for an official kernel."
+	   exit 1
+	fi
+    fi
+    # Set up some module aliases
+    install -d -m 755 %buildroot/etc/modprobe.d/
+    install -m 644 %_sourcedir/module-renames \
+	%buildroot/etc/modprobe.d/50-module-renames.conf
+    tar cf - -T %my_builddir/obj-files | \
+	tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+    # bnc#507084
+    find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
+        while read f; do
+            case "$(file -b "$f")" in
+            ELF\ *\ executable*)
+                strip "$f"
+            esac
+        done
+    # Replace the absolute with a relative path
+    sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
+	%rpm_install_dir/%cpu_arch_flavor/Makefile
+    link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
+    target=$(readlink "$link")
+    target=${target#%build_src_dir/}
+    rm "$link"
+    ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
+fi
+add_dirs_to_filelist() {
+    sed -rn '
+        # print file name
+        p
+        # remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
+        # add %%%%dir prefix
+        s:^:%%%%dir :
+        # print all parents
+        :a
+            # skip directories owned by other packages
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
+            s:/[^/]+$::p
+        ta
+    ' "$@" | sort -u
+}
+# Collect the file lists.
+shopt -s nullglob
+> %my_builddir/kernel-devel.files
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+	f=${file##%buildroot}
+	echo "$f" >> %my_builddir/kernel-devel.files
+done
+{   cd %buildroot
+    (find boot \
+	\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
+        -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
+        sort | uniq -u
+    # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
+    # the file gets removed when uninstalling the kernel.
+    echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
+    touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+    if [ %CONFIG_MODULES = y ]; then
+	find lib/modules/%kernelrelease-%build_flavor \
+	    -type d -o \
+	    \( -path '*/modules.*' ! -path '*/modules.order' \
+	     ! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
+	       -o -name '*.ko' -prune -o -printf '/%%p\n'
+	cat %my_builddir/base-modules
+	echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
+    fi
+    test -d lib/firmware/%kernelrelease-%build_flavor && \
+    find lib/firmware/%kernelrelease-%build_flavor \
+	-type d -o \
+	-printf '/%%p\n'
+    if [ -e .%_docdir/%name ]; then
+	echo "%%%%doc %_docdir/%name"
+    fi
+} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+%if %split_base
+    add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+%endif
+%if %split_extra
+    add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
+%endif
+# Hardlink duplicate files automatically (from package fdupes): It doesn't save
+# much, but it keeps rpmlint from breaking the package build.
+%fdupes $RPM_BUILD_ROOT
+
+%preun -f preun.sh
+
+%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
+%if %split_base
+
+%files -f kernel-main.files
+%else
+
+%files -f kernel-base.files
+%endif
+%defattr(-, root, root)
+
+%package base
+Summary:        The Xen Kernel - base modules
+License:        GPL v2 only
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+Provides:       %name-base_%_target_cpu = %version-%release
+Provides:       kernel-base = %version-%source_rel
+Requires(pre):  coreutils awk
+Requires(post): module-init-tools
+Requires(post): perl-Bootloader
+Requires(post): mkinitrd
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+
+%description base
+The Linux kernel for Xen paravirtualization.
+
+This kernel can be used both as the domain0 ("xen0") and as an
+unprivileged ("xenU") kernel.
+
+This package contains only the base modules, required in all installs.
+
+
+%source_timestamp
+%preun base -f preun-base.sh
+
+%postun base -f postun-base.sh
+
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
+%if %split_base
+
+%files base -f kernel-base.files
+%defattr(-, root, root)
+%endif
+
+%package extra
+Summary:        The Xen Kernel - Unsupported kernel modules
+License:        GPL v2 only
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+Provides:       %name-extra_%_target_cpu = %version-%release
+Provides:       kernel-extra = %version-%source_rel
+Requires:       %{name}_%_target_cpu = %version-%release
+Requires(pre):  coreutils awk
+Requires(post): module-init-tools
+Requires(post): perl-Bootloader
+Requires(post): mkinitrd
+Supplements:    packageand(product(SUSE_SLED):%{name}_%_target_cpu)
+Supplements:    packageand(product(openSUSE):%{name}_%_target_cpu)
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+
+%description extra
+The Linux kernel for Xen paravirtualization.
+
+This kernel can be used both as the domain0 ("xen0") and as an
+unprivileged ("xenU") kernel.
+
+This package contains additional modules not supported by Novell.
+
+
+%source_timestamp
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
+
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
+%if %split_extra
+
+%files extra -f kernel-extra.files
+%defattr(-, root, root)
+%endif
+%if %CONFIG_KMSG_IDS == "y"
+
+%package man
+Summary:        The collection of man pages generated by the kmsg script.
+License:        GPL v2 only
+Group:          System/Kernel
+
+%description man
+This package includes the man pages that have been generated from the
+kmsg message documentation comments.
+
+
+%source_timestamp
+%files man
+%defattr(-,root,root)
+/usr/share/man/man9/*
+%endif
+
+%package devel
+Summary:        Development files necessary for building kernel modules
+License:        GPL v2 only
+Group:          Development/Sources
+Provides:       %name-devel = %version-%source_rel
+Requires:       kernel-source%variant = %version-%source_rel
+AutoReqProv:    on
+
+%description devel
+This package contains files necessary for building kernel modules (and
+kernel module packages) against the %build_flavor flavor of the kernel.
+
+
+%source_timestamp
+%if %CONFIG_MODULES == "y"
+
+%pre devel -f devel-pre.sh
+
+%post devel -f devel-post.sh
+
+%files devel -f kernel-devel.files
+%defattr(-,root,root)
+%dir %obj_install_dir
+%dir %obj_install_dir/%cpu_arch
+%dir /usr/src/linux-obj
+%dir /usr/src/linux-obj/%cpu_arch
+%ghost /usr/src/linux-obj/%cpu_arch_flavor
+%obj_install_dir/%cpu_arch_flavor
+%if %_target_cpu != %cpu_arch
+%obj_install_dir/%_target_cpu
+/usr/src/linux-obj/%_target_cpu
+%endif
+%endif
+
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary:        Debug information for package %name-devel
+License:        GPL v2 only
+Group:          Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
+%changelog

patches.drivers.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6c4fc10ad1a69e718a3aea1c2f7f4caa4951e282429b88558f43483307d301d
+oid sha256:380e4c288c3264c41c06b52346b232bb8d77b93b787ae95ac80a2a8806ed0881
-size 215718
+size 226539

patches.kernel.org.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4d4504a165a5dbf0245b1262309700033e8f60ed5e0ef3758ccc005e8efd1cd
+oid sha256:858441779d912e40a42dcb2e5a94a60daeb1682f05efe1eb5af8051ed266e1ad
-size 10501477
+size 10924742

patches.suse.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52d4ea0ee0c40dc16da6ba90500ac2b8322723f545749bed80c8c94eb451be89
+oid sha256:c04e89bab9fc6dc8d1ebf4b5894ac57a85d553097ab91643f635a605a77f078e
-size 851840
+size 852458

patches.xen.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c994f55998d5a46c751fb639a9f306a619239c863540dd6f18f54e11930e93b3
+oid sha256:534e7d9cb35035b254c2081e02a6e729c4c7919a4c3e85b08c12cfedab0b986d
-size 1805781
+size 1840102

series.conf

@@ -31,6 +31,8 @@
 	patches.kernel.org/patch-2.6.31-rc1-rc2
 	patches.kernel.org/patch-2.6.31-rc2-rc3
 	patches.kernel.org/patch-2.6.31-rc3-rc4
+	patches.kernel.org/patch-2.6.31-rc4-rc5
+	patches.kernel.org/patch-2.6.31-rc5-git3
 
         ########################################################
         # Build fixes that apply to the vanilla kernel too.
@@ -75,6 +77,7 @@
         ########################################################
 	patches.suse/supported-flag
 	patches.suse/supported-flag-sysfs
+	patches.suse/supported-flag-enterprise
 	patches.suse/kbuild-icecream-workaround
 	patches.fixes/kbuild-fix-generating-of-.symtypes-files
 	patches.suse/genksyms-add-override-flag.diff
@@ -365,8 +368,8 @@
 	patches.suse/scsi-netlink-ml
 
 +needs_update	patches.drivers/mpt-fusion-4.16.00.00-update
-	patches.drivers/qla4xxx-sles11-update
++needs_update	patches.drivers/qla4xxx-sles11-update
-	patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update
++needs_update	patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update
 	patches.fixes/scsi-skip-nonscsi-device-for-dma
 	patches.fixes/scsi-dh-alua-retry-UA
 	patches.fixes/scsi-add-tgps-setting
@@ -445,11 +448,6 @@
 	##########################################################
 	patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max
 
-	patches.drivers/alsa-pcm-01-Fix-regressions-with-VMware
-	patches.drivers/alsa-pcm-02-Add-logging-of-hwptr-updates
-	patches.drivers/alsa-pcm-03-Fix-warnings-in-debug-loggings
-	patches.drivers/alsa-pcm-04-Fix-hwptr-buffer-size-overlap-bug
-
 	patches.drivers/alsa-midi-01-always-log-message-on-output-overrun
 	patches.drivers/alsa-midi-02-do-not-send-MIDI-reset-when-closing
 	patches.drivers/alsa-midi-03-disable-active-sensing-on-close-by-def
@@ -476,17 +474,18 @@
 	patches.drivers/alsa-hda-19-Fix-ALC861-auto-mode-parser
 	patches.drivers/alsa-hda-20-do-not-read-connections-for-widged
 	patches.drivers/alsa-hda-21-use-AC_WCAP_CONN_LIST
-	patches.drivers/alsa-hda-22-Use-snprintf-to-be-safer
 	patches.drivers/alsa-hda-23-Cleanups-for-widget-connection-list
-	patches.drivers/alsa-hda-24-Restore-GPIO1-properly-at-resume
 	patches.drivers/alsa-hda-25-Add-better-Intel-IbexPeak-platform-support
-	patches.drivers/alsa-hda-26-Fix-mute-control-with-some-ALC262-models
 	patches.drivers/alsa-hda-27-Introduce-get_wcaps_type-macro
 	patches.drivers/alsa-hda-28-Add-exception-for-volume-knob
-	patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555
+	patches.drivers/alsa-hda-32-Reword-auto-probe-messages
+	patches.drivers/alsa-hda-33-IDT-codec-updates
+	patches.drivers/alsa-hda-34-add-2channel-to-ALC889
+	patches.drivers/alsa-hda-35-add-HP-automute-to-ALC889
+	patches.drivers/alsa-hda-36-add-CS420x-support
+	patches.drivers/alsa-hda-37-fix-IbexPeak-HDMI
 
 	patches.drivers/alsa-ctxfi-01-Native-timer-support-for-emu20k2
-	patches.drivers/alsa-ctxfi-02-Fix-uninitialized-error-checks
 	patches.drivers/alsa-ctxfi-03-Simple-code-clean-up
 
 	patches.drivers/alsa-ice-01-Patch-for-suspend-resume-for-Audiotrak
@@ -498,8 +497,6 @@
 	patches.drivers/alsa-usb-04-use-multiple-input-URBs
 	patches.drivers/alsa-usb-05-use-multiple-output-URBs
 	patches.drivers/alsa-usb-06-add-MIDI-drain-callback
-	patches.drivers/alsa-usb-07-Volume-control-quirk-for-QuickCam-E-3
-	patches.drivers/alsa-usb-08-add-support-for-Audio2DJ
 
 	########################################################
 	# Other driver fixes
@@ -518,6 +515,7 @@
 	########################################################
 	# Other drivers we have added to the tree
 	########################################################
+	patches.drivers/staging-rtl8192su-fix-build-error.patch
 
 	########################################################
 	# Suspend/Resume stuff
@@ -623,7 +621,7 @@
 	########################################################
 	patches.suse/linux-2.6.29-dont-wait-for-mouse.patch
 	patches.suse/linux-2.6.29-enable-async-by-default.patch
-	patches.suse/linux-2.6.29-even-faster-kms.patch
+-	patches.suse/linux-2.6.29-even-faster-kms.patch
 	patches.suse/linux-2.6.29-silence-acer-message.patch
 	patches.suse/linux-2.6.29-kms-after-sata.patch
 	patches.suse/linux-2.6.29-jbd-longer-commit-interval.patch
@@ -652,100 +650,100 @@
 # on top of them instead.  This reduces workload when
 # re-basing to a newer xen tree.
 #
-+xen_needs_updating	### both uml framebuffer and xen need this one.
+	### both uml framebuffer and xen need this one.
-+xen_needs_updating	patches.xen/add-console-use-vt
+	patches.xen/add-console-use-vt
-+xen_needs_updating
+
-+xen_needs_updating	# split out patches
+	# split out patches
-+xen_needs_updating	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
+	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
-+xen_needs_updating	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
+	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
-+xen_needs_updating	patches.xen/ipv6-no-autoconf
+	patches.xen/ipv6-no-autoconf
-+xen_needs_updating	patches.xen/pci-guestdev
+	patches.xen/pci-guestdev
-+xen_needs_updating	patches.xen/pci-reserve
+	patches.xen/pci-reserve
-+xen_needs_updating	patches.xen/sfc-driverlink
+	patches.xen/sfc-driverlink
-+xen_needs_updating	patches.xen/sfc-resource-driver
+	patches.xen/sfc-resource-driver
-+xen_needs_updating	patches.xen/sfc-driverlink-conditional
+	patches.xen/sfc-driverlink-conditional
-+xen_needs_updating	patches.xen/sfc-external-sram
+	patches.xen/sfc-external-sram
-+xen_needs_updating	patches.xen/tmem
+	patches.xen/tmem
-+xen_needs_updating
+
-+xen_needs_updating	# bulk stuff, new files for xen
+	# bulk stuff, new files for xen
-+xen_needs_updating	patches.xen/xen3-auto-xen-arch.diff
+	patches.xen/xen3-auto-xen-arch.diff
-+xen_needs_updating	patches.xen/xen3-auto-xen-drivers.diff
+	patches.xen/xen3-auto-xen-drivers.diff
-+xen_needs_updating	patches.xen/xen3-auto-include-xen-interface.diff
+	patches.xen/xen3-auto-include-xen-interface.diff
-+xen_needs_updating
+
-+xen_needs_updating	# kconfig bits for xen
+	# kconfig bits for xen
-+xen_needs_updating	patches.xen/xen3-auto-xen-kconfig.diff
+	patches.xen/xen3-auto-xen-kconfig.diff
-+xen_needs_updating
+
-+xen_needs_updating	# common code changes
+	# common code changes
-+xen_needs_updating	patches.xen/xen3-auto-common.diff
+	patches.xen/xen3-auto-common.diff
-+xen_needs_updating	patches.xen/xen3-auto-arch-x86.diff
+	patches.xen/xen3-auto-arch-x86.diff
-+xen_needs_updating	patches.xen/xen3-auto-arch-i386.diff
+	patches.xen/xen3-auto-arch-i386.diff
-+xen_needs_updating	patches.xen/xen3-auto-arch-x86_64.diff
+	patches.xen/xen3-auto-arch-x86_64.diff
-+xen_needs_updating
+
-+xen_needs_updating	# fixups due to upstream Xen parts
+	# fixups due to upstream Xen parts
-+xen_needs_updating	patches.xen/xen3-fixup-xen
+	patches.xen/xen3-fixup-xen
-+xen_needs_updating
+
-+xen_needs_updating	patches.xen/sfc-sync-headers
+	patches.xen/sfc-sync-headers
-+xen_needs_updating	patches.xen/sfc-endianness
+	patches.xen/sfc-endianness
-+xen_needs_updating
+
-+xen_needs_updating	# newer changeset backports
+	# newer changeset backports
-+xen_needs_updating
+
-+xen_needs_updating	# changes outside arch/{i386,x86_64}/xen
+	# changes outside arch/{i386,x86_64}/xen
-+xen_needs_updating	patches.xen/xen3-fixup-kconfig
+	patches.xen/xen3-fixup-kconfig
-+xen_needs_updating	patches.xen/xen3-fixup-common
+	patches.xen/xen3-fixup-common
-+xen_needs_updating	patches.xen/xen3-fixup-arch-x86
+	patches.xen/xen3-fixup-arch-x86
-+xen_needs_updating
+
-+xen_needs_updating	# ports of other patches
+	# ports of other patches
-+xen_needs_updating	patches.xen/xen3-patch-2.6.18
+	patches.xen/xen3-patch-2.6.18
-+xen_needs_updating	patches.xen/xen3-patch-2.6.19
+	patches.xen/xen3-patch-2.6.19
-+xen_needs_updating	patches.xen/xen3-patch-2.6.20
+	patches.xen/xen3-patch-2.6.20
-+xen_needs_updating	patches.xen/xen3-patch-2.6.21
+	patches.xen/xen3-patch-2.6.21
-+xen_needs_updating	patches.xen/xen3-patch-2.6.22
+	patches.xen/xen3-patch-2.6.22
-+xen_needs_updating	patches.xen/xen3-patch-2.6.23
+	patches.xen/xen3-patch-2.6.23
-+xen_needs_updating	patches.xen/xen3-patch-2.6.24
+	patches.xen/xen3-patch-2.6.24
-+xen_needs_updating	patches.xen/xen3-patch-2.6.25
+	patches.xen/xen3-patch-2.6.25
-+xen_needs_updating	patches.xen/xen3-patch-2.6.26
+	patches.xen/xen3-patch-2.6.26
-+xen_needs_updating	patches.xen/xen3-patch-2.6.27
+	patches.xen/xen3-patch-2.6.27
-+xen_needs_updating	patches.xen/xen3-patch-2.6.28
+	patches.xen/xen3-patch-2.6.28
-+xen_needs_updating	patches.xen/xen3-patch-2.6.29
+	patches.xen/xen3-patch-2.6.29
-+xen_needs_updating	patches.xen/xen3-patch-2.6.30
+	patches.xen/xen3-patch-2.6.30
-+xen_needs_updating	patches.xen/xen3-seccomp-disable-tsc-option
+	patches.xen/xen3-patch-2.6.31-rc4
-+xen_needs_updating+needs_to_go_away	patches.xen/xen3-x86-mark_rodata_rw.patch
+	patches.xen/xen3-patch-2.6.31-rc4-rc5
-+xen_needs_updating	patches.xen/xen3-driver-core-misc-add-nodename-support-for-misc-devices.patch
+	patches.xen/xen3-seccomp-disable-tsc-option
-+xen_needs_updating	patches.xen/xen3-kdb-x86
++needs_to_go_away	patches.xen/xen3-x86-mark_rodata_rw.patch
-+xen_needs_updating	patches.xen/xen3-stack-unwind
+	patches.xen/xen3-kdb-x86
-+xen_needs_updating	patches.xen/xen3-panic-on-io-nmi.diff
+	patches.xen/xen3-stack-unwind
-+xen_needs_updating	patches.xen/xen3-x86_64-unwind-annotations
+	patches.xen/xen3-x86_64-unwind-annotations
-+xen_needs_updating
+
-+xen_needs_updating	# bugfixes and enhancements
+	# bugfixes and enhancements
-+xen_needs_updating	patches.xen/xen-balloon-max-target
+	patches.xen/xen-balloon-max-target
-+xen_needs_updating	patches.xen/xen-modular-blktap
+	patches.xen/xen-modular-blktap
-+xen_needs_updating	patches.xen/xen-blkback-bimodal-suse
+	patches.xen/xen-blkback-bimodal-suse
-+xen_needs_updating	patches.xen/xen-blkif-protocol-fallback-hack
+	patches.xen/xen-blkif-protocol-fallback-hack
-+xen_needs_updating	patches.xen/xen-blkback-cdrom
+	patches.xen/xen-blkback-cdrom
-+xen_needs_updating	patches.xen/xen-blktap-write-barriers
+	patches.xen/xen-blktap-write-barriers
-+xen_needs_updating	patches.xen/xen-scsifront-block-timeout-update
+	patches.xen/xen-scsifront-block-timeout-update
-+xen_needs_updating	patches.xen/xen-op-packet
+	patches.xen/xen-op-packet
-+xen_needs_updating	patches.xen/xen-blkfront-cdrom
+	patches.xen/xen-blkfront-cdrom
-+xen_needs_updating	patches.xen/xen-sections
+	patches.xen/xen-sections
-+xen_needs_updating	patches.xen/xen-swiotlb-heuristics
+	patches.xen/xen-swiotlb-heuristics
-+xen_needs_updating	patches.xen/xen-kconfig-compat
+	patches.xen/xen-kconfig-compat
-+xen_needs_updating	patches.xen/xen-cpufreq-report
+	patches.xen/xen-cpufreq-report
-+xen_needs_updating	patches.xen/xen-staging-build
+	patches.xen/xen-staging-build
-+xen_needs_updating	patches.xen/xen-sysdev-suspend
+	patches.xen/xen-sysdev-suspend
-+xen_needs_updating	patches.xen/xen-ipi-per-cpu-irq
+	patches.xen/xen-ipi-per-cpu-irq
-+xen_needs_updating	patches.xen/xen-virq-per-cpu-irq
+	patches.xen/xen-virq-per-cpu-irq
-+xen_needs_updating	patches.xen/xen-configurable-guest-devices
+	patches.xen/xen-configurable-guest-devices
-+xen_needs_updating	patches.xen/xen-netback-nr-irqs
+	patches.xen/xen-netback-nr-irqs
-+xen_needs_updating	patches.xen/xen-netback-notify-multi
+	patches.xen/xen-netback-notify-multi
-+xen_needs_updating	patches.xen/xen-x86-panic-no-reboot
+	patches.xen/xen-x86-panic-no-reboot
-+xen_needs_updating	patches.xen/xen-x86-dcr-fallback
+	patches.xen/xen-x86-dcr-fallback
-+xen_needs_updating	patches.xen/xen-x86-consistent-nmi
+	patches.xen/xen-x86-consistent-nmi
-+xen_needs_updating	patches.xen/xen-x86-no-lapic
+	patches.xen/xen-x86-no-lapic
-+xen_needs_updating	patches.xen/xen-x86-pmd-handling
+	patches.xen/xen-x86-pmd-handling
-+xen_needs_updating	patches.xen/xen-x86-bigmem
+	patches.xen/xen-x86-bigmem
-+xen_needs_updating	patches.xen/xen-x86-machphys-prediction
+	patches.xen/xen-x86-machphys-prediction
-+xen_needs_updating	patches.xen/xen-x86-exit-mmap
+	patches.xen/xen-x86-exit-mmap
-+xen_needs_updating	patches.xen/xen-x86_64-pgd-pin
+	patches.xen/xen-x86_64-pgd-pin
-+xen_needs_updating	patches.xen/xen-x86_64-pgd-alloc-order
+	patches.xen/xen-x86_64-pgd-alloc-order
-+xen_needs_updating	patches.xen/xen-x86_64-dump-user-pgt
+	patches.xen/xen-x86_64-dump-user-pgt
-+xen_needs_updating	patches.xen/xen-x86_64-note-init-p2m
+	patches.xen/xen-x86_64-note-init-p2m

source-timestamp

@@ -1,3 +1,3 @@
-2009-07-29 16:01:26 +0200
+2009-08-06 23:25:57 +0200
-GIT Revision: ddfe58aede98cf3f017c0e8eefbb5189e835d82c
+GIT Revision: e9c649be988dfb8127aa75bea96a39065fa2ca14
 GIT Branch: master