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

TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS

@@ -1 +0,0 @@
-

config.conf

@@ -7,6 +7,7 @@
 #
 
 +i386		i386/default
++i386		i386/desktop
 +i386		i386/pae
 +i386		i386/debug
 +i386		i386/xen
@@ -19,6 +20,7 @@
 +ia64		ia64/trace
 
 +x86_64		x86_64/default
++x86_64		x86_64/desktop
 +x86_64		x86_64/xen
 +x86_64		x86_64/debug
 +x86_64		x86_64/vanilla

config.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8b0b9634572869b9c243365b905cd4833ff03f864dad920ec6d268ae825075b
+oid sha256:81ceb835f0c3cb89f9b6a9ffae08b3d01de027ff597549e2e2fbaad49a1294c3
-size 147128
+size 152846

kernel-binary.spec.in

@@ -49,7 +49,7 @@
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
 
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
@@ -154,6 +154,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -188,20 +189,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
@@ -237,21 +241,15 @@ echo "Symbol(s):" %symbols
 mkdir -p %kernel_build_dir
 
 supported_conf() {
-	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 
 cd linux-%srcversion
 
@@ -371,7 +369,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -548,58 +546,14 @@ if [ %CONFIG_MODULES = y ]; then
     fi
 
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
 
-    add_dependent_modules() {
-	local modules_dep=$1
-
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %else
     (   cd %buildroot
 	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
@@ -607,8 +561,7 @@ if [ %CONFIG_MODULES = y ]; then
 %endif
 
     # check for kabi changes
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -618,9 +571,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -628,9 +581,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
 
     # Set up some module aliases
@@ -651,28 +601,28 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-
+        # print file name
-    filelist=$(cat "$@")
+        p
-    echo "$filelist"
+        # remove filelist macros
-
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # Below, we do this:
+        # add %%%%dir prefix
-    # - remove filelist macros
+        s:^:%%%%dir :
-    # - remove last pathname component
+        # print all parents
-    # - generate all parents and make the list unique
+        :a
-    # - skip directories owned be other packages
+            # skip directories owned by other packages
-    # - add the %dir prefix (double-escaped for find and rpm)
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-
+            s:/[^/]+$::p
-    echo "$filelist" \
+        ta
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+    ' "$@" | sort -u
-    | sed -re 's:/[^/]+$::' \
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
-    | sort -u \
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 
 # Collect the file lists.

kernel-debug.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-debug.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-debug (Version 2.6.30)
+# spec file for package kernel-debug (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-debug
 Summary:        A Debug Version of the Kernel
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -140,6 +140,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -172,20 +173,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -214,19 +218,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -325,7 +324,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -481,60 +480,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -544,9 +503,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -554,8 +513,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -574,24 +531,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-default.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-default.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-default (Version 2.6.30)
+# spec file for package kernel-default (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-default
 Summary:        The Standard Kernel
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -156,6 +156,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -188,20 +189,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -229,19 +233,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -340,7 +339,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -496,60 +495,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -559,9 +518,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -569,8 +528,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -589,24 +546,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-desktop.spec

@@ -0,0 +1,771 @@
+#
+# spec file for package kernel-desktop (Version 2.6.30.2)
+#
+# 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 using_buildservice	0%{?opensuse_bs}
+%if %using_buildservice
+# Strip off the build number ("y") from the "x.y" release number
+%define source_rel %(release=%release; echo ${release%.*})
+%else
+# We don't have build numbers internally
+%define source_rel %release
+%endif
+# macro to add the source timestamp to package descriptions
+%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
+# Don't use shell commands in build macros, this won't work outside of rpm
+%define build_flavor	desktop
+%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 srcversion 2.6.30
+%define patchversion 2.6.30.2
+%define variant %{nil}
+%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
+%define kernelrelease %patchversion-%release_major
+%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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
+%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
+%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
+%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+# 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
+%{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")
+%ifarch %ix86 x86_64
+%define install_vdso 1
+%else
+%define install_vdso 0
+%endif
+
+Name:           kernel-desktop
+Summary:        Kernel optimized for the desktop
+Version:        2.6.30.2
+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_packages
+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
+Source21:       config.conf
+Source22:       supported.conf
+Source30:       arch-symbols
+Source31:       guards
+Source32:       config-subst
+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
+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
+%define my_builddir %_builddir/%{name}-%{version}
+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
+# Build with bash instead of sh as the shell: this turns on bash
+# extensions like <(...).
+%define _buildshell /bin/bash
+# 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
+This kernel is optimized for the desktop. It is configured for lower latency
+and has many of the features that aren't usually used on desktop machines
+disabled.
+
+This kernel upports up to 64GB of main memory. It requires Physical
+Addressing Extensions (PAE), which were introduced with the Pentium Pro
+processor.
+
+PAE is not only more physical address space but also important for the
+"no execute" feature which disables execution of code that is marked as
+non-executable. Therefore, the PAE kernel should be used on any systems
+that support it, regardless of the amount of main memory.
+
+
+%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
+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 %symbols $* < %_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
+cat ../config/%cpu_arch_flavor \
+| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
+| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+%if 0%{?__debug_package:1}
+    | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+    > .config
+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
+    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
+%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 %split_packages
+    if [ "x$sub" = "x-base" ]; 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" \
+            -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_packages
+    %_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
+%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_packages
+    add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+    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_packages
+
+%files -f kernel-main.files
+%else
+
+%files -f kernel-base.files
+%endif
+%defattr(-, root, root)
+
+%package base
+Summary:        Kernel optimized for the desktop - 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
+This kernel is optimized for the desktop. It is configured for lower latency
+and has many of the features that aren't usually used on desktop machines
+disabled.
+
+This kernel upports up to 64GB of main memory. It requires Physical
+Addressing Extensions (PAE), which were introduced with the Pentium Pro
+processor.
+
+PAE is not only more physical address space but also important for the
+"no execute" feature which disables execution of code that is marked as
+non-executable. Therefore, the PAE kernel should be used on any systems
+that support it, regardless of the amount of main memory.
+
+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_packages
+
+%files base -f kernel-base.files
+%defattr(-, root, root)
+%endif
+
+%package extra
+Summary:        Kernel optimized for the desktop - 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
+This kernel is optimized for the desktop. It is configured for lower latency
+and has many of the features that aren't usually used on desktop machines
+disabled.
+
+This kernel upports up to 64GB of main memory. It requires Physical
+Addressing Extensions (PAE), which were introduced with the Pentium Pro
+processor.
+
+PAE is not only more physical address space but also important for the
+"no execute" feature which disables execution of code that is marked as
+non-executable. Therefore, the PAE kernel should be used on any systems
+that support it, regardless of the amount of main memory.
+
+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_packages
+
+%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
+
+%changelog

kernel-kdump.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-kdump.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-kdump (Version 2.6.30)
+# spec file for package kernel-kdump (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-kdump
 Summary:        kernel for kdump
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -140,6 +140,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -172,20 +173,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -216,19 +220,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -327,7 +326,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -483,60 +482,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -546,9 +505,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -556,8 +515,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -576,24 +533,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-pae.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-pae.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-pae (Version 2.6.30)
+# spec file for package kernel-pae (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-pae
 Summary:        Kernel with PAE Support
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        6
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -144,6 +144,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -176,20 +177,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -224,19 +228,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -335,7 +334,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -491,60 +490,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -554,9 +513,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -564,8 +523,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -584,24 +541,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-ppc64.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-ppc64.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-ppc64 (Version 2.6.30)
+# spec file for package kernel-ppc64 (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-ppc64
 Summary:        Kernel for ppc64 Systems
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -144,6 +144,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -176,20 +177,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -224,19 +228,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -335,7 +334,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -491,60 +490,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -554,9 +513,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -564,8 +523,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -584,24 +541,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-ps3.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-ps3.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-ps3 (Version 2.6.30)
+# spec file for package kernel-ps3 (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-ps3
 Summary:        kernel for ps3 bootloader
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -140,6 +140,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -172,20 +173,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -216,19 +220,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -327,7 +326,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -483,60 +482,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -546,9 +505,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -556,8 +515,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -576,24 +533,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-s390.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-s390.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-s390 (Version 2.6.30)
+# spec file for package kernel-s390 (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-s390
 Summary:        The Standard Kernel
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -144,6 +144,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -176,20 +177,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -217,19 +221,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -328,7 +327,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -484,60 +483,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -547,9 +506,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -557,8 +516,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -577,24 +534,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-source.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-source.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-source (Version 2.6.30)
+# spec file for package kernel-source (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -29,7 +29,7 @@
 # macro to add the source timestamp to package descriptions
 %define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -40,8 +40,8 @@
 
 Name:           kernel-source
 Summary:        The Linux Kernel Sources
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif

kernel-syms.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-syms.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-syms (Version 2.6.30)
+# spec file for package kernel-syms (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -31,8 +31,8 @@
 
 Name:           kernel-syms
 Summary:        Kernel Symbol Versions (modversions)
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %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)
@@ -48,6 +48,9 @@ Requires:       kernel-debug-devel = %version-%source_rel
 %ifarch %ix86 ia64 ppc ppc64 s390x x86_64
 Requires:       kernel-default-devel = %version-%source_rel
 %endif
+%ifarch %ix86 x86_64
+Requires:       kernel-desktop-devel = %version-%source_rel
+%endif
 %ifarch ppc ppc64
 Requires:       kernel-kdump-devel = %version-%source_rel
 %endif

kernel-trace.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-trace.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-trace (Version 2.6.30)
+# spec file for package kernel-trace (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-trace
 Summary:        The Realtime Linux Kernel
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -140,6 +140,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -172,20 +173,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -213,19 +217,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -324,7 +323,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -480,60 +479,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -543,9 +502,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -553,8 +512,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -573,24 +530,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-vanilla.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-vanilla.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-vanilla (Version 2.6.30)
+# spec file for package kernel-vanilla (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-vanilla
 Summary:        The Standard Kernel - without any SUSE patches
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -148,6 +148,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -180,20 +181,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -221,19 +225,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -332,7 +331,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -488,60 +487,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -551,9 +510,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -561,8 +520,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -581,24 +538,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

kernel-xen.changes

@@ -1,3 +1,129 @@
+-------------------------------------------------------------------
+Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on all flavors
+  (FATE#305694)
+
+-------------------------------------------------------------------
+Mon Jul 20 17:26:02 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.30.2
+  - lots of security and bug fixes
+  - Obsoleted patches.fixes/firmware-memmap-64bit.diff
+
+-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
+Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
+
+- rpm/package-descriptions: Added desktop description.
+
+-------------------------------------------------------------------
+Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
+
+- Add -desktop flavors for i386 and x86_64 (FATE#305694)
+  - Disabled group scheduler and groups
+  - Disabled optimize for size
+  - Enabled full preemption
+  - Set HZ=1000
+
+-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+  function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
+Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/apparmor.diff: ia64 build fix
+
+-------------------------------------------------------------------
+Fri Jul 17 00:06:19 CEST 2009 - jeffm@suse.com
+
+- patches.apparmor/security-default-lsm: security: Define default
+  LSM (bnc#442668).
+
+-------------------------------------------------------------------
+Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
+
+- patches.apparmor/apparmor.diff: AppArmor.
+
+-------------------------------------------------------------------
+Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix debugsource generation.
+
+-------------------------------------------------------------------
+Thu Jul 16 10:46:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix last change.
+
+-------------------------------------------------------------------
+Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: fix for module names with underscores or
+  dashes.
+
+-------------------------------------------------------------------
+Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: annotate in which products the
+  obsoleted kmps were last used, remove "ralink-rt2860-kmp" which
+  I couldn't find anywhere.
+
+-------------------------------------------------------------------
+Wed Jul 15 16:50:44 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete btusb-kmp (bnc#514375).
+
+-------------------------------------------------------------------
+Tue Jul 14 15:37:36 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/split-modules: move generating of
+  the base / main / unsupported module lists to a separate script.
+  Avoids 6k modinfo calls and fixes module dependencies
+  (bnc#512179).
+
+-------------------------------------------------------------------
+Mon Jul 13 22:10:13 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: fix include2/asm symlink (bnc#509680).
+
+-------------------------------------------------------------------
+Mon Jul 13 16:55:56 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of function symbols.
+
+-------------------------------------------------------------------
+Mon Jul 13 16:13:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: fix overriding of unknown symbols.
+
+-------------------------------------------------------------------
+Tue Jul  7 14:30:30 CEST 2009 - jkosina@suse.de
+
+- patches.suse/e1000e_allow_bad_checksum: Delete.
+- patches.suse/e1000e_call_dump_eeprom: Delete.
+- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory:
+  Delete.
+
+Delete the leftover debugging patches for e1000e EEPROM corruption
+that are not needed anymore.
+
+-------------------------------------------------------------------
+Tue Jul  7 12:03:10 CEST 2009 - aj@suse.de
+
+- README.BRANCH: Update, kotd will become 11.2 eventually.
+
 -------------------------------------------------------------------
 Fri Jul  3 15:41:08 CEST 2009 - mmarek@suse.cz
 

kernel-xen.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-xen (Version 2.6.30)
+# spec file for package kernel-xen (Version 2.6.30.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,7 +34,7 @@
 %define build_vanilla	(%build_flavor == "vanilla")
 %define build_ps3	(%build_flavor == "ps3")
 %define srcversion 2.6.30
-%define patchversion 2.6.30
+%define patchversion 2.6.30.2
 %define variant %{nil}
 %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
 %define kernelrelease %patchversion-%release_major
@@ -43,7 +43,7 @@
 %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,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
 %define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
 %define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
@@ -61,8 +61,8 @@
 
 Name:           kernel-xen
 Summary:        The Xen Kernel
-Version:        2.6.30
+Version:        2.6.30.2
-Release:        10
+Release:        1
 %if %using_buildservice
 %else
 %endif
@@ -140,6 +140,7 @@ Source44:       find-provides
 Source45:       module-renames
 Source46:       modversions
 Source47:       symsets.pl
+Source48:       split-modules
 Source100:      config.tar.bz2
 Source101:      patches.arch.tar.bz2
 Source102:      patches.drivers.tar.bz2
@@ -172,20 +173,23 @@ 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
-Obsoletes:      uvcvideo-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:      uvcvideo-kmp
+Obsoletes:      btusb-kmp
-Obsoletes:      ralink-rt2860-kmp
 # Build with bash instead of sh as the shell: this turns on bash
 # extensions like <(...).
 %define _buildshell /bin/bash
@@ -216,19 +220,14 @@ echo "Symbol(s):" %symbols
 %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 %symbols $* < %_sourcedir/supported.conf | sort -u
+	%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
 }
 # Generate the list of modules to be marked as supported
 {   supported_conf base
-    for how in external; do
+    supported_conf --default=0 external | sed 's/$/ external/'
-	comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
+} > %kernel_build_dir/Module.supported
-	    | sed -e 's:$: '"$how"':'
+supported_conf --default=0 base >%kernel_build_dir/Module.base
-    done
-} | sed -e 's,.*/,,' -e 's,\.ko$,,' > %kernel_build_dir/Module.supported
-# Create grep pattern file for the modules to end up in the base package
-comm -2 -3 <(supported_conf base) <(supported_conf) \
-    | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
-    > %my_builddir/grep-for-base-modules
 cd linux-%srcversion
 # Apply patches
 echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
@@ -327,7 +326,7 @@ add_vmlinux()
 	    --strip-debug \
 	    %buildroot/$vmlinux || :
     mkdir -p %buildroot/usr/src/debug
-    LANG=C sort -z -u vmlinux.sourcefiles | grep -z -v "<built-in>" \
+    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
@@ -483,60 +482,20 @@ if [ %CONFIG_MODULES = y ]; then
 	exit 1
     fi
 %if %split_packages
-    # Generate the lists of supported and unsupported modules.
+    %_sourcedir/split-modules -d %buildroot \
-    (   cd %buildroot
+%if ! %supported_modules_check
-	: > %my_builddir/supported-modules
+	-i \
-	: > %my_builddir/unsupported-modules
+%endif
-	for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
+	-o %my_builddir \
-	    case "$(/sbin/modinfo -F supported $module)" in
+	-b %kernel_build_dir/Module.base \
-	    (yes|external)
+	-s %kernel_build_dir/Module.supported
-		modname=$(basename $module .ko)
-		deps=$(/sbin/modinfo -F depends $module|tr ',' ' ')
-		echo "$modname: $deps" >> %my_builddir/Makefile.supported
-		echo "/$module" >> %my_builddir/supported-modules
-		;;
-	    (*)
-		echo "/$module" >> %my_builddir/unsupported-modules
-		;;
-	    esac
-	done
-    )
-    add_dependent_modules() {
-	local modules_dep=$1
-	xargs -r make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep)
-    }
-    modules_dep=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep
-    # Make sure that no supported modules depend on any unsupported modules.
-    dependent_unsupported_modules=$(
-	OUT=$(mktemp)
-	sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \
-		    xargs -r make -rRsk -f %my_builddir/Makefile.supported > $OUT
-	sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'"
-    )
-    if [ -n "$dependent_unsupported_modules" ]; then
-	echo "The following unsupported modules are used by supported modules:"
-	echo "$dependent_unsupported_modules"
-	echo "Please fix supported.conf."
-	if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then
-		exit 1
-	fi
-    fi
-    # Compute the list of base modules: modules that core modules depend on
-    # implicitly are also core modules.
-    grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \
-    | add_dependent_modules $modules_dep > %my_builddir/base-modules
-    # All supported modules which are not core modules belong in %name.
-    comm -3 <(sort %my_builddir/supported-modules) \
-	    <(sort %my_builddir/base-modules) \
-	> %my_builddir/main-modules
 %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
-    KABI=0
+    if [ -z "fixme-broken" ]; then
-    if [ -n "$reference" ]; then
         %_sourcedir/symsets.pl --check-kabi \
             $reference \
             --symvers=Module.symvers.split \
@@ -546,9 +505,9 @@ if [ %CONFIG_MODULES = y ]; then
             --commonsyms=%my_builddir/kabi/commonsyms \
             --usedsyms=%my_builddir/kabi/usedsyms \
             --severities=%my_builddir/kabi/severities \
-            --max-badness=%tolerate_kabi_changes || KABI=$?
+            --max-badness=%tolerate_kabi_changes
     fi
-    if [ $KABI -ne 0 ]; then
+    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" \
@@ -556,8 +515,6 @@ if [ %CONFIG_MODULES = y ]; then
 		 "higher than allowed for an official kernel."
 	   exit 1
 	fi
-	# Indicate the ABI badness in build result emails.
-	echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
     fi
     # Set up some module aliases
     install -d -m 755 %buildroot/etc/modprobe.d/
@@ -576,24 +533,27 @@ if [ %CONFIG_MODULES = y ]; then
     # 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() {
-    local filelist
+    sed -rn '
-    filelist=$(cat "$@")
+        # print file name
-    echo "$filelist"
+        p
-    # Below, we do this:
+        # remove filelist macros
-    # - remove filelist macros
+        s:%%%%[a-z]+(\([^)]+\))? ?::g
-    # - remove last pathname component
+        # add %%%%dir prefix
-    # - generate all parents and make the list unique
+        s:^:%%%%dir :
-    # - skip directories owned be other packages
+        # print all parents
-    # - add the %dir prefix (double-escaped for find and rpm)
+        :a
-    echo "$filelist" \
+            # skip directories owned by other packages
-    | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
+            s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
-    | sed -re 's:/[^/]+$::' \
+            s:/[^/]+$::p
-    | sed -nre ':a; p; s:/[^/]+$::; ta' \
+        ta
-    | sort -u \
+    ' "$@" | sort -u
-    | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
-    | sed -e 's:^:%%%%dir :'
 }
 # Collect the file lists.
 shopt -s nullglob

modversions

@@ -29,6 +29,7 @@ sub expand_types($) {
 	    $locally_defined{$_} = 1;
 
 	    if ($locally_unknown{$_}) {
+                print "override " if $override_locally{$_};
 		print "$_ $symbol_type_name{$1} $2 { UNKNOWN } \n";
 	    } else {
 		if (!exists $definitions{$_}) {
@@ -137,6 +138,8 @@ sub unpack_dump($$) {
 		$override_locally{$sym} = $override;
 	    }
 	    next;
+	} elsif (/^([^# ]*)/) {
+		$override_locally{$1} = $override;
 	}
 	expand_types($_);
     }

package-descriptions

@@ -20,6 +20,22 @@ The Standard Kernel
 
 The standard kernel for both uniprocessor and multiprocessor systems.
 
+=== kernel-desktop ===
+Kernel optimized for the desktop
+
+This kernel is optimized for the desktop. It is configured for lower latency
+and has many of the features that aren't usually used on desktop machines
+disabled.
+
+This kernel upports up to 64GB of main memory. It requires Physical
+Addressing Extensions (PAE), which were introduced with the Pentium Pro
+processor.
+
+PAE is not only more physical address space but also important for the
+"no execute" feature which disables execution of code that is marked as
+non-executable. Therefore, the PAE kernel should be used on any systems
+that support it, regardless of the amount of main memory.
+
 === kernel-kdump ===
 kernel for kdump
 

patches.apparmor.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4848e8f1d0a677ed36945ce3f7ff6115149a13e3c64269b25ab94d1585732eaf
+oid sha256:af0f1964af70db8e9571e7448da8cbb4ac4a291d84e0e4d120c107b49e87837e
-size 60066
+size 37020

patches.fixes.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fab25f3dd5a137eb03a7723d42391914712f11e42b95e9776cc248d8bbdb7db3
+oid sha256:0aaf40cff1c4c17fdd9cad118ca9ec6fd4c41a676c8ee718b7d82fc8f13f1aac
-size 32231
+size 31265

patches.kernel.org.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05ecc844c2a70942c00a68e4adc00d56fbb22a0ea509c790bf999432b6a9e694
+oid sha256:064acc90d63301a85f18bc24aa10ea34bc3fa983b171e8afe4cae498a0e082f7
-size 4066
+size 55272

patches.suse.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a599da119eb2dc0170960a29209f3228a3a3d9f3228dc2767706800d1900336
+oid sha256:7adaa360c51978770a52d802b16b1e7c68defd3aa6694197b31806441096a6fc
-size 877218
+size 874216

series.conf

@@ -27,6 +27,7 @@
 	# DO NOT MODIFY THEM!
 	# Send separate patches upstream if you find a problem...
 	########################################################
+	patches.kernel.org/patch-2.6.30.2
 
         ########################################################
         # Build fixes that apply to the vanilla kernel too.
@@ -350,9 +351,6 @@
 	#
 	########################################################
 
-	patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory
-	patches.suse/e1000e_allow_bad_checksum
-	patches.suse/e1000e_call_dump_eeprom
 	patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch
 
 	########################################################
@@ -510,62 +508,8 @@
 	##########################################################
 	# AppArmor
 	##########################################################
-
+	patches.apparmor/apparmor.diff
-+needs_update	patches.apparmor/security-create.diff
+	patches.apparmor/security-default-lsm
-+needs_update	patches.apparmor/remove_suid.diff
-+needs_update	patches.apparmor/vfs-notify_change.diff
-+needs_update	patches.apparmor/security-setattr.diff
-+needs_update	patches.apparmor/vfs-mkdir.diff
-+needs_update	patches.apparmor/security-mkdir.diff
-+needs_update	patches.apparmor/vfs-mknod.diff
-+needs_update	patches.apparmor/security-mknod.diff
-+needs_update	patches.apparmor/vfs-symlink.diff
-+needs_update	patches.apparmor/security-symlink.diff
-+needs_update	patches.apparmor/security-readlink.diff
-+needs_update	patches.apparmor/vfs-link.diff
-+needs_update	patches.apparmor/security-link.diff
-+needs_update	patches.apparmor/vfs-rmdir.diff
-+needs_update	patches.apparmor/security-rmdir.diff
-+needs_update	patches.apparmor/fix-vfs_rmdir.diff
-+needs_update	patches.apparmor/vfs-unlink.diff
-+needs_update	patches.apparmor/security-unlink.diff
-+needs_update	patches.apparmor/vfs-rename.diff
-+needs_update	patches.apparmor/security-rename.diff
-+needs_update	patches.apparmor/vfs-setxattr.diff
-+needs_update	patches.apparmor/security-setxattr.diff
-+needs_update	patches.apparmor/vfs-getxattr.diff
-+needs_update	patches.apparmor/security-getxattr.diff
-+needs_update	patches.apparmor/vfs-listxattr.diff
-+needs_update	patches.apparmor/security-listxattr.diff
-+needs_update	patches.apparmor/vfs-removexattr.diff
-+needs_update	patches.apparmor/security-removexattr.diff
-+needs_update	patches.apparmor/unambiguous-__d_path.diff #see bnc#490902
-+needs_update	patches.apparmor/d_namespace_path.diff
-+needs_update	patches.apparmor/d_namespace_path_oops_fix.diff
-+needs_update	patches.apparmor/fsetattr.diff
-+needs_update	patches.apparmor/fsetattr-reintro-ATTR_FILE.diff
-+needs_update	patches.apparmor/fsetattr-restore-ia_file.diff
-+needs_update	patches.apparmor/file-handle-ops.diff
-+needs_update	patches.apparmor/security-xattr-file.diff
-+needs_update	patches.apparmor/sysctl-pathname.diff
-+needs_update	patches.apparmor/add-security_path_permission
-+needs_update	patches.apparmor/add-path_permission.diff
-+needs_update	patches.apparmor/do_path_lookup-nameidata.diff
-+needs_update	patches.apparmor/apparmor-audit.diff
-+needs_update	patches.apparmor/apparmor-main.diff
-+needs_update	patches.apparmor/apparmor-lsm.diff
-+needs_update	patches.apparmor/apparmor-path_permission
-+needs_update	patches.apparmor/apparmor-module_interface.diff
-+needs_update	patches.apparmor/apparmor-misc.diff
-+needs_update	patches.apparmor/apparmor-intree.diff
-+needs_update	patches.apparmor/apparmor-network.diff
-+needs_update	patches.apparmor/apparmor-rlimits.diff
-+needs_update	patches.apparmor/apparmor-2.6.25.diff
-+needs_update	patches.apparmor/apparmor-ptrace-2.6.27.diff
-+needs_update	patches.apparmor/fix-complain.diff
-+needs_update	patches.apparmor/fix-security-param.diff
-+needs_update	patches.apparmor/fork-tracking.diff
-+needs_update	patches.apparmor/export-security_inode_permission-for-aufs
 
 	########################################################
 	# Address space layout randomization
@@ -593,7 +537,6 @@
         # Kdump
         ########################################################
 	patches.suse/kdump-dump_after_notifier.patch
-	patches.fixes/firmware-memmap-64bit.diff
 
         ########################################################
 	# cgroups

source-timestamp

@@ -1,3 +1,3 @@
-2009-07-03 15:42:01 +0200
+2009-07-20 20:31:16 +0200
-GIT Revision: 552ac07fad75ec23504ade2fbfecc5853791e02a
+GIT Revision: f92072d365019df63887941412a8ba5893839135
 GIT Branch: master

split-modules

@@ -0,0 +1,102 @@
+#!/bin/bash
+# 
+# given a Module.supported, Module.base and modules.dep, generate list
+# of base / supported / unsupported modules
+
+set -e
+export LC_COLLATE=C
+
+usage()
+{
+	echo "Usage: ${0##*/} -b Module.base -s Module.supported [-d dir] [-i] [-o outdir]"
+}
+
+options=$(getopt -o b:s:d:o:i -- "$@")
+if test $? -ne 0; then
+	usage >&2
+	exit 1
+fi
+eval set -- "$options"
+opt_base=
+opt_supp=
+opt_out=.
+opt_dir=.
+opt_ignore_errors=false
+while test $# -gt 0; do
+	opt=$1
+	shift
+	case "$opt" in
+	-b | -s | -d | -o | -D)
+		arg=$1
+		shift
+	esac
+	case "$opt" in
+	-b)
+		opt_base=$arg ;;
+	-s)
+		opt_supp=$arg ;;
+	-d)
+		opt_dir=$arg ;;
+	-o)
+		opt_out=$arg ;;
+	-i)
+		opt_ignore_errors=true ;;
+	--)
+		break ;;
+	*)
+		echo "Unknown option $opt" >&2
+		exit 1
+	esac
+done
+if test -z "$opt_base" -o -z "$opt_supp"; then
+	usage >&2
+	exit 1
+fi
+
+trap 'rm -rf "$tmp"' EXIT
+tmp=$(mktemp -d)
+mkdir "$tmp/empty"
+
+find "$opt_dir" -type f -name '*.ko' -printf '/%P\n' | \
+	awk -F/ '{ n=$NF; gsub(/-/, "_", n); sub(/\.ko$/, "", n); print n " " $0; }' | \
+	sort >"$tmp/all"
+
+modules_dep=$(find "$opt_dir" -type f -name modules.dep)
+if test -z "$modules_dep"; then
+	echo "Cannot find modules.dep in $opt_dir" >&2
+	exit 1
+fi
+(
+	echo -e  '%:\n\t@echo $@'
+	sed -r 's:[^ ]*/([^/]*)\.ko\>:\1:g; y/-/_/' "$modules_dep"
+) >"$tmp/dep"
+
+add_dependent_modules()
+{
+	xargs -r make -rRs -C "$tmp/empty" -f "$tmp/dep" | sort -u
+}
+
+# base
+sed 'y/-/_/' <"$opt_base" | add_dependent_modules >"$tmp/base"
+join -j 1 -o 2.2 "$tmp/base" "$tmp/all" >"$opt_out/base-modules"
+
+# main
+sed 's/ .*//; y/-/_/' "$opt_supp" | sort -u >"$tmp/supp"
+add_dependent_modules <"$tmp/supp" >"$tmp/supp-all"
+if ! cmp -s "$tmp/supp" "$tmp/supp-all"; then
+	echo "The following unsupported modules are used by supported modules:" >&2
+	join -v2 "$tmp/supp" "$tmp/supp-all" >&2
+	echo "Please fix supported.conf." >&2
+	if ! $opt_ignore_errors; then
+		exit 1
+	fi
+fi
+join -v 2 "$tmp/base" "$tmp/supp-all" >"$tmp/supp"
+join -j 1 -o 2.2 "$tmp/supp" "$tmp/all" >"$opt_out/main-modules"
+
+# unsupported
+join -j 1 -v 2 -o 2.2 "$tmp/supp-all" "$tmp/all" >"$opt_out/unsupported-modules"
+
+exit 0
+
+