27 Nov
2009
27 Nov
'09
13:28
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Fri Nov 27 14:28:25 CET 2009.
--------
--- kernel-source/kernel-debug.changes 2009-11-04 04:05:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-11-26 15:39:35.000000000 +0100
@@ -1,0 +2,1104 @@
+Thu Nov 26 15:23:16 CET 2009 - mmarek@suse.cz
+
+- rpm/old-packages.conf: obsolete kernel-kdump on ppc.
+- config.conf: delete kdump configs.
+- config/ppc/kdump: Delete.
+- config/ppc64/kdump: Delete.
+
+-------------------------------------------------------------------
+Thu Nov 26 14:47:41 CET 2009 - duwe@suse.de
+
+- patches.arch/ppc-extended_h_cede-Export_memory_sysdev_class:
+ Refresh. Fix "typo", memory_sysdev_class should be exported
+ only to GPL'ed modules.
+
+-------------------------------------------------------------------
+Thu Nov 26 12:48:43 CET 2009 - hare@suse.de
+
+Fixup patches for series2git:
+- patches.xen/tmem: Refresh.
+- patches.xen/xen3-auto-common.diff: Refresh.
+
+-------------------------------------------------------------------
+Thu Nov 26 12:41:22 CET 2009 - duwe@suse.de
+
+- config.conf: disable build of ppc kdump flavours
+ (FATE#304346)
+
+-------------------------------------------------------------------
+Thu Nov 26 12:07:24 CET 2009 - tiwai@suse.de
+
+- patches.drivers/libata-missing-_SDD-is-not-an-error:
+ libata-acpi: missing _SDD is not an error (bnc#551942).
+
+-------------------------------------------------------------------
+Thu Nov 26 12:00:53 CET 2009 - jbenc@suse.cz
+
+- patches.fixes/mac80211-fix-spurious-delba-handling.patch:
+ mac80211: fix spurious delBA handling (bnc#558267,
+ CVE-2009-4026, CVE-2009-4027).
+
+-------------------------------------------------------------------
+Thu Nov 26 11:58:44 CET 2009 - tiwai@suse.de
+
+- patches.drivers/sky2-add-register-definitions: sky2: add
+ register definitions for new chips (bnc#544760).
+- patches.drivers/sky2-88E8059-support: sky2: 88E8059 support
+ (bnc#544760).
+- patches.drivers/sky2-optima-tcp-offload-fix: net: Fix Yukon-2
+ Optima TCP offload setup (bnc#544760).
+- patches.drivers/sky2-optima-fix-pci-cfg: net: Add missing
+ TST_CFG_WRITE bits around sky2_pci_write (bnc#544760).
+
+-------------------------------------------------------------------
+Thu Nov 26 03:44:36 CET 2009 - nfbrown@suse.de
+
+- Update config files.
+ disable CONFIG_MULTICOE_RAID456 as it is not yet stable.
+ Enable CONFIG_ASYNC_TX_DMA for FATE#306368
+
+-------------------------------------------------------------------
+Thu Nov 26 00:29:46 CET 2009 - gregkh@suse.de
+
+- clean up patch fuzz
+
+-------------------------------------------------------------------
+Thu Nov 26 00:25:25 CET 2009 - gregkh@suse.de
+
+- patches.drivers/via-unichrome-drm-bugfixes.patch: Delete.
+ it never went upstream, so we should drop it as well.
+
+-------------------------------------------------------------------
+Wed Nov 25 23:48:14 CET 2009 - tonyj@suse.de
+
+- patches.trace/lttng-*: update for 2.6.32
+- patches.trace/lttng-instrumentation-timer.patch: Delete.
+- patches.xen/tmem: Refresh.
+- patches.xen/xen3-auto-common.diff: Refresh.
+
+-------------------------------------------------------------------
+Wed Nov 25 23:09:05 CET 2009 - tonyj@suse.de
+
+- patches.fixes/oprofile_bios_ctr.patch: detect oprofile counters
+ reserved by bios (FATE#307426).
+
+-------------------------------------------------------------------
+Wed Nov 25 03:16:32 CET 2009 - jeffm@suse.com
+
+- patches.fixes/netfilter-remove-pointless-config_nf_ct_acct-warning:
+ netfilter: Remove pointless CONFIG_NF_CT_ACCT warning
+ (bnc#552033 (and others)).
+
+-------------------------------------------------------------------
+Tue Nov 24 19:04:38 CET 2009 - hare@suse.de
+
+- Update config files.
+- patches.drivers/mpt-fusion-4.22.00.00-update: Update MPT Fusion
+ driver to 4.22.00.00-suse (bnc#556587).
+- patches.drivers/mpt-fusion-4.16.00.00-update: Delete.
+
+-------------------------------------------------------------------
+Tue Nov 24 17:29:29 CET 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-17-fix-mute-LED-sync-idt92h383xxx:
+ ALSA: hda - Fix mute-LED sync on HP laptops with IDT92HD83xxx
+ codecs (bnc#547357).
+
+-------------------------------------------------------------------
+Tue Nov 24 13:56:01 CET 2009 - duwe@suse.de
+
+- patches.arch/ppc-extended_h_cede-*: Increase power savings
+ by allowing the core to sleep.
+ (FATE##307059, bnc#550447)
+
+-------------------------------------------------------------------
+Tue Nov 24 08:08:35 CET 2009 - sjayaraman@suse.de
+
+- patches.suse/kconfig-automate-kernel-desktop: automate a few config
+ options for kernel-desktop (FATE#305694).
+
+-------------------------------------------------------------------
+Tue Nov 24 07:11:22 CET 2009 - agraf@suse.de
+
+- patches.arch/kvm-only-export-selected-pv-ops-feature-structs:
+ Update references (bnc#556135, FATE#306453).
+- patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic:
+ Update references (bnc#556135, FATE#306453).
+- patches.arch/kvm-split-paravirt-ops-by-functionality: Update
+ references (bnc#556135, FATE#306453).
+- patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature:
+ Update references (bnc#556135, FATE#306453).
+
+-------------------------------------------------------------------
+Mon Nov 23 17:41:03 CET 2009 - jeffm@suse.com
+
+- Enabled:
+ patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array
+
+-------------------------------------------------------------------
+Mon Nov 23 15:44:04 CET 2009 - jkosina@suse.de
+
+- patches.arch/x86-crypto-add-ghash-algorithm-test.patch: crypto:
+ Add ghash algorithm test before provide to users (FATE#306883,
+ bnc#554578).
+
+-------------------------------------------------------------------
+Mon Nov 23 14:15:37 CET 2009 - jkosina@suse.de
+
+- patches.arch/x86-crypto-pclmulqdq-accelerated-implementation.patch:
+ incorporate "ghash - put proper .data section in place" fix
+
+-------------------------------------------------------------------
+Mon Nov 23 08:04:16 CET 2009 - sjayaraman@suse.de
+
+- Update config files.
+ - Add new options KERNEL_DESKTOP and DEFAULT_VM_DIRTY_RATIO.
+ - Enable KERNEL_DESKTOP for only desktop flavor.
+
+-------------------------------------------------------------------
+Mon Nov 23 07:34:49 CET 2009 - sjayaraman@suse.de
+
+- patches.suse/mm-tune-dirty-limits.patch: mm: Make default
+ VM dirty ratio configurable to suit different workloads
+ (bnc#552883).
+
+-------------------------------------------------------------------
+Fri Nov 20 21:04:54 CET 2009 - mmarek@suse.cz
+
+- rpm/kernel-syms.spec.in, rpm/mkspec: build kernel-syms only for
+ supported architectures.
+
+-------------------------------------------------------------------
+Fri Nov 20 19:08:56 CET 2009 - jeffm@suse.com
+
+- Enabled B43_PHY_LP=y for PHY support on certain b43 chips.
+
+-------------------------------------------------------------------
+Fri Nov 20 17:29:45 CET 2009 - mmarek@suse.cz
+
+- patches.suse/export-sync_page_range: Revert "vfs: Remove
+ generic_osync_inode() and sync_page_range{_nolock}()"
+ (bnc#557231).
+
+-------------------------------------------------------------------
+Fri Nov 20 17:26:01 CET 2009 - jbeulich@novell.com
+
+- patches.suse/init-move-populate_rootfs-back-to-start_kernel:
+ Fix a bad-pointer warning.
+
+-------------------------------------------------------------------
+Fri Nov 20 15:07:41 CET 2009 - agruen@suse.de
+
+- rpm/macros.kernel-source: Add kernel_module_package_moddir()
+ macro for cross-distro compatibility (FATE 305225).
+
+-------------------------------------------------------------------
+Fri Nov 20 15:02:22 CET 2009 - jslaby@suse.cz
+
++++ 907 more lines (skipped)
++++ between kernel-source/kernel-debug.changes
++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-ec2.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
Old:
----
kernel-kdump.changes
kernel-kdump.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor debug
@@ -49,16 +49,17 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -112,6 +113,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
+%ifarch ppc64
+Provides: kernel-kdump
+Obsoletes: kernel-kdump
+%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -181,6 +186,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -202,11 +208,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -296,7 +302,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -502,7 +508,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -556,15 +562,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -584,7 +590,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -614,10 +623,11 @@
%package base
Summary: A Debug Version of the Kernel - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -650,10 +660,11 @@
%package extra
Summary: A Debug Version of the Kernel - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -690,7 +701,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -706,8 +717,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -741,7 +753,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor default
@@ -49,16 +49,17 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -120,6 +121,10 @@
Provides: kernel-sn2
Obsoletes: kernel-sn2
%endif
+%ifarch ppc64
+Provides: kernel-kdump
+Obsoletes: kernel-kdump
+%endif
%ifarch s390x
Provides: kernel-64bit
Obsoletes: kernel-64bit
@@ -197,6 +202,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -217,11 +223,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -311,7 +317,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -517,7 +523,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -571,15 +577,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -599,7 +605,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -629,10 +638,11 @@
%package base
Summary: The Standard Kernel - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -664,10 +674,11 @@
%package extra
Summary: The Standard Kernel - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -703,7 +714,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -719,8 +730,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -754,7 +766,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor desktop
@@ -49,16 +49,17 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -181,6 +182,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -212,11 +214,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -306,7 +308,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -512,7 +514,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -566,15 +568,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -594,7 +596,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -624,10 +629,11 @@
%package base
Summary: Kernel optimized for the desktop - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -669,10 +675,11 @@
%package extra
Summary: Kernel optimized for the desktop - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -718,7 +725,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -734,8 +741,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -769,7 +777,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ec2
@@ -49,16 +49,17 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -181,6 +182,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -204,11 +206,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -298,7 +300,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -504,7 +506,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -558,15 +560,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -586,7 +588,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -616,10 +621,11 @@
%package base
Summary: The Amazon EC2 Xen Kernel - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -654,10 +660,11 @@
%package extra
Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -696,7 +703,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -712,8 +719,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -747,7 +755,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor pae
@@ -49,16 +49,17 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -185,6 +186,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -212,11 +214,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -306,7 +308,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -512,7 +514,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -566,15 +568,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -594,7 +596,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -624,10 +629,11 @@
%package base
Summary: Kernel with PAE Support - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -666,10 +672,11 @@
%package extra
Summary: Kernel with PAE Support - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -712,7 +719,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -728,8 +735,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -763,7 +771,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ppc64
@@ -49,16 +49,17 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -113,8 +114,12 @@
%endif
Provides: kernel = %version-%source_rel
%ifarch ppc
-Provides: kernel-pmac64 kernel-pseries64 kernel-iseries64
-Obsoletes: kernel-pmac64 kernel-pseries64 kernel-iseries64
+Provides: kernel-pmac64 kernel-pseries64 kernel-iseries64 kernel-kdump
+Obsoletes: kernel-pmac64 kernel-pseries64 kernel-iseries64 kernel-kdump
+%endif
+%ifarch ppc64
+Provides: kernel-kdump
+Obsoletes: kernel-kdump
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
@@ -185,6 +190,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -212,11 +218,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -306,7 +312,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -512,7 +518,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -566,15 +572,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -594,7 +600,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -624,10 +633,11 @@
%package base
Summary: Kernel for ppc64 Systems - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -666,10 +676,11 @@
%package extra
Summary: Kernel for ppc64 Systems - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -712,7 +723,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -728,8 +739,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -763,7 +775,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ps3
@@ -49,16 +49,17 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -181,6 +182,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -204,11 +206,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -298,7 +300,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -504,7 +506,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -558,15 +560,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -586,7 +588,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -616,10 +621,11 @@
%package base
Summary: kernel for ps3 bootloader - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -654,10 +660,11 @@
%package extra
Summary: kernel for ps3 bootloader - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -696,7 +703,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -712,8 +719,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -747,7 +755,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor s390
@@ -49,16 +49,17 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -185,6 +186,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -205,11 +207,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -299,7 +301,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -505,7 +507,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -559,15 +561,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -587,7 +589,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -617,10 +622,11 @@
%package base
Summary: The Standard Kernel - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -652,10 +658,11 @@
%package extra
Summary: The Standard Kernel - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -691,7 +698,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -707,8 +714,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -742,7 +750,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define src_install_dir usr/src/linux-%kernelrelease%variant
@@ -29,17 +29,18 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils sed
BuildRequires: fdupes
Requires(post): coreutils sed
+Provides: multiversion(kernel)
Provides: linux
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
@@ -107,9 +108,10 @@
%source_timestamp
%package vanilla
Summary: Vanilla Linux kernel sources with minor build fixes.
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
AutoReqProv: off
+Provides: multiversion(kernel)
%description vanilla
Vanilla Linux kernel sources with minor build fixes.
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -23,19 +23,16 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
%endif
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils
-%ifarch %ix86 ppc64 x86_64
-Requires: kernel-debug-devel = %version-%source_rel
-%endif
%ifarch %ix86 ia64 ppc ppc64 s390x x86_64
Requires: kernel-default-devel = %version-%source_rel
%endif
@@ -48,18 +45,17 @@
%ifarch ppc ppc64
Requires: kernel-ppc64-devel = %version-%source_rel
%endif
-%ifarch ppc
-Requires: kernel-ps3-devel = %version-%source_rel
-%endif
%ifarch s390
Requires: kernel-s390-devel = %version-%source_rel
%endif
%ifarch %ix86 x86_64
Requires: kernel-xen-devel = %version-%source_rel
%endif
+Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-source%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64
Prefix: /usr/src
%description
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor trace
@@ -49,16 +49,17 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -181,6 +182,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -201,11 +203,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -295,7 +297,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -501,7 +503,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -555,15 +557,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -583,7 +585,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -613,10 +618,11 @@
%package base
Summary: The Realtime Linux Kernel - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -648,10 +654,11 @@
%package extra
Summary: The Realtime Linux Kernel - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -687,7 +694,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -703,8 +710,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -738,7 +746,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor vanilla
@@ -49,16 +49,17 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -189,6 +190,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -209,11 +211,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -303,7 +305,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -509,7 +511,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -563,15 +565,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -591,7 +593,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -621,10 +626,11 @@
%package base
Summary: The Standard Kernel - without any SUSE patches - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -656,10 +662,11 @@
%package extra
Summary: The Standard Kernel - without any SUSE patches - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -695,7 +702,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -711,8 +718,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -746,7 +754,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:04.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.31
-%define patchversion 2.6.32-rc5-git3
+%define patchversion 2.6.32-rc8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor xen
@@ -49,16 +49,17 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.32
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -181,6 +182,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -204,11 +206,11 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -298,7 +300,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -504,7 +506,7 @@
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -558,15 +560,15 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
@@ -586,7 +588,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -616,10 +621,11 @@
%package base
Summary: The Xen Kernel - base modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -654,10 +660,11 @@
%package extra
Summary: The Xen Kernel - Unsupported kernel modules
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -696,7 +703,7 @@
%package man
Summary: The collection of man pages generated by the kmsg script.
-License: GPL v2 only
+License: GPLv2
Group: System/Kernel
%description man
@@ -712,8 +719,9 @@
%package devel
Summary: Development files necessary for building kernel modules
-License: GPL v2 only
+License: GPLv2
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
@@ -747,7 +755,7 @@
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
-License: GPL v2 only
+License: GPLv2
Group: Development/Debug
%description devel-debuginfo
++++++ config.conf ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:05.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:05.000000000 +0100
@@ -11,7 +11,7 @@
+i386 i386/default
+i386 i386/desktop
+i386 i386/pae
-+i386 i386/debug
++i386 -syms i386/debug
+i386 i386/xen
+i386 -syms i386/ec2
+i386 i386/vanilla
@@ -26,19 +26,17 @@
+x86_64 x86_64/desktop
+x86_64 x86_64/xen
+x86_64 -syms x86_64/ec2
-+x86_64 x86_64/debug
++x86_64 -syms x86_64/debug
+x86_64 x86_64/vanilla
+x86_64 -syms x86_64/trace
# openSuSE:
# G3 G4 bPlan
+ppc ppc/default
-# pSeries
-+ppc -syms ppc/kdump
# G5 PS3 pSeries
+ppc ppc/ppc64
# PS3 bootloader
-+ppc ppc/ps3
++ppc -syms ppc/ps3
# maybe the kernels above were patched to death?
+ppc ppc/vanilla
@@ -48,11 +46,9 @@
# kernel-default.ppc.rpm and a kernel-default.ppc64.rpm to continue
# supporting 32bit and 64bit systems.
+ppc64 ppc64/default
-# pSeries
-+ppc64 -syms ppc64/kdump
# G5 pSeries
+ppc64 ppc64/ppc64
-+ppc64 ppc64/debug
++ppc64 -syms ppc64/debug
# maybe the kernels above were patched to death?
+ppc64 ppc64/vanilla
++++++ config.tar.bz2 ++++++
++++ 11655 lines of diff (skipped)
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:05.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:05.000000000 +0100
@@ -67,6 +67,7 @@
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
+Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
@@ -195,6 +196,7 @@
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -218,11 +220,11 @@
exit 1
fi
-SYMBOLS=%name
+SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
- SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+ SYMBOLS=$(cat %_sourcedir/extra-symbols)
+ echo "extra symbol(s):" $SYMBOLS
fi
-echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
@@ -331,7 +333,7 @@
# 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
+ chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -566,7 +568,7 @@
) > %my_builddir/base-modules
%endif
- res=0%my_builddir/kabi/%cpu_arch/symvers-%build_flavor
+ res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
@@ -623,16 +625,16 @@
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* ; do
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+ %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
- (find boot \
+ find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
- -type f -printf '/%%p\n' ; cat %my_builddir/kernel-devel.files) | \
- sort | uniq -u
+ -type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
@@ -654,7 +656,10 @@
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
-} | add_dirs_to_filelist > %my_builddir/kernel-base.files
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+ add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
@@ -687,6 +692,7 @@
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -719,6 +725,7 @@
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
+Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
@@ -769,6 +776,7 @@
Summary: Development files necessary for building kernel modules
License: GPL v2 only
Group: Development/Sources
+Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
++++++ kernel-module-subpackage ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:06.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:06.000000000 +0100
@@ -21,6 +21,7 @@
' $spec
)
Provides: %{-n*} = %_this_kmp_version
+Provides: multiversion(kernel)
Requires: coreutils grep
Enhances: kernel-%1
AutoReqProv: on
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:06.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:06.000000000 +0100
@@ -43,6 +43,7 @@
BuildRequires: coreutils sed
BuildRequires: fdupes
Requires(post): coreutils sed
+Provides: multiversion(kernel)
Provides: linux
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
@@ -116,6 +117,7 @@
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
+Provides: multiversion(kernel)
%description vanilla
Vanilla Linux kernel sources with minor build fixes.
++++++ kernel-syms.spec.in ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:06.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:06.000000000 +0100
@@ -36,9 +36,11 @@
AutoReqProv: off
BuildRequires: coreutils
@REQUIRES@
+Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-source%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch: @ARCHS@
Prefix: /usr/src
%description
++++++ macros.kernel-source ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:08.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:08.000000000 +0100
@@ -24,6 +24,7 @@
echo "%%global flavors_to_build${flavors_to_build:-%%nil}" \
echo "%%{expand:%%(test -z '%flavors_to_build' && echo %%%%internal_kmp_error)}" \
echo "%%global kernel_source() /usr/src/linux-obj/%_target_cpu/%%%%{1}" \
+ echo "%%global kernel_module_package_moddir() updates" \
\
echo "%package -n %{-n*}%{!-n:%name}-kmp-_dummy_" \
echo "Version: %version" \
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:08.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:08.000000000 +0100
@@ -1 +1 @@
-2096000
+1048576
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:08.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:08.000000000 +0100
@@ -85,16 +85,19 @@
# kernel-syms.spec
{
my $requires = "";
+ my %all_archs;
for my $flavor (sort keys(%syms_flavor_archs)) {
next if $flavor eq "vanilla";
my @archs = arch2rpm(@{$syms_flavor_archs{$flavor}});
+ $all_archs{$_} = 1 for @archs;
$requires .= "%ifarch @archs\n";
$requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n";
$requires .= "%endif\n";
}
chomp $requires;
do_spec('syms', "kernel-syms$variant.spec", %macros,
- REQUIRES => $requires);
+ REQUIRES => $requires,
+ ARCHS => join(" ", sort(keys(%all_archs))));
}
exit 0;
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:08.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:08.000000000 +0100
@@ -1 +1 @@
-6000
+6144
++++++ old-packages.conf ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:08.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:08.000000000 +0100
@@ -28,6 +28,7 @@
# ppc/ppc64 ============================================================
+ppc -!ppc64 kernel-pmac64 kernel-pseries64 kernel-iseries64
++ppc64 -vanilla kernel-kdump
# s390/s390x ===========================================================
+s390 -!s390 kernel-32bit
++++++ patches.apparmor.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor.diff new/patches.apparmor/apparmor.diff
--- old/patches.apparmor/apparmor.diff 2009-10-12 21:05:10.000000000 +0200
+++ new/patches.apparmor/apparmor.diff 2009-11-18 15:28:12.000000000 +0100
@@ -3861,7 +3861,7 @@
+ int mask;
+
+ mask = 0;
-+ if (op & 4)
++ if (op & 4)
+ mask |= MAY_READ;
+ if (op & 2)
+ mask |= MAY_WRITE;
@@ -4102,7 +4102,7 @@
+
+ if (!fprofile || !file->f_path.mnt ||
+ !mediated_filesystem(file->f_path.dentry->d_inode))
-+ return 0;
++ return 0;
+
+ profile = aa_current_profile_wupd();
+ if (profile && ((fprofile != profile) || (mask & ~fcxt->allowed)))
++++++ patches.arch.tar.bz2 ++++++
++++ 13344 lines of diff (skipped)
++++++ patches.drivers.tar.bz2 ++++++
++++ 53777 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
++++ 4392 lines of diff (skipped)
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ia64-sn-fix-percpu-warnings new/patches.rpmify/ia64-sn-fix-percpu-warnings
--- old/patches.rpmify/ia64-sn-fix-percpu-warnings 2009-10-16 17:30:07.000000000 +0200
+++ new/patches.rpmify/ia64-sn-fix-percpu-warnings 2009-11-05 19:15:05.000000000 +0100
@@ -15,6 +15,7 @@
---
arch/ia64/include/asm/sn/arch.h | 2 +-
+ arch/ia64/include/asm/sn/arch.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
@@ -23,8 +24,8 @@
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
---- linux-next-20091014.orig/arch/ia64/include/asm/sn/arch.h
-+++ linux-next-20091014/arch/ia64/include/asm/sn/arch.h
+--- a/arch/ia64/include/asm/sn/arch.h
++++ b/arch/ia64/include/asm/sn/arch.h
@@ -71,7 +71,7 @@ DECLARE_PER_CPU(struct sn_hub_info_s, __
* Compact node ID to nasid mappings kept in the per-cpu data areas of each
* cpu.
++++++ patches.suse.tar.bz2 ++++++
++++ 50196 lines of diff (skipped)
++++++ patches.trace.tar.bz2 ++++++
++++ 3326 lines of diff (skipped)
++++++ patches.xen.tar.bz2 ++++++
++++ 26529 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:12.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:12.000000000 +0100
@@ -31,7 +31,9 @@
patches.kernel.org/patch-2.6.32-rc1-rc3
patches.kernel.org/patch-2.6.32-rc3-rc4
patches.kernel.org/patch-2.6.32-rc4-rc5
- patches.kernel.org/patch-2.6.32-rc5-git3
+ patches.kernel.org/patch-2.6.32-rc5-rc6
+ patches.kernel.org/patch-2.6.32-rc6-rc7
+ patches.kernel.org/patch-2.6.32-rc7-rc8
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -77,11 +79,11 @@
patches.suse/supported-flag
patches.suse/supported-flag-sysfs
patches.suse/supported-flag-enterprise
- patches.suse/kbuild-icecream-workaround
patches.fixes/kbuild-fix-generating-of-.symtypes-files
patches.suse/genksyms-add-override-flag.diff
patches.suse/kbuild-generate-modules.builtin
patches.suse/kbuild-rebuild-fix-for-Makefile.modbuiltin
+ patches.suse/kconfig-automate-kernel-desktop
########################################################
# Simple export additions/removals
@@ -90,12 +92,22 @@
patches.suse/kvm-as-kmp
patches.suse/export-release_open_intent
patches.suse/export-security_inode_permission
+ patches.suse/export-sync_page_range
########################################################
# Bug workarounds for binutils
########################################################
patches.suse/s390-System.map.diff
+ patches.arch/s390-message-catalog.diff
+ patches.arch/s390-01-qeth-isolation.patch
+
+ patches.arch/s390-02-01-cex3-init-msg.patch
+ patches.arch/s390-02-02-cex3-special-command.patch
+ patches.arch/s390-02-03-cex3-device.patch
+ patches.arch/s390-02-04-cex3-use-def.patch
+ patches.arch/s390-02-05-zcrypt-speed-cex2c.patch
+ patches.arch/s390-02-06-zcrypt-speed-cex3.patch
########################################################
# Scheduler / Core
@@ -104,9 +116,35 @@
patches.suse/setuid-dumpable-wrongdir
+needs_update-32 patches.suse/sysctl-add-affinity_load_balancing
patches.fixes/seccomp-disable-tsc-option
- patches.suse/self-ptrace.patch
- patches.fixes/percpu-allow-pcpu_alloc-to-be-called-with-IRQs-off
- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu
+ patches.suse/hung_task_timeout-configurable-default
+
+ # writable limits
+ patches.suse/rlim-0001-SECURITY-selinux-fix-update_rlimit_cpu-parameter.patch
+ patches.suse/rlim-0002-SECURITY-add-task_struct-to-setrlimit.patch
+ patches.suse/rlim-0003-core-add-task_struct-to-update_rlimit_cpu.patch
+ patches.suse/rlim-0004-sys_setrlimit-make-sure-rlim_max-never-grows.patch
+ patches.suse/rlim-0005-core-split-sys_setrlimit.patch
+ patches.suse/rlim-0006-core-allow-setrlimit-to-non-current-tasks.patch
+ patches.suse/rlim-0007-core-optimize-setrlimit-for-current-task.patch
+ patches.suse/rlim-0008-FS-proc-make-limits-writable.patch
+ patches.suse/rlim-0009-core-posix-cpu-timers-cleanup-rlimits-usage.patch
+ patches.suse/rlim-0010-core-do-security-check-under-task_lock.patch
+ patches.suse/rlim-0011-resource-add-helpers-for-fetching-rlimits.patch
+ patches.suse/rlim-0012-IA64-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0013-PPC-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0014-S390-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0015-SPARC-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0016-X86-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0017-FS-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0018-MM-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0019-core-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0020-misc-use-helpers-for-rlimits.patch
+ patches.suse/rlim-0021-core-rename-setrlimit-to-do_setrlimit.patch
+ patches.suse/rlim-0022-core-implement-getprlimit-and-setprlimit-syscalls.patch
+ patches.suse/rlim-0023-unistd-add-__NR_-get-set-prlimit-syscall-numbers.patch
+ patches.suse/rlim-0024-COMPAT-add-get-put_compat_rlimit.patch
+ patches.suse/rlim-0025-x86-add-ia32-compat-prlimit-syscalls.patch
+
########################################################
# Architecture-specific patches. These used to be all
@@ -140,12 +178,18 @@
########################################################
# x86_64/i386 biarch
########################################################
- patches.arch/x86-self-ptrace.patch
patches.arch/x86-hpet-pre-read
patches.arch/x86_64-hpet-64bit-timer.patch
patches.arch/add_support_for_hpet_msi_intr_remap.patch
patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch
+ patches.arch/x86-crypto-pclmulqdq-accelerated-implementation.patch
+ patches.arch/x86-crypto-add-ghash-algorithm-test.patch
+
+ patches.arch/kvm-split-paravirt-ops-by-functionality
+ patches.arch/kvm-only-export-selected-pv-ops-feature-structs
+ patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature
+ patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic
########################################################
# x86_64/4096CPUS - from SGI
@@ -186,6 +230,16 @@
patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch
+ patches.arch/ppc-extended_h_cede-kernel-dlpar
+ patches.arch/ppc-extended_h_cede-mv_of_drconf_cell
+ patches.arch/ppc-extended_h_cede-Export_memory_sysdev_class
+ patches.arch/ppc-extended_h_cede-memory-dlpar
+ patches.arch/ppc-extended_h_cede-cpu-dlpar
+ patches.arch/ppc-extended_h_cede-new_cede_processor
+ patches.arch/ppc-extended_h_cede-add_offline_states
+ patches.arch/ppc-extended_h_cede-node_offline_online_cpus
+ patches.arch/ppc-extended_h_cede-add_driver_lock
+
########################################################
# PS3
########################################################
@@ -207,7 +261,6 @@
patches.fixes/oom-warning
patches.suse/shmall-bigger
patches.fixes/grab-swap-token-oops
- patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch
+needs_update-32 patches.suse/osync-error
patches.fixes/remount-no-shrink-dcache
@@ -216,6 +269,8 @@
patches.suse/file-capabilities-disable-by-default.diff
patches.suse/unlock_page-speedup.patch
+ patches.suse/files-slab-rcu.patch
+ patches.suse/mm-tune-dirty-limits.patch
########################################################
# nfsacl protocol (agruen)
@@ -241,6 +296,8 @@
patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch
+trenn patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
+ patches.suse/init-move-populate_rootfs-back-to-start_kernel
+ patches.suse/acpi-generic-initramfs-table-override-support
patches.arch/acpi_thermal_passive_blacklist.patch
patches.arch/acpi-export-hotplug_execute
@@ -261,6 +318,17 @@
# CPUFREQ
########################################################
+# cpuidle: not yet -- unresolved symbol on i586
+# patches.suse/cpuidle-cleanup
+# patches.suse/cpuidle-implement-list
+# patches.suse/cpuidle-cleanup-x86
+# patches.suse/cpuidle-enable-pseries
+# patches.suse/cpuidle-cleanup-pseries
+# patches.suse/cpuidle-add-default-idle-ppc
+# patches.suse/cpuidle-pseries-proc-idle
+# patches.suse/cpuidle-eliminate-ppcmdpowersave1
+# patches.suse/cpuidle-documentation
+
########################################################
# AGP, graphics related stuff
########################################################
@@ -282,6 +350,8 @@
# NFS
########################################################
patches.fixes/nfsd-acl.patch
+ patches.fixes/nfs-slot-table-alloc
+ patches.fixes/nfs-honour-server-preferred-io-size
########################################################
# lockd + statd
@@ -311,6 +381,7 @@
########################################################
# ocfs2
########################################################
+ patches.suse/ocfs2-allocation-resrvations.patch
########################################################
# xfs
@@ -338,17 +409,17 @@
patches.suse/nfs4acl-common.diff
patches.suse/nfs4acl-ext3.diff
patches.suse/nfs4acl-ai.diff
+ patches.fixes/zisofs-large-pagesize-read.patch
########################################################
- # These patches are from the netfilter team, and
- # are required to tag IPsec packets for packet
- # filtering purposes.
+ # Netfilter
########################################################
patches.suse/netfilter-ipt_LOG-mac
patches.suse/netfilter-ip_conntrack_slp.patch
patches.fixes/fix-nf_conntrack_slp
+ patches.fixes/netfilter-remove-pointless-config_nf_ct_acct-warning
########################################################
#
@@ -371,20 +442,38 @@
patches.drivers/libata-prefer-over-ide
patches.drivers/libata-ata_piix-clear-spurious-IRQ
+ patches.drivers/libata-ahci-aspire-3810t-noncq
+ patches.drivers/libata-missing-_SDD-is-not-an-error
# Block layer fixes
patches.fixes/scsi-inquiry-too-short-ratelimit
patches.suse/scsi-netlink-ml
-+needs_update patches.drivers/mpt-fusion-4.16.00.00-update
-+needs_update patches.drivers/qla4xxx-sles11-update
-+needs_update patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update
- patches.fixes/scsi-skip-nonscsi-device-for-dma
+ # from scsi-misc
+ patches.fixes/scsi-fc-class-failfast-bsg-requests
+ patches.fixes/scsi-add-scsi-target-reset-support-to-ioctl
+ patches.fixes/scsi-devinfo-update-hitachi-entries
+ patches.suse/modify-change_queue_depth-to-take-in-reason-why-it-is-being-called.patch
+ patches.suse/scsi-error-have-scsi-ml-call-change_queue_depth-to-handle-queue_full.patch
+ patches.suse/add-queue_depth-ramp-up-code.patch
+
+ patches.drivers/mpt-fusion-4.22.00.00-update
+ patches.drivers/hpsa
+ patches.fixes/scsi-fix-bug-with-dma-maps-on-nested-scsi-objects
+ patches.fixes/scsi-introduce-helper-function-for-blocking-eh
+ patches.fixes/scsi-dh-queuedata-accessors
patches.fixes/scsi-dh-alua-retry-UA
patches.fixes/scsi-add-tgps-setting
patches.fixes/scsi-dh-alua-send-stpg
+ patches.fixes/scsi_dh-change-activate-interface
+ patches.fixes/scsi_dh-make-rdac-handler-asynchronous
+ patches.fixes/scsi_dh-make-hp_sw-handler-asynchronous
+ patches.fixes/scsi_dh-make-alua-handler-asynchronous
+ patches.fixes/scsi_dh-always-attach-sysfs
patches.fixes/scsi-check-host-lookup-failure
+ patches.drivers/aacraid-24701-update
+ patches.drivers/megaraid-04.12-update
# Remaining SCSI patches (garloff)
patches.suse/scsi-error-test-unit-ready-timeout
@@ -401,7 +490,6 @@
########################################################
# DRM/Video
########################################################
- patches.drivers/via-unichrome-drm-bugfixes.patch
########################################################
# Network
@@ -411,18 +499,113 @@
patches.fixes/tg3-fix-default-wol.patch
patches.drivers/ehea-modinfo.patch
+needs_update-32 patches.drivers/tg3_libphy_workaround
+ patches.drivers/igb-add-support-for-82576NS-SerDes-adapter.patch
+
+ # entropy FATE##307517
+ patches.drivers/bnx2-entropy-source.patch
+ patches.drivers/e1000-entropy-source.patch
+ patches.drivers/e1000e-entropy-source.patch
+ patches.drivers/igb-entropy-source.patch
+ patches.drivers/ixgbe-entropy-source.patch
+ patches.drivers/tg3-entropy-source.patch
+
+ patches.drivers/phy-broadcom-bug-fixes-for-sp1.patch
+ patches.drivers/tg3-update-version-to-3.104.patch
+
+ patches.drivers/sky2-add-register-definitions
+ patches.drivers/sky2-88E8059-support
+ patches.drivers/sky2-optima-tcp-offload-fix
+ patches.drivers/sky2-optima-fix-pci-cfg
+
+ #FCOE update (fate#306857, fate#306859, bnc#551175)
+ patches.suse/libfc-fix-typo-in-retry-check-on-received-prli.patch
+ patches.suse/libfc-fix-ddp-in-fc_fcp-for-0-xid.patch
+ patches.suse/fcoe-remove-redundant-checking-of-netdev-netdev_ops.patch
+ patches.suse/libfc-fcoe-don-t-export_symbols-unnecessarily.patch
+ patches.suse/libfc-remove-unused-fc_lport-pointer-from-fc_fcp_pkt_abort.patch
+ patches.suse/libfc-fix-wrong-scsi-return-status-under-fc_data_undrun.patch
+ patches.suse/libfc-lport-fix-minor-documentation-errors.patch
+ patches.suse/libfc-don-t-warn_on-in-lport_timeout-for-reset-state.patch
+ patches.suse/libfc-removes-initializing-fc_cpu_order-and-fc_cpu_mask-per-lport.patch
+ patches.suse/libfc-adds-missing-exch-release-for-accepted-rrq.patch
+ patches.suse/libfc-removes-unused-disc_work-and-ex_list.patch
+ patches.suse/fcoe-initialize-return-value-in-fcoe_destroy.patch
+ patches.suse/fcoe-use-netif_f_fcoe_mtu-flag-to-set-up-max-frame-size-lport-mfs.patch
+ patches.suse/libfc-fix-frags-in-frame-exceeding-skb_max_frags-in-fc_fcp_send_data.patch
+ patches.suse/fcoe-call-ndo_fcoe_enable-disable-to-turn-fcoe-feature-on-off-in-lld.patch
+ patches.suse/libfc-fix-memory-corruption-caused-by-double-frees-and-bad-error-handling.patch
+ patches.suse/libfc-fix-free-of-fc_rport_priv-with-timer-pending.patch
+ patches.suse/libfc-convert-to-scsi_track_queue_full.patch
+ patches.suse/fcoe-libfc-fix-an-libfc-issue-with-queue-ramp-down-in-libfc.patch
+ patches.suse/libfc-add-queue_depth-ramp-up.patch
+ patches.suse/fcoe-increase-fcoe_max_lun-to-0xffff-65535.patch
+ patches.suse/libfc-move-non-common-routines-and-prototypes-out-of-libfc-h.patch
+ patches.suse/libfc-remove-fc_fcp_complete.patch
+ patches.suse/libfc-add-libfc-fc_libfc-ch-for-libfc-internal-routines.patch
+ patches.suse/libfc-move-libfc_init-and-libfc_exit-to-fc_libfc-c.patch
+ patches.suse/libfc-changes-to-libfc_host_alloc-to-consolidate-initialization-with-allocation.patch
+ patches.suse/libfc-add-some-generic-npiv-support-routines-to-libfc.patch
+ patches.suse/libfc-vport-link-handling-and-fc_vport-state-managment.patch
+ patches.suse/libfc-libfcoe-fdisc-els-for-npiv.patch
+ patches.suse/libfcoe-fcoe-libfcoe-npiv-support.patch
+ patches.suse/fcoe-add-a-separate-scsi-transport-template-for-npiv-vports.patch
+ patches.suse/fcoe-npiv-vport-create-destroy.patch
+ patches.suse/libfc-rpn_id-is-obsolete-and-unnecessary.patch
+ patches.suse/libfc-rnn_id-may-be-required-before-rsnn_nn-with-some-switches.patch
+ patches.suse/libfc-register-symbolic-node-name-rsnn_nn.patch
+ patches.suse/libfc-register-symbolic-port-name-rspn_id.patch
+ patches.suse/libfc-combine-name-server-registration-response-handlers.patch
+ patches.suse/libfc-combine-name-server-registration-request-functions.patch
+ patches.suse/fcoe-vport-symbolic-name-support.patch
+ patches.suse/libfc-export-fc-headers.patch
+ patches.suse/libfc-add-routine-to-copy-data-from-a-buffer-to-a-sg-list.patch
+ patches.suse/libfc-fcoe-add-fc-passthrough-support.patch
+ patches.suse/libfc-formatting-cleanups-across-libfc.patch
+ patches.suse/libfcoe-formatting-and-comment-cleanups.patch
+ patches.suse/fcoe-formatting-cleanups-and-commenting.patch
+ patches.suse/fcoe-libfc-use-single-frame-allocation-api.patch
+ patches.suse/libfc-reduce-can_queue-for-all-fcp-frame-allocation-failures.patch
+ patches.suse/libfc-adds-can_queue-ramp-up.patch
+ patches.suse/libfcoe-allow-fip-to-be-disabled-by-the-driver.patch
+ patches.suse/libfcoe-fip-use-scsi-host-number-to-identify-debug-messages.patch
+ patches.suse/libfcoe-fip-allow-fip-receive-to-be-called-from-irq.patch
+ patches.suse/libfcoe-fip-should-report-link-to-libfc-whether-selected-or-not.patch
+ patches.suse/libfcoe-don-t-send-els-in-fip-mode-if-no-fcf-selected.patch
+ patches.suse/fcoe-remove-extra-function-decalrations.patch
+ patches.suse/fcoe-add-check-to-fail-gracefully-in-bonding-mode.patch
+ patches.suse/libfc-fix-rnn_id-smashing-skb-payload.patch
+ patches.suse/libfc-fix-symbolic-name-registrations-smashing-skb-data.patch
+ patches.suse/libfc-fix-fc_els_resp_type-to-correct-display-of-ct-responses.patch
+ patches.suse/libfc-add-set_fid-function-to-libfc-template.patch
+ patches.suse/libfc-add-host-number-to-lport-link-up-down-messages.patch
+ patches.suse/libfcoe-fcoe-simplify-receive-flogi-response.patch
+ patches.suse/libfc-register-fc4-features-with-the-fc-switch.patch
+ patches.suse/fcoe-fix-checking-san-mac-address.patch
+ patches.suse/fcoe-fix-getting-san-mac-for-vlan-interface.patch
+ patches.suse/fcoe-fix-setting-lport-s-wwnn-wwpn-to-use-san-mac-address.patch
+ patches.suse/libfc-do-not-use-did_no_connect-for-pkt-alloc-failures.patch
+ patches.suse/fcoe-fix-using-vlan-id-in-creating-lport-s-wwwn-wwpn.patch
+ patches.suse/libfc-fcoe-fixes-for-highmem-skb-linearize-panics.patch
+ patches.suse/libfc-fix-an-issue-of-pending-exch-es-after-i-f-destroyed-or-rmmod-fcoe.patch
+ patches.suse/libfcoe-do-not-pad-fip-keep-alive-to-full-frame-size.patch
+ patches.suse/libfc-fcoe-increase-els-and-ct-timeouts.patch
+
########################################################
# Wireless Networking
########################################################
patches.suse/wireless-no-aes-select
+ patches.fixes/mac80211-fix-spurious-delba-handling.patch
########################################################
# iSCSI
########################################################
-+needs_update patches.drivers/cxgb3i
-+needs_update patches.drivers/cxgb3i-fixed-offload-array-size
-+needs_update patches.fixes/disable-lro-per-default
+ patches.fixes/bnx2i-use-common-iscsi-suspend-queue
+ patches.fixes/libiscsi-fix-login-text-checks-in-pdu-inject
+ patches.fixes/libiscsi-check-tmf-state-before-sending-pdu
+ patches.fixes/libiscsi-add-warm-target-reset-tmf-support
+ patches.fixes/iscsi-class-modify-handling-of-replacement-time
+ patches.fixes/iser-set-tgt-and-lu-reset-timeout
########################################################
# PCI and PCI hotplug
@@ -448,10 +631,28 @@
patches.suse/Cleanup-and-make-boot-splash-work-with-KMS.patch
patches.drivers/elousb.patch
patches.fixes/input-add-acer-aspire-5710-to-nomux.patch
+ patches.fixes/hid-fixup-ncr-quirk.patch
##########################################################
# Sound
##########################################################
+ patches.drivers/alsa-sp1-hda-01-select-ibexpeak-handler
+ patches.drivers/alsa-sp1-hda-02-vectorize-get_empty_pcm_device
+ patches.drivers/alsa-sp1-hda-03-allow-up-to-4-HDMI
+ patches.drivers/alsa-sp1-hda-04-convert-intelhdmi-global-references
+ patches.drivers/alsa-sp1-hda-05-remove-intelhdmi-dependency-on-multiout
+ patches.drivers/alsa-sp1-hda-06-use-pcm-prepare-callbacks-for-intelhdmi
+ patches.drivers/alsa-sp1-hda-07-reorder-intelhemi-prepare-callbacks
+ patches.drivers/alsa-sp1-hda-08-vectorize-intelhdmi
+ patches.drivers/alsa-sp1-hda-09-get-intelhtemi-max-channels
+ patches.drivers/alsa-sp1-hda-10-auto-parse-intelhdmi-cvt-pin
+ patches.drivers/alsa-sp1-hda-11-remove-static-intelhdmi-config
+ patches.drivers/alsa-sp1-hda-12-reset-pins-idt-codec-free
+ patches.drivers/alsa-sp1-hda-13-add-reboot-notifier
+ patches.drivers/alsa-sp1-hda-14-add-missing-export
+ patches.drivers/alsa-sp1-hda-15-fix-build-warning
+ patches.drivers/alsa-sp1-hda-16-stac-dual-headphones-fix
+ patches.drivers/alsa-sp1-hda-17-fix-mute-LED-sync-idt92h383xxx
########################################################
# Other driver fixes
@@ -466,6 +667,8 @@
patches.suse/raw_device_max_minors_param.diff
patches.suse/no-partition-scan
+ patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array
+
########################################################
# Other drivers we have added to the tree
########################################################
@@ -481,11 +684,11 @@
patches.suse/dm-raid45_2.6.27_20081027.patch
patches.fixes/dm-mpath-reattach-dh
patches.suse/dm-mpath-leastpending-path-update
-+needs_update patches.suse/dm-mpath-accept-failed-paths
-+needs_update patches.suse/dm-mpath-requeue-for-stopped-queue
+ patches.suse/dm-mpath-accept-failed-paths
+ patches.suse/dm-mpath-detach-existing-hardware-handler
patches.suse/dm-mpath-null-pgs
patches.fixes/dm-table-switch-to-readonly
-
+ patches.suse/dm-mpath-evaluate-request-result-and-sense
########################################################
# md
@@ -518,6 +721,7 @@
patches.suse/kdb-ia64
patches.suse/kdb-build-fixes
patches.suse/kdb-x86-build-fixes
+ patches.suse/kdb_x86_fix_hang.patch
########################################################
# Other patches for debugging
@@ -538,23 +742,30 @@
patches.suse/cgroup-disable-memory.patch
########################################################
- # Tracing
- ########################################################
-
-+needs_updating patches.trace/lttng-instrumentation-irq.patch
-+needs_updating patches.trace/lttng-instrumentation-timer.patch
-+needs_updating patches.trace/lttng-instrumentation-kernel.patch
-+needs_updating patches.trace/lttng-instrumentation-filemap.patch
-+needs_updating patches.trace/lttng-instrumentation-swap.patch
-+needs_updating patches.trace/lttng-instrumentation-memory.patch
-+needs_updating patches.trace/lttng-instrumentation-page_alloc.patch
-+needs_updating patches.trace/lttng-instrumentation-hugetlb.patch
-+needs_updating patches.trace/lttng-instrumentation-net.patch
-+needs_updating patches.trace/lttng-instrumentation-ipv4.patch
-+needs_updating patches.trace/lttng-instrumentation-ipv6.patch
-+needs_updating patches.trace/lttng-instrumentation-socket.patch
-+needs_updating patches.trace/lttng-instrumentation-fs.patch
-+needs_updating patches.trace/lttng-instrumentation-ipc.patch
+ # Performance Monitoring, Tracing etc
+ ########################################################
+
+ patches.suse/perfmon2.patch
+ patches.suse/perfmon2_ioctl.patch
+ patches.suse/perfmon2_noutrace.patch
+
+ patches.fixes/oprofile_bios_ctr.patch
+
+ patches.trace/lttng-instrumentation-irq.patch
+ patches.trace/lttng-instrumentation-softirq.patch
+ patches.trace/lttng-instrumentation-kernel.patch
+ patches.trace/lttng-instrumentation-filemap.patch
+ patches.trace/lttng-instrumentation-swap.patch
+ # fault.h: TP_PROTO(void) expansion failing on ia64, will fix next week
++tonyj patches.trace/lttng-instrumentation-memory.patch
+ patches.trace/lttng-instrumentation-page_alloc.patch
+ patches.trace/lttng-instrumentation-hugetlb.patch
+ patches.trace/lttng-instrumentation-net.patch
+ patches.trace/lttng-instrumentation-ipv4.patch
+ patches.trace/lttng-instrumentation-ipv6.patch
+ patches.trace/lttng-instrumentation-socket.patch
+ patches.trace/lttng-instrumentation-fs.patch
+ patches.trace/lttng-instrumentation-ipc.patch
patches.trace/ftrace-framepointer.diff
@@ -563,6 +774,13 @@
+needs_update-32 patches.fixes/nfs-write.c-bug-removal.patch
patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch
+ ########################################################
+ # KVM patches
+ ########################################################
+
+ patches.fixes/kvm-ioapic.patch
+ patches.fixes/kvm-macos.patch
+
########################################################
# Staging tree patches
# new drivers that are going upstream
@@ -659,6 +877,8 @@
patches.xen/xen3-patch-2.6.30
patches.xen/xen3-patch-2.6.31
patches.xen/xen3-patch-2.6.32-rc4
+ patches.xen/xen3-patch-2.6.32-rc4-rc5
+ patches.xen/xen3-patch-2.6.32-rc5-rc6
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-kdb-x86
patches.xen/xen3-stack-unwind
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:12.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:12.000000000 +0100
@@ -1,3 +1,3 @@
-2009-11-03 15:41:35 +0100
-GIT Revision: ad0b82d093b6344f9f80e96b41a695610f7fa6eb
+2009-11-26 15:24:07 +0100
+GIT Revision: 73922f74f422111f9f37c410d1d35ec356dd9acb
GIT Branch: master
++++++ supported.conf ++++++
--- /var/tmp/diff_new_pack.nhIJ8u/_old 2009-11-27 14:14:12.000000000 +0100
+++ /var/tmp/diff_new_pack.nhIJ8u/_new 2009-11-27 14:14:12.000000000 +0100
@@ -71,6 +71,8 @@
kernel/crypto/anubis
kernel/crypto/arc4 # ARC4 Cipher Algorithm
kernel/crypto/async_tx/async_memcpy
+ kernel/crypto/async_tx/async_pq
+ kernel/crypto/async_tx/async_raid6_recov
kernel/crypto/async_tx/async_tx
kernel/crypto/async_tx/async_xor
kernel/crypto/authenc
@@ -97,6 +99,7 @@
kernel/crypto/fcrypt
kernel/crypto/gcm
kernel/crypto/gf128mul
+ kernel/crypto/crypto_hash
kernel/crypto/khazad # Khazad Cryptographic Algorithm
kernel/crypto/krng
kernel/crypto/lrw
@@ -396,6 +399,7 @@
kernel/drivers/gpio/pca953x
kernel/drivers/gpio/pcf857x
kernel/drivers/gpu/drm/drm # DRM core
+ kernel/drivers/gpu/drm/drm_kms_helper
kernel/drivers/gpu/drm/i810/i810 # Intel i810
- kernel/drivers/gpu/drm/i830/i830 # obsoleted by i915
kernel/drivers/gpu/drm/i915/i915 # Intel 830M/i915
@@ -405,6 +409,7 @@
- kernel/drivers/gpu/drm/savage/savage
- kernel/drivers/gpu/drm/sis/sis # SIS 300/630/540
kernel/drivers/gpu/drm/tdfx/tdfx # 3dfx Banshee/Voodoo3+
+ kernel/drivers/gpu/drm/ttm/ttm
- kernel/drivers/gpu/drm/via/via
kernel/drivers/hid/hid
kernel/drivers/hid/usbhid/usbhid
@@ -753,10 +758,12 @@
kernel/drivers/md/faulty
kernel/drivers/md/linear
- kernel/drivers/md/multipath # Replaced by dm-multipath
+ kernel/drivers/md/md-mod
kernel/drivers/md/raid0
kernel/drivers/md/raid1
kernel/drivers/md/raid10
kernel/drivers/md/raid456
+ kernel/drivers/md/raid6_pq
kernel/drivers/media/common/ir-common
kernel/drivers/media/common/saa7146 # driver for generic saa7146-based hardware
kernel/drivers/media/common/saa7146_vv # video4linux driver for saa7146-based hardware
@@ -998,6 +1005,7 @@
kernel/drivers/media/video/uvc/uvcvideo
kernel/drivers/media/video/v4l1-compat # v4l(1) compatibility layer for v4l2 drivers.
kernel/drivers/media/video/v4l2-common # misc helper functions for v4l2 device drivers
+ kernel/drivers/media/video/v4l2-compat-ioctl32
kernel/drivers/media/video/v4l2-int-device
kernel/drivers/media/video/videobuf-core
kernel/drivers/media/video/videobuf-dma-contig
@@ -1036,8 +1044,10 @@
kernel/drivers/message/i2o/i2o_core
kernel/drivers/message/i2o/i2o_proc
- kernel/drivers/message/i2o/i2o_scsi # Unsupported - bug #176735
+ kernel/drivers/mfd/mfd-core
kernel/drivers/mfd/htc-pasic3
kernel/drivers/mfd/sm501
+ kernel/drivers/mfd/ucb1400_core
kernel/drivers/misc/acer-wmi
kernel/drivers/misc/asus-laptop
kernel/drivers/misc/compal-laptop
@@ -1173,7 +1183,9 @@
kernel/drivers/net/atlx/atl2
+isa kernel/drivers/net/atp
kernel/drivers/net/b44 # Broadcom 4400 10/100 PCI ethernet driver
+ kernel/drivers/net/benet/be2net # Emulex / ServerEngines 10Gb Ethernet Driver
kernel/drivers/net/bmac # PowerMac onboard ethernet, for older PCI macs
+ kernel/drivers/net/bna/bna # Broadcom 10Gb Ethernet Driver
kernel/drivers/net/bnx2 # Broadcom NX2 network driver
kernel/drivers/net/bnx2x
kernel/drivers/net/bonding/bonding # Ethernet Channel Bonding Driver, v2.6.0
@@ -1197,6 +1209,7 @@
+isa kernel/drivers/net/eexpress
+external kernel/drivers/net/ehea/ehea # IBM pSeries HostEthernetAdapter Driver
kernel/drivers/net/enc28j60
+ kernel/drivers/net/enic/enic
kernel/drivers/net/epic100 # SMC 83c170 EPIC series Ethernet driver
kernel/drivers/net/eql
+isa kernel/drivers/net/eth16i
@@ -1286,6 +1299,7 @@
kernel/drivers/net/phy/libphy
kernel/drivers/net/phy/lxt
kernel/drivers/net/phy/marvell
+ kernel/drivers/net/mdio
kernel/drivers/net/phy/mdio-bitbang
kernel/drivers/net/phy/mdio-ofgpio
kernel/drivers/net/phy/qsemi
@@ -1303,6 +1317,7 @@
kernel/drivers/net/pppox # PPP over Ethernet driver (generic socket layer)
kernel/drivers/net/ps3_gelic
kernel/drivers/net/qla3xxx
+ kernel/drivers/net/qlge/qlge # QLogic 10 Gb Ethernet driver
kernel/drivers/net/r6040
kernel/drivers/net/r8169 # RealTek RTL-8169 Gigabit Ethernet driver
kernel/drivers/net/rrunner # Essential RoadRunner HIPPI driver
@@ -1398,6 +1413,7 @@
- kernel/drivers/net/wireless/airo_cs # Support for Cisco/Aironet 802.11 wireless ethernet cards. This is the module that links the PCMCIA card with the airo module.
- kernel/drivers/net/wireless/airo # Support for Cisco/Aironet 802.11 wireless ethernet cards. Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs.
kernel/drivers/net/wireless/airport
+ kernel/drivers/net/wireless/ath/ath
kernel/drivers/net/wireless/ath5k/ath5k
kernel/drivers/net/wireless/ath9k/ath9k
kernel/drivers/net/wireless/atmel_cs # Support for Atmel at76c50x 802.11 wireless ethernet cards.
@@ -1410,8 +1426,9 @@
- kernel/drivers/net/wireless/hostap/hostap # Host AP common routines
- kernel/drivers/net/wireless/hostap/hostap_pci # Support for Intersil Prism2.5-based 802.11 wireless LAN PCI cards.
- kernel/drivers/net/wireless/hostap/hostap_plx # Support for Intersil Prism2-based 802.11 wireless LAN cards (PLX).
- kernel/drivers/net/wireless/ipw2100 # Intel(R) PRO/Wireless 2100 Network Driver
-- kernel/drivers/net/wireless/ipw2200
++external kernel/drivers/net/wireless/ipw2x00/ipw2100
++external kernel/drivers/net/wireless/ipw2x00/ipw2200
++external kernel/drivers/net/wireless/ipw2x00/libipw
kernel/drivers/net/wireless/iwlwifi/iwl3945
kernel/drivers/net/wireless/iwlwifi/iwlagn
kernel/drivers/net/wireless/iwlwifi/iwlcore
@@ -1561,6 +1578,9 @@
kernel/drivers/scsi/arcmsr/arcmsr # Areca RAID HBA
kernel/drivers/scsi/atp870u
+base kernel/drivers/scsi/BusLogic
+ kernel/drivers/scsi/be2iscsi/be2iscsi
+ kernel/drivers/scsi/bfa/bfa
+ kernel/drivers/scsi/bnx2i/bnx2i
kernel/drivers/scsi/ch # device driver for scsi media changer devices
kernel/drivers/scsi/cxgb3i/cxgb3i # Chelsio S3 iSCSI initiator driver
kernel/drivers/scsi/dc395x # SCSI host adapter driver for Tekram TRM-S1040 based adapters: Tekram DC395 and DC315 series
@@ -1574,10 +1594,13 @@
+isa kernel/drivers/scsi/dtc
kernel/drivers/scsi/eata # EATA/DMA SCSI Driver
kernel/drivers/scsi/fcoe/fcoe # Open-FCoE software driver
+ kernel/drivers/scsi/fcoe/libfcoe
kernel/drivers/scsi/fdomain # Future domain SCSI driver
+ kernel/drivers/scsi/fnic/fnic
kernel/drivers/scsi/gdth
+isa kernel/drivers/scsi/g_NCR5380
+isa kernel/drivers/scsi/g_NCR5380_mmio
+ kernel/drivers/scsi/hpsa # HP Smart Array
kernel/drivers/scsi/hptiop
+external kernel/drivers/scsi/ibmvscsi/ibmvfc # IBM pSeries virtual fibrechannel
+external kernel/drivers/scsi/ibmvscsi/ibmvscsic # IBM pSeries vscsi client
@@ -1591,6 +1614,7 @@
kernel/drivers/scsi/iscsi_tcp # open-iscsi client
kernel/drivers/scsi/libfc/libfc # Library module for FC devices
kernel/drivers/scsi/libiscsi # open-iscsi library
+ kernel/drivers/scsi/libiscsi_tcp
kernel/drivers/scsi/libsas/libsas # Library module for SAS devices
kernel/drivers/scsi/libsrp # Library module for SRP devices
kernel/drivers/scsi/lpfc/lpfc
@@ -1600,6 +1624,7 @@
kernel/drivers/scsi/megaraid/megaraid_mm
kernel/drivers/scsi/megaraid/megaraid_sas
kernel/drivers/scsi/mesh # PowerMac onboard scsi, early PCI Macs
+ kernel/drivers/scsi/mpt2sas/mpt2sas
kernel/drivers/scsi/mvsas
+isa kernel/drivers/scsi/NCR53c406a
kernel/drivers/scsi/nsp32
@@ -1876,8 +1901,10 @@
+isa kernel/drivers/watchdog/wdt
kernel/drivers/watchdog/wdt_pci # Driver for the ICS PCI-WDT500/501 watchdog cards
kernel/drivers/xen/blkback/blkbk # Xen block device backend
+ kernel/drivers/xen/blkback/blkback_pagemap # Xen block device backend
+base kernel/drivers/xen/blkfront/xenblk # Xen block device frontend
kernel/drivers/xen/blktap/blktap
+ kernel/drivers/xen/core/domctl
kernel/drivers/xen/gntdev/gntdev
kernel/drivers/xen/netback/netbk # Xen network device backend
kernel/drivers/xen/netback/netloop # Xen network loopback device
@@ -1915,6 +1942,7 @@
kernel/fs/fat/fat
- kernel/fs/freevxfs/freevxfs # Veritas Filesystem (VxFS) driver
kernel/fs/fuse/fuse # FUSE: Filesystem in Userspace
+ kernel/fs/fscache
- kernel/fs/gfs2/gfs2
- kernel/fs/gfs2/locking/dlm/lock_dlm
kernel/fs/hfs/hfs
@@ -2022,9 +2050,13 @@
kernel/net/8021q/8021q
kernel/net/9p/9pnet
kernel/net/9p/9pnet_virtio
+ kernel/net/802/fddi
kernel/net/802/garp
+ kernel/net/802/p8022
kernel/net/802/p8023
+ kernel/net/802/psnap
kernel/net/802/stp
+ kernel/net/802/tr
kernel/net/appletalk/appletalk # AppleTalk 0.20
- kernel/net/atm/atm
kernel/net/atm/atm
@@ -2131,6 +2163,7 @@
kernel/net/ipv4/netfilter/ipt_TTL # IP tables TTL modification module
kernel/net/ipv4/netfilter/ipt_ULOG # iptables userspace logging module
kernel/net/ipv4/netfilter/nf_conntrack_ipv4
+ kernel/net/ipv4/netfilter/nf_defrag_ipv4
kernel/net/ipv4/netfilter/nf_nat_amanda # Amanda NAT helper
kernel/net/ipv4/netfilter/nf_nat_ftp # ftp NAT helper
kernel/net/ipv4/netfilter/nf_nat_h323
@@ -2203,6 +2236,7 @@
kernel/net/iucv/iucv
kernel/net/key/af_key
- kernel/net/lapb/lapb # The X.25 Link Access Procedure B link layer protocol
+ kernel/net/llc/llc
- kernel/net/llc/llc2 # IEEE 802.2 PF_LLC support
kernel/net/mac80211/mac80211
kernel/net/netfilter/nf_conntrack
@@ -2320,6 +2354,7 @@
kernel/net/sunrpc/xprtrdma/xprtrdma
- kernel/net/wanrouter/wanrouter
kernel/net/wireless/cfg80211
+ kernel/net/wireless/lib80211
- kernel/net/x25/x25 # The X.25 Packet Layer network layer protocol
kernel/net/xfrm/xfrm_ipcomp
kernel/net/xfrm/xfrm_user
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org