Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Tue Jul 21 12:13:46 CEST 2009.
--------
--- kernel-source/kernel-debug.changes 2009-07-04 04:06:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-07-20 20:40:34.000000000 +0200
@@ -1,0 +2,126 @@
+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.
+
+-------------------------------------------------------------------
kernel-default.changes: same change
New Changes file:
--- /dev/null 2009-04-14 11:55:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-desktop.changes 2009-07-20 20:40:40.000000000 +0200
@@ -0,0 +1,50239 @@
+-------------------------------------------------------------------
+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
+
+- patches.suse/kbuild-generate-modules.builtin: kbuild: generate
+ modules.builtin.
+- rpm/kernel-binary.spec.in: package modules.builtin for use by
+ modprobe / mkinitrd.
+
+-------------------------------------------------------------------
+Fri Jul 3 14:44:00 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in: simplify
+ the patch applying loops to reduce noise in build logs.
+
+-------------------------------------------------------------------
+Tue Jun 30 19:28:22 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: chmod +x find-provides
+
+-------------------------------------------------------------------
+Tue Jun 30 13:17:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: do not "annotate" the packaged
+ Modules.symvers
+- patches.suse/modpost-filter-out-built-in-depends: Delete.
+
+-------------------------------------------------------------------
+Tue Jun 30 11:35:47 CEST 2009 - jbeulich@novell.com
+
+- patches.arch/ia64-page-migration: Fix compiler warning.
+
+-------------------------------------------------------------------
+Mon Jun 29 19:50:25 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: move /boot/symvers* files back to
+ -base, these are needed during KMP installation.
+
+-------------------------------------------------------------------
+Mon Jun 29 19:49:16 CEST 2009 - mmarek@suse.cz
+
+- patches.fixes/kbuild-fix-generating-of-.symtypes-files: kbuild:
+ fix generating of *.symtypes files.
+- patches.suse/genksyms-add-override-flag.diff: Refresh.
+- rpm/kernel-binary.spec.in: create the *.symref files in the build
+ directory
+
+-------------------------------------------------------------------
+Fri Jun 26 19:04:30 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: add Provides: kernel-{base,extra} to
+ the subpackages (bnc#516827).
+
+-------------------------------------------------------------------
+Wed Jun 24 15:51:48 CEST 2009 - gregkh@suse.de
+
+- Update config files.
+ revert the ACPI and thermal config changes:
+ config/i386/pae and config/x86-64/default:
+ CONFIG_ACPI_AC=m
+ CONFIG_ACPI_BATTERY=m
+ CONFIG_ACPI_BUTTON=m
+ CONFIG_ACPI_VIDEO=m
+ CONFIG_ACPI_FAN=m
+ CONFIG_ACPI_PROCESSOR=m
+ CONFIG_ACPI_THERMAL=m
+ CONFIG_ACPI_CONTAINER=m
+ CONFIG_X86_ACPI_CPUFREQ=m
+ CONFIG_THERMAL=m
+
+-------------------------------------------------------------------
+Wed Jun 24 15:48:06 CEST 2009 - gregkh@suse.de
++++ 50042 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-desktop.changes
--- kernel-source/kernel-kdump.changes 2009-07-04 04:06:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-kdump.changes 2009-07-20 20:40:44.000000000 +0200
@@ -1,0 +2,126 @@
+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.
+
+-------------------------------------------------------------------
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
Old:
----
TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS
New:
----
kernel-desktop.changes
kernel-desktop.spec
split-modules
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:55.000000000 +0200
@@ -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
-Release: 10
+Version: 2.6.30.2
+Release: 1
%if %using_buildservice
%else
%endif
@@ -140,6 +140,7 @@
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: 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: ralink-rt2860-kmp
+Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -214,19 +218,14 @@
%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
- comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
- | sed -e 's:$: '"$how"':'
- 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
+ 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
@@ -325,7 +324,7 @@
--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 @@
exit 1
fi
%if %split_packages
- # Generate the lists of supported and unsupported modules.
- ( cd %buildroot
- : > %my_builddir/supported-modules
- : > %my_builddir/unsupported-modules
- for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
- case "$(/sbin/modinfo -F supported $module)" in
- (yes|external)
- 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
+ %_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
- KABI=0
- if [ -n "$reference" ]; then
+ if [ -z "fixme-broken" ]; then
%_sourcedir/symsets.pl --check-kabi \
$reference \
--symvers=Module.symvers.split \
@@ -544,9 +503,9 @@
--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 @@
"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 @@
# 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
- filelist=$(cat "$@")
- echo "$filelist"
- # Below, we do this:
- # - remove filelist macros
- # - remove last pathname component
- # - generate all parents and make the list unique
- # - skip directories owned be other packages
- # - add the %dir prefix (double-escaped for find and rpm)
- echo "$filelist" \
- | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
- | 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 :'
+ 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
kernel-default.spec: same change
++++++ kernel-desktop.spec ++++++
++++ 771 lines (skipped)
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:55.000000000 +0200
@@ -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
-Release: 10
+Version: 2.6.30.2
+Release: 1
%if %using_buildservice
%else
%endif
@@ -140,6 +140,7 @@
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: 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: ralink-rt2860-kmp
+Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -216,19 +220,14 @@
%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
- comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
- | sed -e 's:$: '"$how"':'
- 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
+ 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
@@ -327,7 +326,7 @@
--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 @@
exit 1
fi
%if %split_packages
- # Generate the lists of supported and unsupported modules.
- ( cd %buildroot
- : > %my_builddir/supported-modules
- : > %my_builddir/unsupported-modules
- for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
- case "$(/sbin/modinfo -F supported $module)" in
- (yes|external)
- 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
+ %_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
- KABI=0
- if [ -n "$reference" ]; then
+ if [ -z "fixme-broken" ]; then
%_sourcedir/symsets.pl --check-kabi \
$reference \
--symvers=Module.symvers.split \
@@ -546,9 +505,9 @@
--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 @@
"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 @@
# 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
- filelist=$(cat "$@")
- echo "$filelist"
- # Below, we do this:
- # - remove filelist macros
- # - remove last pathname component
- # - generate all parents and make the list unique
- # - skip directories owned be other packages
- # - add the %dir prefix (double-escaped for find and rpm)
- echo "$filelist" \
- | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
- | 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 :'
+ 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
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:55.000000000 +0200
@@ -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
-Release: 6
+Version: 2.6.30.2
+Release: 1
%if %using_buildservice
%else
%endif
@@ -144,6 +144,7 @@
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: 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: ralink-rt2860-kmp
+Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -224,19 +228,14 @@
%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
- comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
- | sed -e 's:$: '"$how"':'
- 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
+ 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
@@ -335,7 +334,7 @@
--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 @@
exit 1
fi
%if %split_packages
- # Generate the lists of supported and unsupported modules.
- ( cd %buildroot
- : > %my_builddir/supported-modules
- : > %my_builddir/unsupported-modules
- for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
- case "$(/sbin/modinfo -F supported $module)" in
- (yes|external)
- 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
+ %_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
- KABI=0
- if [ -n "$reference" ]; then
+ if [ -z "fixme-broken" ]; then
%_sourcedir/symsets.pl --check-kabi \
$reference \
--symvers=Module.symvers.split \
@@ -554,9 +513,9 @@
--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 @@
"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 @@
# 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
- filelist=$(cat "$@")
- echo "$filelist"
- # Below, we do this:
- # - remove filelist macros
- # - remove last pathname component
- # - generate all parents and make the list unique
- # - skip directories owned be other packages
- # - add the %dir prefix (double-escaped for find and rpm)
- echo "$filelist" \
- | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
- | 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 :'
+ 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
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:55.000000000 +0200
@@ -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
-Release: 10
+Version: 2.6.30.2
+Release: 1
%if %using_buildservice
%else
%endif
@@ -144,6 +144,7 @@
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: 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: ralink-rt2860-kmp
+Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -224,19 +228,14 @@
%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
- comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
- | sed -e 's:$: '"$how"':'
- 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
+ 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
@@ -335,7 +334,7 @@
--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 @@
exit 1
fi
%if %split_packages
- # Generate the lists of supported and unsupported modules.
- ( cd %buildroot
- : > %my_builddir/supported-modules
- : > %my_builddir/unsupported-modules
- for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
- case "$(/sbin/modinfo -F supported $module)" in
- (yes|external)
- 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
+ %_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
- KABI=0
- if [ -n "$reference" ]; then
+ if [ -z "fixme-broken" ]; then
%_sourcedir/symsets.pl --check-kabi \
$reference \
--symvers=Module.symvers.split \
@@ -554,9 +513,9 @@
--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 @@
"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 @@
# 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
- filelist=$(cat "$@")
- echo "$filelist"
- # Below, we do this:
- # - remove filelist macros
- # - remove last pathname component
- # - generate all parents and make the list unique
- # - skip directories owned be other packages
- # - add the %dir prefix (double-escaped for find and rpm)
- echo "$filelist" \
- | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
- | 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 :'
+ 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
kernel-ps3.spec: same change
kernel-s390.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:55.000000000 +0200
@@ -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
-Release: 10
+Version: 2.6.30.2
+Release: 1
%if %using_buildservice
%else
%endif
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:55.000000000 +0200
@@ -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
-Release: 10
+Version: 2.6.30.2
+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 @@
%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.spec ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:55.000000000 +0200
@@ -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
-Release: 10
+Version: 2.6.30.2
+Release: 1
%if %using_buildservice
%else
%endif
@@ -140,6 +140,7 @@
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: 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: ralink-rt2860-kmp
+Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -213,19 +217,14 @@
%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
- comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
- | sed -e 's:$: '"$how"':'
- 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
+ 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
@@ -324,7 +323,7 @@
--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 @@
exit 1
fi
%if %split_packages
- # Generate the lists of supported and unsupported modules.
- ( cd %buildroot
- : > %my_builddir/supported-modules
- : > %my_builddir/unsupported-modules
- for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
- case "$(/sbin/modinfo -F supported $module)" in
- (yes|external)
- 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
+ %_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
- KABI=0
- if [ -n "$reference" ]; then
+ if [ -z "fixme-broken" ]; then
%_sourcedir/symsets.pl --check-kabi \
$reference \
--symvers=Module.symvers.split \
@@ -543,9 +502,9 @@
--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 @@
"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 @@
# 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
- filelist=$(cat "$@")
- echo "$filelist"
- # Below, we do this:
- # - remove filelist macros
- # - remove last pathname component
- # - generate all parents and make the list unique
- # - skip directories owned be other packages
- # - add the %dir prefix (double-escaped for find and rpm)
- echo "$filelist" \
- | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
- | 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 :'
+ 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
kernel-vanilla.spec: same change
kernel-xen.spec: same change
++++++ config.conf ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:56.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:56.000000000 +0200
@@ -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 ++++++
++++ 10753 lines of diff (skipped)
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:57.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:57.000000000 +0200
@@ -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 @@
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: 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: ralink-rt2860-kmp
+Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
@@ -237,21 +241,15 @@
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
- comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
- | sed -e 's:$: '"$how"':'
- 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
+ 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
@@ -371,7 +369,7 @@
--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 @@
fi
%if %split_packages
- # Generate the lists of supported and unsupported modules.
- ( cd %buildroot
- : > %my_builddir/supported-modules
- : > %my_builddir/unsupported-modules
- for module in $(find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'); do
- case "$(/sbin/modinfo -F supported $module)" in
- (yes|external)
- 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
+ %_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
- # 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 @@
%endif
# check for kabi changes
- KABI=0
- if [ -n "$reference" ]; then
+ if [ -z "fixme-broken" ]; then
%_sourcedir/symsets.pl --check-kabi \
$reference \
--symvers=Module.symvers.split \
@@ -618,9 +571,9 @@
--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 @@
"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 @@
# 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
-
- filelist=$(cat "$@")
- echo "$filelist"
-
- # Below, we do this:
- # - remove filelist macros
- # - remove last pathname component
- # - generate all parents and make the list unique
- # - skip directories owned be other packages
- # - add the %dir prefix (double-escaped for find and rpm)
-
- echo "$filelist" \
- | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
- | 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 :'
+ 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.
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:59.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:59.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ modversions ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:59.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:59.000000000 +0200
@@ -29,6 +29,7 @@
$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 @@
$override_locally{$sym} = $override;
}
next;
+ } elsif (/^([^# ]*)/) {
+ $override_locally{$1} = $override;
}
expand_types($_);
}
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:59.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:59.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ package-descriptions ++++++
--- /var/tmp/diff_new_pack.j4442K/_old 2009-07-21 12:09:59.000000000 +0200
+++ /var/tmp/diff_new_pack.j4442K/_new 2009-07-21 12:09:59.000000000 +0200
@@ -20,6 +20,22 @@
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 ++++++
++++ 19774 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/firmware-memmap-64bit.diff new/patches.fixes/firmware-memmap-64bit.diff
--- old/patches.fixes/firmware-memmap-64bit.diff 2009-06-29 19:49:45.000000000 +0200
+++ new/patches.fixes/firmware-memmap-64bit.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,121 +0,0 @@
-From 383e07a1dc4b5656fc32abaa6304804f4b683910 Mon Sep 17 00:00:00 2001
-From: Bernhard Walle