Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Tue Aug 18 12:35:43 CEST 2009.
--------
--- kernel-source/kernel-debug.changes 2009-08-06 23:30:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-08-17 22:50:17.000000000 +0200
@@ -1,0 +2,150 @@
+Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
+
+- patches.drivers/samsung-backlight-driver.patch: Change the range from
+ 0-255 to 0-7 to make it easier for HAL to handle the device without a
+ need for custom scripts.
+
+-------------------------------------------------------------------
+Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
+
+- Updated to 2.6.31-rc6.
+
+-------------------------------------------------------------------
+Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
+
+- patches.drivers/samsung-backlight-driver.patch: added N120 support
+ and some other devices that were integrated into the driver from
+ upstream.
+
+-------------------------------------------------------------------
+Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
+
+- supported.conf:
+ set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
+ separately in the ocfs2 KMP package
+
+-------------------------------------------------------------------
+Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
+ clean up IDT92HD83xxx codec parser (bnc#531533).
+
+-------------------------------------------------------------------
+Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
+
+- Update config files.
+- patches.drivers/samsung-backlight-driver.patch: Samsung
+ backlight driver (bnc#527533, bnc#531297).
+
+-------------------------------------------------------------------
+Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
+ macro (bnc#530535).
+
+-------------------------------------------------------------------
+Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/modversions: for overriden functions, keep the keyword in
+ --pack.
+
+-------------------------------------------------------------------
+Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
+
+- Updated to 2.6.31-rc5-git9.
+ - Eliminated 7 patches.
+
+------------------------------------------------------------------
+Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
+ quirks for some HP laptops (bnc#527284).
+- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
+ support
+- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
+ Enable line-out detection only with speakers (bnc#520975).
+
+-------------------------------------------------------------------
+Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
+ also to the main package. That way, kernel-$flavor-base is not
+ needed in normal setups (fate#307154).
+
+-------------------------------------------------------------------
+Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: no rpm provides for drivers/staging. It's
+ higly unlikely that any KMP would require them and they just
+ take up space in the rpm metadata.
+
+-------------------------------------------------------------------
+Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
+ a white-list for MSI option (bnc#529971).
+
+-------------------------------------------------------------------
+Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
+ ALSA: hda - Don't override ADC definitions for ALC codecs
+ (bnc#529467).
+- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
+ ALSA: hda - Add auto-mic support for Realtek codecs.
+
+-------------------------------------------------------------------
+Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
+ for the -rt variant.
+
+-------------------------------------------------------------------
+Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
+
+- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
+ patches.rpmify to fix vanilla ppc builds.
+
+-------------------------------------------------------------------
+Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
+ Add missing vmaster initialization for ALC269 (bnc#527361).
+
+-------------------------------------------------------------------
+Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
+
+-------------------------------------------------------------------
+Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
+
+- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
+ update_funcs() call.
+
+-------------------------------------------------------------------
+Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
+ DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
+
+-------------------------------------------------------------------
+Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
+
+- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
+ wmi: Fix kernel panic when stack protection
+ enabled. (bnc#529177).
+- supported.conf: Update HD-audio modules
+
+-------------------------------------------------------------------
+Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
+
+- make config/s390/vanilla a symlink again.
+
+-------------------------------------------------------------------
+Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
+
+- rpm/kernel-binary.spec.in: do not manually extract vmlinux
+ debuginfo on ppc(64), rpm does it itself.
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-kdump.changes: same change
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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor debug
@@ -49,7 +49,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -277,6 +289,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -296,10 +319,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -376,17 +405,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -582,7 +604,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -613,7 +636,6 @@
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
@@ -746,6 +768,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor default
@@ -49,7 +49,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -292,6 +304,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -311,10 +334,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -391,17 +420,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -597,7 +619,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -628,7 +651,6 @@
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
@@ -759,6 +781,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor desktop
@@ -49,7 +49,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -287,6 +299,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -306,10 +329,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -386,17 +415,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -592,7 +614,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -623,7 +646,6 @@
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
@@ -776,6 +798,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor kdump
@@ -49,7 +49,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -279,6 +291,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -298,10 +321,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -378,17 +407,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -584,7 +606,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -615,7 +638,6 @@
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
@@ -752,6 +774,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor pae
@@ -49,7 +49,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -287,6 +299,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -306,10 +329,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -386,17 +415,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -592,7 +614,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -623,7 +646,6 @@
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
@@ -768,6 +790,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ppc64
@@ -49,7 +49,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -287,6 +299,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -306,10 +329,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -386,17 +415,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -592,7 +614,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -623,7 +646,6 @@
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
@@ -768,6 +790,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ps3
@@ -49,7 +49,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -279,6 +291,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -298,10 +321,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -378,17 +407,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -584,7 +606,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -615,7 +638,6 @@
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
@@ -752,6 +774,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor s390
@@ -49,7 +49,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -280,6 +292,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -299,10 +322,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -379,17 +408,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -585,7 +607,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -616,7 +639,6 @@
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
@@ -747,6 +769,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:41.000000000 +0200
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define src_install_dir usr/src/linux-%kernelrelease%variant
@@ -30,7 +30,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -45,7 +45,7 @@
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh
-Source3: %name.rpmlintrc
+Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
Source9: devel-post.sh
Source10: preun.sh
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:42.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:42.000000000 +0200
@@ -23,7 +23,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.31
-Release: 2
+Release: 3
%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)
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:42.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:42.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor trace
@@ -49,7 +49,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -276,6 +288,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -295,10 +318,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -375,17 +404,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -581,7 +603,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -612,7 +635,6 @@
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
@@ -743,6 +765,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:42.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:42.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor vanilla
@@ -49,7 +49,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.31
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -284,6 +296,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -303,10 +326,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -383,17 +412,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -589,7 +611,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -620,7 +643,6 @@
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
@@ -751,6 +773,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:42.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:42.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc5-git3
+%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor xen
@@ -49,7 +49,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.31
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -61,7 +61,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -279,6 +291,17 @@
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -298,10 +321,16 @@
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -378,17 +407,10 @@
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -584,7 +606,8 @@
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -615,7 +638,6 @@
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
@@ -752,6 +774,9 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
+
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ config.tar.bz2 ++++++
++++ 1615 lines of diff (skipped)
++++++ find-provides ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:43.000000000 +0200
@@ -2,7 +2,7 @@
trap 'rm -f "$filelist"' EXIT
filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX)
-cat >"$filelist"
+grep -v '/kernel/drivers/staging/.*\.ko$' >"$filelist"
shopt -s nullglob
# pretend that /boot/vmlinux-* is in the -base package and not in -devel
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:43.000000000 +0200
@@ -69,7 +69,19 @@
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
-Requires: %name-base_%_target_cpu = %version-%release
+Provides: kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides: %name-base = %version-%release
+#Obsoletes: %name-base <= %version-%release
+# What we want is
+# 11.1 -> 11.2
+# base,main -> main
+# base -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -313,6 +325,17 @@
%_sourcedir/modversions --unpack . < $_
fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+# build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+# kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -338,10 +361,17 @@
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
+
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@@ -422,17 +452,10 @@
%endif
for sub in '-base' '' '-extra'; do
- if \
-%if %split_base
- [ "x$sub" = "x-base" ];
-%else
- [ "x$sub" = "x" ];
-%endif
- then
- base_package=1
- else
- base_package=0
- fi
+ case "$sub" in
+ '-base' | '') base_package=1 ;;
+ *) base_package=0 ;;
+ esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@@ -655,7 +678,8 @@
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
- add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+ add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+ > %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -684,7 +708,6 @@
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
@@ -806,6 +829,8 @@
%source_timestamp
+%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
+%endif
%changelog
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:43.000000000 +0200
@@ -49,7 +49,7 @@
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh
-Source3: %name.rpmlintrc
+Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
Source9: devel-post.sh
Source10: preun.sh
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:46.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ modversions ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:46.000000000 +0200
@@ -89,6 +89,8 @@
}
}
}
+ } elsif ($override) {
+ $_ = "$override$_";
}
print "$_\n";
}
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.Lp3K8Y/_old 2009-08-18 12:29:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp3K8Y/_new 2009-08-18 12:29:46.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.arch.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled new/patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled
--- old/patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled 2009-08-07 15:16:43.000000000 +0200
@@ -0,0 +1,72 @@
+From: Costantino Leandro