From da7b43e50afc948c72ceff56faa8e3dedeeb98b4d048d7bcb131b84262c319f8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 11 Mar 2009 17:32:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=50 --- README.SUSE | 7 - build-source-timestamp | 4 +- config.conf | 4 +- config.tar.bz2 | 4 +- get_release_number.sh | 18 +- kabi.tar.bz2 | 4 +- kernel-debug.changes | 81 ++ kernel-debug.spec | 69 +- kernel-default.changes | 81 ++ kernel-default.spec | 69 +- kernel-kdump.changes | 81 ++ kernel-kdump.spec | 69 +- kernel-pae.changes | 81 ++ kernel-pae.spec | 69 +- kernel-ppc64.changes | 81 ++ kernel-ppc64.spec | 69 +- kernel-ps3.changes | 81 ++ kernel-ps3.spec | 69 +- kernel-s390.changes | 81 ++ kernel-s390.spec | 69 +- kernel-source.changes | 81 ++ kernel-source.spec | 51 +- kernel-syms.changes | 81 ++ kernel-syms.spec | 52 +- kernel-trace.changes | 81 ++ kernel-trace.spec | 69 +- kernel-vanilla.changes | 81 ++ kernel-vanilla.spec | 69 +- kernel-dummy.changes => kernel-xen.changes | 81 ++ kernel-dummy.spec => kernel-xen.spec | 841 ++++++++++++++++++++- patches.addon.tar.bz2 | 4 +- patches.apparmor.tar.bz2 | 4 +- patches.arch.tar.bz2 | 4 +- patches.drivers.tar.bz2 | 4 +- patches.fixes.tar.bz2 | 4 +- patches.kabi.tar.bz2 | 2 +- patches.kernel.org.tar.bz2 | 4 +- patches.rpmify.tar.bz2 | 4 +- patches.rt.tar.bz2 | 4 +- patches.suse.tar.bz2 | 4 +- patches.trace.tar.bz2 | 4 +- patches.xen.tar.bz2 | 4 +- prepare-build.sh | 14 - series.conf | 191 ++--- 44 files changed, 2493 insertions(+), 336 deletions(-) rename kernel-dummy.changes => kernel-xen.changes (99%) rename kernel-dummy.spec => kernel-xen.spec (97%) delete mode 100644 prepare-build.sh diff --git a/README.SUSE b/README.SUSE index af401b9c..a3b825c5 100644 --- a/README.SUSE +++ b/README.SUSE @@ -59,13 +59,6 @@ packages, the following binary packages get created: information is used to make sure that the modules match the running kernel. - * kernel-dummy - - This package is relevant inside the SUSE build system only. We use - it to synchronize release numbers among the kernel packages. When - building packages locally, the kernel-dummy package can safely be - ignored. - The CVS repository contains the configuration files (.config) for all SUSE kernel flavors. All configuration files are included in the diff --git a/build-source-timestamp b/build-source-timestamp index 9052bc33..91cd0d82 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,3 +1,3 @@ -2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master diff --git a/config.conf b/config.conf index be347969..66f6ab3e 100644 --- a/config.conf +++ b/config.conf @@ -9,7 +9,7 @@ +IA32 i386/default +IA32 i386/pae +IA32 i386/debug -+IA32 - i386/xen ++IA32 i386/xen +IA32 i386/vanilla +IA32 - i386/rt +IA32 - i386/rt_debug @@ -21,7 +21,7 @@ +ia64 ia64/trace +x86_64 x86_64/default -+x86_64 - x86_64/xen ++x86_64 x86_64/xen +x86_64 x86_64/debug +x86_64 x86_64/vanilla +x86_64 - x86_64/rt diff --git a/config.tar.bz2 b/config.tar.bz2 index d9b1c550..8ddd1b7a 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6dee7ed080f5e2e954581b74318959d914d0bece76b076afa769e48e9a75857 -size 183982 +oid sha256:7310aa00821c5845a2b27a7e4ec9ac0bc39de5ab3192e12c9430c9a4de359c9b +size 184992 diff --git a/get_release_number.sh b/get_release_number.sh index 0101cbd5..f330bcea 100644 --- a/get_release_number.sh +++ b/get_release_number.sh @@ -1,13 +1,9 @@ #! /bin/sh -prefix=rc6.git1. +prefix=rc7. suffix= -commit=49be8e38 -if [ "$3" = kernel-dummy -o -n "$suffix" ]; then - [ -n "$suffix" ] || suffix=$2 - while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do - suffix=${suffix#[^0-9]*.} - done - echo $prefix$suffix${commit:+_}$commit -else - echo "pkg:kernel-dummy" -fi +commit=ec5a2ef5 +[ -n "$suffix" ] || suffix=$2 +while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do + suffix=${suffix#[^0-9]*.} +done +echo $prefix$suffix${commit:+_}$commit diff --git a/kabi.tar.bz2 b/kabi.tar.bz2 index f76bbc16..13d7e8c1 100644 --- a/kabi.tar.bz2 +++ b/kabi.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:133217ac99e728fe3b5c09fecb2a10cc5d2dcb947b960a5f0079d7033dd12a00 -size 2744 +oid sha256:d5d8af24aad423f56eef91ee46be7fa052c7dce757c0406d71a985f9a11347f0 +size 2714 diff --git a/kernel-debug.changes b/kernel-debug.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-debug.spec b/kernel-debug.spec index d0297664..f25a2678 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -63,7 +63,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -216,8 +213,8 @@ Only use this kernel when investigating problems. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -253,7 +250,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -278,7 +275,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -672,7 +670,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -732,8 +730,8 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -775,8 +773,8 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -804,8 +802,8 @@ Only use this kernel when investigating problems. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-debug-man @@ -814,6 +812,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-default.changes b/kernel-default.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-default.spec b/kernel-default.spec index f6acbbcb..236482cc 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -63,7 +63,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -231,8 +228,8 @@ The standard kernel for both uniprocessor and multiprocessor systems. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -268,7 +265,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -293,7 +290,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -687,7 +685,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -746,8 +744,8 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -788,8 +786,8 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -816,8 +814,8 @@ The standard kernel for both uniprocessor and multiprocessor systems. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-default-man @@ -826,6 +824,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-kdump.changes b/kernel-kdump.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-kdump.changes +++ b/kernel-kdump.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-kdump.spec b/kernel-kdump.spec index 6289dd6e..db280d88 100644 --- a/kernel-kdump.spec +++ b/kernel-kdump.spec @@ -63,7 +63,7 @@ Name: kernel-kdump Summary: kernel for kdump Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -212,8 +209,8 @@ crashed kernel. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -249,7 +246,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -274,7 +271,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -668,7 +666,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -730,8 +728,8 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -775,8 +773,8 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -806,8 +804,8 @@ crashed kernel. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-kdump-man @@ -816,6 +814,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-pae.changes b/kernel-pae.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-pae.spec b/kernel-pae.spec index 13f5b506..8ce03e0d 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -63,7 +63,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -213,8 +210,8 @@ that support it, regardless of the amount of main memory. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -250,7 +247,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -275,7 +272,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -669,7 +667,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -735,8 +733,8 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -784,8 +782,8 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -819,8 +817,8 @@ that support it, regardless of the amount of main memory. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-pae-man @@ -829,6 +827,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index da8a22d7..dd7c714a 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -63,7 +63,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -225,8 +222,8 @@ Authors: Tom Gall see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -262,7 +259,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -287,7 +284,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -681,7 +679,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -754,8 +752,8 @@ Authors: Tom Gall see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -810,8 +808,8 @@ Authors: Tom Gall see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -852,8 +850,8 @@ Authors: Tom Gall see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-ppc64-man @@ -862,6 +860,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-ps3.changes b/kernel-ps3.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 107bb985..77c00e04 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -63,7 +63,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -207,8 +204,8 @@ final system. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -244,7 +241,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -269,7 +266,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -663,7 +661,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -722,8 +720,8 @@ needs to be as small as possible. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -764,8 +762,8 @@ needs to be as small as possible. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -795,8 +793,8 @@ final system. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-ps3-man @@ -805,6 +803,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-s390.changes b/kernel-s390.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-s390.spec b/kernel-s390.spec index f78e3e40..ba662d2c 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -63,7 +63,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -206,8 +203,8 @@ The standard kernel. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -243,7 +240,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -268,7 +265,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -662,7 +660,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -721,8 +719,8 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -763,8 +761,8 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -791,8 +789,8 @@ The standard kernel. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-s390-man @@ -801,6 +799,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-source.changes b/kernel-source.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-source.spec b/kernel-source.spec index 1a639d9c..7a079c40 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -30,16 +30,13 @@ Url: http://www.kernel.org/ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: Development/Sources AutoReqProv: off BuildRequires: coreutils sed BuildRequires: fdupes Requires(post): coreutils sed -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 Provides: linux Provides: kernel-source = 2.6.29-%source_rel @@ -83,6 +80,7 @@ Source56: kernel-ps3.spec Source57: kernel-s390.spec Source58: kernel-trace.spec Source59: kernel-vanilla.spec +Source60: kernel-xen.spec Source100: config.tar.bz2 Source101: patches.arch.tar.bz2 Source102: patches.drivers.tar.bz2 @@ -118,8 +116,8 @@ Authors: see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -137,7 +135,7 @@ RELEASE=%source_rel while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.29-rc6-git1-$RELEASE +KERNELRELEASE=2.6.29-rc7-$RELEASE case kernel-source in (*-rt) variant=-rt @@ -293,6 +291,45 @@ done %files -f kernel-source.files %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-syms.changes b/kernel-syms.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-syms.spec b/kernel-syms.spec index 452c2984..9622568c 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -29,17 +29,14 @@ Url: http://www.kernel.org/ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: Development/Sources AutoReqProv: off BuildRequires: coreutils -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 %ifarch %ix86 -BuildRequires: kernel-debug kernel-default kernel-pae kernel-trace +BuildRequires: kernel-debug kernel-default kernel-pae kernel-trace kernel-xen %else %ifarch ppc BuildRequires: kernel-default kernel-kdump kernel-ppc64 kernel-ps3 @@ -57,7 +54,7 @@ BuildRequires: kernel-default BuildRequires: kernel-debug kernel-default kernel-trace %else %ifarch x86_64 -BuildRequires: kernel-debug kernel-default kernel-trace +BuildRequires: kernel-debug kernel-default kernel-trace kernel-xen %endif %endif %endif @@ -94,8 +91,8 @@ Authors: see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -154,6 +151,45 @@ done /lib/modules/*/build %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-trace.changes b/kernel-trace.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-trace.spec b/kernel-trace.spec index e59bba19..60ac6567 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -63,7 +63,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -218,8 +215,8 @@ Authors: see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -255,7 +252,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -280,7 +277,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -674,7 +672,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -737,8 +735,8 @@ Authors: see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -783,8 +781,8 @@ Authors: see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -817,8 +815,8 @@ Authors: see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-trace-man @@ -827,6 +825,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 975ca531..8b1e075a 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -63,7 +63,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.29 -Release: 2 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -86,9 +86,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd -%if ! 0%{?opensuse_bs} -BuildRequires: kernel-dummy -%endif %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -228,8 +225,8 @@ The standard kernel - without any SUSE patches -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %prep @@ -265,7 +262,7 @@ for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do fi done %else -for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" exit 1 @@ -290,7 +287,7 @@ cat ../config/%cpu_arch_flavor \ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <> ../.rpm-defs < %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ - install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf fi add_dirs_to_filelist() { local filelist @@ -684,7 +682,7 @@ add_dirs_to_filelist() { -name '*.ko' -prune -o \ -printf '/%%p\n' cat %my_builddir/base-modules - echo '%%%%config /etc/modprobe.d/module-renames' + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' find $obj_dir \ -type d -o \ -printf '/%%p\n' @@ -741,8 +739,8 @@ The standard kernel - without any SUSE patches -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun base -f preun-base.sh @@ -781,8 +779,8 @@ The standard kernel - without any SUSE patches -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %preun extra -f preun-extra.sh @@ -809,8 +807,8 @@ The standard kernel - without any SUSE patches -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master %files -n kernel-vanilla-man @@ -819,6 +817,45 @@ GIT Branch: master %endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/kernel-dummy.changes b/kernel-xen.changes similarity index 99% rename from kernel-dummy.changes rename to kernel-xen.changes index f8fb4ea5..86e80e7f 100644 --- a/kernel-dummy.changes +++ b/kernel-xen.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Mar 9 21:26:13 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). + +------------------------------------------------------------------- +Mon Mar 9 12:04:46 CET 2009 - jbeulich@novell.com + +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. + +------------------------------------------------------------------- +Mon Mar 9 09:42:36 CET 2009 - jbeulich@novell.com + +- Update Xen config files (get tracing options back in sync with + default). + +------------------------------------------------------------------- +Fri Mar 6 20:56:37 CET 2009 - jeffm@suse.de + +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. + +------------------------------------------------------------------- +Fri Mar 6 20:36:26 CET 2009 - jeffm@suse.de + +- config.conf: Enabled Xen for building. + +------------------------------------------------------------------- +Fri Mar 6 17:49:36 CET 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.29-rc7. + +------------------------------------------------------------------- +Fri Mar 6 13:34:30 CET 2009 - jbenc@suse.cz + +- Update config files: enabled wireless debugging in -debug flavors. + +------------------------------------------------------------------- +Fri Mar 6 10:36:19 CET 2009 - mmarek@suse.cz + +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. + +------------------------------------------------------------------- +Wed Mar 4 20:18:28 CET 2009 - jeffm@suse.com + +- Update to 2.6.29-rc7. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Mar 4 11:48:01 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. + +------------------------------------------------------------------- +Tue Mar 3 23:00:28 CET 2009 - jeffm@suse.com + +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. + +------------------------------------------------------------------- +Thu Feb 26 15:32:35 CET 2009 - jeffm@suse.com + +- scripts/tar-up.sh: Add -u to update existing spec files. + +------------------------------------------------------------------- +Thu Feb 26 11:50:57 CET 2009 - sven@suse.de + +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. + +------------------------------------------------------------------- +Wed Feb 25 19:41:59 CET 2009 - mmarek@suse.cz + +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. + ------------------------------------------------------------------- Tue Feb 24 23:28:11 CET 2009 - jeffm@suse.com diff --git a/kernel-dummy.spec b/kernel-xen.spec similarity index 97% rename from kernel-dummy.spec rename to kernel-xen.spec index 10a1a581..03b7dd98 100644 --- a/kernel-dummy.spec +++ b/kernel-xen.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.29) +# spec file for package kernel-xen (Version 2.6.29) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,40 +16,843 @@ # # norootforbuild -# icecream 0 -Url: http://www.kernel.org/ +%if 0%{?opensuse_bs} +# Strip off the build number ("y") from the "x.y" release number +%define source_rel %(release=%release; echo ${release%.*}) +%else +# We don't have build numbers internally +%define source_rel %release +%endif +# Don't use shell commands in build macros, this won't work outside of rpm +%define build_flavor "xen" +%define build_kdump 0 +%define build_xen 0 +%define build_vanilla 0 +%define build_ps3 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" +%define build_xen 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif +%if %{build_flavor} == "ps3" +%define build_ps3 1 +%endif +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl}) +%define symbols %(set -- kernel-xen kernel-xen $(case xen in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) +%define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/xen$') +# Define some CONFIG variables as rpm macros as well. (rpm cannot handle +# defining them all at once.) +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS +%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} +%ifarch %ix86 x86_64 +%define install_vdso 1 +%else +%define install_vdso 0 +%endif +%if %build_vanilla || %build_kdump || %CONFIG_MODULES != "y" +%define split_packages 0 +%else +%define split_packages 1 +%endif -Name: kernel-dummy -Summary: Internal dummy package for synchronizing release numbers +Name: kernel-xen +Summary: The Xen Kernel Version: 2.6.29 -Release: 2 +Release: 1 License: GPL v2 only Group: System/Kernel -AutoReqProv: off +Url: http://www.kernel.org/ +AutoReqProv: on +BuildRequires: coreutils module-init-tools sparse +BuildRequires: fdupes +Provides: kernel-xen_%_target_cpu = %version-%release +%if %split_packages +Requires: kernel-xen-base_%_target_cpu = %version-%release +%endif +Requires(pre): coreutils awk +Requires(post): module-init-tools +# This Requires is wrong, because the post/postun scripts have a +# test -x update-bootloader, having perl-Bootloader is not a hard requirement. +# But, there is no way to tell rpm or yast to schedule the installation +# of perl-Bootloader before kernel-binary.rpm if both are in the list of +# packages to install/update. Likewise, this is true for mkinitrd. +# A specific version of perl-Bootloader is not required, because the post/postun +# scripts handle the two API versions of 10.1/SLES10 GA and 10.2/SLES10 SP1 +Requires(post): perl-Bootloader +Requires(post): mkinitrd +#!BuildIgnore: perl-Bootloader mkinitrd +%ifarch ia64 +# arch/ia64/scripts/unwcheck.py +BuildRequires: python +%endif +%ifarch s390 s390x +BuildRequires: dwarfextract +%endif +%if %build_xen +%ifarch %ix86 +Provides: kernel-xenpae = 2.6.29 +Obsoletes: kernel-xenpae <= 2.6.29 +%endif +#!BuildIgnore: xen +%endif +Provides: kernel-xen-nongpl +Obsoletes: kernel-xen-nongpl +%if %build_vanilla +# force bzip2 instead of lzma compression to allow install on older dist versions +%define _binary_payload w9.bzdio +%endif +# dead network if installed on SLES10, otherwise it will work (mostly) +Conflicts: sysfsutils < 2.0 +%if ! %build_vanilla +Conflicts: apparmor-profiles <= 2.1 +Conflicts: apparmor-parser < 2.3 +# root-lvm only works with newer udevs +Conflicts: udev < 118 +Conflicts: lvm2 < 2.02.33 +%endif +%ifarch %ix86 +Conflicts: libc.so.6()(64bit) +%endif +Provides: kernel = 2.6.29-%source_rel +%ifarch %ix86 +%else +%ifarch x86_64 +%endif +%endif +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source10: preun.sh +Source11: postun.sh +Source12: pre.sh +Source13: post.sh +Source20: series.conf +Source21: config.conf +Source22: supported.conf +Source30: arch-symbols +Source31: guards +Source32: config-subst +Source33: check-for-config-changes +Source34: check-supported-list +Source40: build-source-timestamp +Source41: built-in-where +Source44: find-provides +Source45: module-renames +Source46: modversions +Source47: symsets.pl +Source100: config.tar.bz2 +Source101: patches.arch.tar.bz2 +Source102: patches.drivers.tar.bz2 +Source103: patches.fixes.tar.bz2 +Source104: patches.rpmify.tar.bz2 +Source105: patches.suse.tar.bz2 +Source107: patches.xen.tar.bz2 +Source108: patches.addon.tar.bz2 +Source109: patches.kernel.org.tar.bz2 +Source110: patches.apparmor.tar.bz2 +Source111: patches.rt.tar.bz2 +Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 +Source120: kabi.tar.bz2 +%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %ix86 x86_64 +# These files are found in the kernel-source package: +NoSource: 0 +NoSource: 100 +NoSource: 101 +NoSource: 102 +NoSource: 103 +NoSource: 104 +NoSource: 105 +NoSource: 107 +NoSource: 108 +NoSource: 109 +NoSource: 110 +NoSource: 111 +NoSource: 120 +# The following KMPs have been integrated into the kernel package. +Obsoletes: iwlwifi-kmp +Obsoletes: ipw3945-kmp +Obsoletes: adm8211-kmp +Obsoletes: rt2x00-kmp +Obsoletes: rfswitch-kmp +Obsoletes: uvcvideo-kmp +Obsoletes: atl2-kmp +Obsoletes: wlan-ng-kmp +Obsoletes: et131x-kmp +Obsoletes: ivtv-kmp +Obsoletes: at76_usb-kmp +Obsoletes: pcc-acpi-kmp +Obsoletes: uvcvideo-kmp +Obsoletes: ralink-rt2860-kmp +# Build with bash instead of sh as the shell: this turns on bash +# extensions like <(...). +%define _buildshell /bin/bash +# Provide the exported symbols as "ksym(symbol) = hash" +%define __find_provides %my_builddir/find-provides %name +# Will modules not listed in supported.conf abort the kernel build (0/1)? +%define supported_modules_check 0 +%define tolerate_unknown_new_config_options 0 +# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, +# 31 is the maximum; see scripts/kabi-checks) +%define tolerate_kabi_changes 6 %description -Internal dummy package for synchronizing release numbers +The Linux kernel for Xen paravirtualization. -Authors: --------- - Andreas Gruenbacher +This kernel can be used both as the domain0 ("xen0") and as an +unprivileged ("xenU") kernel. -Source Timestamp: 2009-02-25 15:24:03 +0100 -GIT Revision: 49be8e38f177aabc7c6b8e3fafd14edcef7a69d3 + + +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c GIT Branch: master -%install -rm -rf %buildroot -mkdir -p %buildroot/etc -echo dummy > %buildroot/etc/dummy +%prep +if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then + echo "The kernel-xen-2.6.29.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.29.src.rpm." + exit 1 +fi +echo "Architecture 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 +supported_conf() { + %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u +} +# Generate the list of modules to be marked as supported +{ supported_conf base + for how in external; do + comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ + | sed -e 's:$: '"$how"':' + done +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +# Create grep pattern file for the modules to end up in the base package +comm -2 -3 <(supported_conf base) <(supported_conf) \ + | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ + > %my_builddir/grep-for-base-modules +cd linux-2.6.28 +# Apply the patches needed for this architecture. +%if ! %build_vanilla +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do + if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then + echo "*** Patch $patch failed ***" + exit 1 + fi +done +%else +for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep 'kernel\.org|rpmify'); do + if ! patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../$patch; then + echo "*** Patch $patch failed ***" + exit 1 + fi +done +%endif +# Release number without the EXTRAVERSION +RELEASE=%source_rel +while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do + RELEASE=${RELEASE#[^0-9]*.} +done +if [ -f %_sourcedir/localversion ] ; then + cat %_sourcedir/localversion > localversion +fi +cat ../config/%cpu_arch_flavor \ +| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-xen'"' \ +| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +%if 0%{?__debug_package:1} + | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ +%endif + > .config +cpu_arch_flavor="%cpu_arch_flavor" +cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs +sed 's:^sourcedir=.*:sourcedir="%_sourcedir":; + s:^builddir=.*:builddir="%my_builddir":' \ + %_sourcedir/find-provides >%my_builddir/find-provides +chmod +x %my_builddir/find-provides -%files +%build +source .rpm-defs +cd linux-2.6.28 +cp .config .config.orig +%if %{tolerate_unknown_new_config_options} +MAKE_ARGS="$MAKE_ARGS -k" +yes '' | make oldconfig $MAKE_ARGS +%else +make silentoldconfig $MAKE_ARGS < /dev/null +%_sourcedir/check-for-config-changes .config.orig .config +rm .config.orig +%endif +# create *.symref files in the tree +if [ -e ../kabi/$cpu_arch/symtypes-xen ]; then + %_sourcedir/modversions --unpack . <../kabi/$cpu_arch/symtypes-xen +fi +make prepare $MAKE_ARGS +krel=$(make -s kernelrelease $MAKE_ARGS) +if [ "$krel" != "$KERNELRELEASE" ]; then + echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2 + exit 1 +fi +cat > .kernel-binary.spec.buildenv <" \ + | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) + find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 + find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 +%else + cp vmlinux %buildroot/$vmlinux +%endif + if [ "$1" = --compressed ]; then + gzip -9 %buildroot/$vmlinux + chmod a-x %buildroot/$vmlinux.gz + fi +} +%if %build_kdump + add_vmlinux + chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE + image=vmlinux +%else +# architecture specifics +%ifarch %ix86 x86_64 + add_vmlinux --compressed +%if %build_xen + image=vmlinuz +%else + image=bzImage +%endif + cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-$KERNELRELEASE + image=vmlinuz +%endif +%ifarch alpha + add_vmlinux --compressed + cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-$KERNELRELEASE + image=vmlinuz +%endif +%ifarch ppc ppc64 + add_vmlinux + chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE + image=vmlinux +%endif +%ifarch ia64 + add_vmlinux --compressed + mv %buildroot/boot/vmlinux-$KERNELRELEASE.gz \ + %buildroot/boot/vmlinuz-$KERNELRELEASE + image=vmlinuz +%endif +%ifarch s390 s390x + add_vmlinux --compressed + cp -p arch/s390/boot/image %buildroot/boot/image-$KERNELRELEASE + image=image + if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE + fi +%if %CONFIG_KMSG_IDS == "y" + mkdir -p %buildroot/usr/share/man/man9 + find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' +%endif +%endif + if [ -e init/kerntypes.o ]; then + cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE + fi +# end of build_kdump +%endif +for sub in '-base' '' '-extra'; do +%if %split_packages + if [ "x$sub" = "x-base" ]; then + base_package=1 + else + base_package=0 + fi +%else + base_package=1 +%endif + for script in preun postun pre post; do + sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ + -e "s:@IMAGE@:$image:g" \ + -e "s:@FLAVOR""@:xen:g" \ + -e "s:@SUBPACKAGE@:kernel-xen$sub:g" \ + -e "s:@BASE_PACKAGE@:$base_package:g" \ + -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ + %_sourcedir/$script.sh > ../$script$sub.sh + done +done +%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +# keep this -suffix list in sync with post.sh and postun.sh +suffix=-xen +%endif +ln -s $image$suffix %buildroot/boot/$image$suffix +ln -s initrd$suffix %buildroot/boot/initrd$suffix +cp .config %buildroot/boot/config-$KERNELRELEASE +%if %install_vdso +# Install the unstripped vdso's that are linked in the kernel image +make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot +%endif +# Create a dummy initrd with roughly the size the real one will have. +# That way, YaST will know that this package requires some additional +# space in /boot. +dd if=/dev/zero of=%buildroot/boot/initrd-$KERNELRELEASE \ + bs=1024 seek=2047 count=1 +if [ $CONFIG_MODULES = y ]; then + # Figure out where the symbols that vmlinux exports are defined. + # (We need this information below as well as in find-provides; we "annotate" + # the original Module.symvers here to make sure that we are consistent in + # both places.) + %_sourcedir/built-in-where < Module.symvers > Module.symvers.split + mv Module.symvers.split Module.symvers + gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ + %_sourcedir %buildroot/lib/modules/$KERNELRELEASE; then +%if %supported_modules_check + exit 1 +%endif + echo "Consistency check error: please update supported.conf." + fi +%ifarch s390 s390x + if [ -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-$KERNELRELEASE ] ; then + find %buildroot -name "*.ko" > kofiles.list + dwarfextract %buildroot/boot/Kerntypes-$KERNELRELEASE -C kofiles.list + fi +%endif + # Also put the resulting file in $obj_dir/$cpu_arch/xen + # so that kernel-source + kernel-xen is sufficient for building + # modules that have modversions as well. + obj_dir=usr/src/linux-${KERNELRELEASE%%-xen}-obj + mkdir -p %buildroot/$obj_dir/$cpu_arch/xen + cp Module.symvers %buildroot/$obj_dir/$cpu_arch/xen + # Table of types used in exported symbols (for modversion debugging). + %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE + if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then + gzip -9 %buildroot/boot/symtypes-$KERNELRELEASE + else + rm -f %buildroot/boot/symtypes-$KERNELRELEASE + fi + # Some architecture's $(uname -m) output is different from the ARCH + # parameter that needs to be passed to kbuild. Create symlinks from + # $(uname -m) to the ARCH directory. + [ -e %buildroot/$obj_dir/%_target_cpu ] \ + || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu + # We were building in %my_builddir/linux-2.6.28, but the sources will + # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # build symlink. + rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} + ln -s /usr/src/linux-${KERNELRELEASE%%-xen} \ + %buildroot/lib/modules/$KERNELRELEASE/source + ln -s /$obj_dir/$cpu_arch/xen \ + %buildroot/lib/modules/$KERNELRELEASE/build + # Abort if there are any undefined symbols + msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ + -b %buildroot -ae $KERNELRELEASE 2>&1)" + if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then + exit 1 + fi +%if %split_packages + # Generate the lists of supported and unsupported modules. + ( cd %buildroot + : > %my_builddir/supported-modules + : > %my_builddir/unsupported-modules + for module in $(find lib/modules/$KERNELRELEASE -type f -name '*.ko'); do + case "$(/sbin/modinfo -F supported $module)" in + (yes|external) + modname=$(basename $module .ko) + deps=$(/sbin/modinfo -F depends $module|tr ',' ' ') + echo "$modname: $deps" >> %my_builddir/Makefile.supported + echo "/$module" >> %my_builddir/supported-modules + ;; + (*) + echo "/$module" >> %my_builddir/unsupported-modules + ;; + esac + done + ) + add_dependent_modules() { + local modules_dep=$1 + xargs make -rRs -f <(echo -e '%:\n\t@echo $@' ; cat $modules_dep) + } + modules_dep=%buildroot/lib/modules/$KERNELRELEASE/modules.dep + # Make sure that no supported modules depend on any unsupported modules. + dependent_unsupported_modules=$( + OUT=$(mktemp) + sed -e 's/:.*//g' < %my_builddir/Makefile.supported | \ + xargs make -rRsk -f %my_builddir/Makefile.supported > $OUT + sed -ne '/No rule/s/^.*No rule to make target//p' < $OUT | tr -d "\`'" + ) + if [ -n "$dependent_unsupported_modules" ]; then + echo "The following unsupported modules are used by supported modules:" + echo "$dependent_unsupported_modules" + echo "Please fix supported.conf." + if [ ! -e %_sourcedir/IGNORE-UNSUPPORTED-DEPS ]; then + exit 1 + fi + fi + # Compute the list of base modules: modules that core modules depend on + # implicitly are also core modules. + grep -f %my_builddir/grep-for-base-modules %my_builddir/supported-modules \ + | add_dependent_modules $modules_dep > %my_builddir/base-modules + # All supported modules which are not core modules belong in kernel-xen. + comm -3 <(sort %my_builddir/supported-modules) \ + <(sort %my_builddir/base-modules) \ + > %my_builddir/main-modules +%else + ( cd %buildroot + find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' + ) > %my_builddir/base-modules +%endif + # generate symsets + mkdir -p %my_builddir/{base,main,extra}-symsets + for f in %my_builddir/{base,main,unsupported}-modules; do + if [ -f "$f" ]; then + sed 's:^/:%buildroot/:' "$f" + fi > "$f-br" + done + reference= + if test -e %my_builddir/kabi/$cpu_arch/symsets-xen.tar.gz; then + tar xzf %my_builddir/kabi/$cpu_arch/symsets-xen.tar.gz -C \ + %my_builddir/kabi/$cpu_arch + reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-xen/" + fi + %_sourcedir/symsets.pl --generate-symsets \ + $reference \ + --symvers=Module.symvers \ + --modules=%my_builddir/base-modules-br \ + --output-dir=%my_builddir/base-symsets +%if %split_packages + %_sourcedir/symsets.pl --generate-symsets \ + $reference \ + --modules=%my_builddir/main-modules-br \ + --required-modules=%my_builddir/base-modules-br \ + --output-dir=%my_builddir/main-symsets + %_sourcedir/symsets.pl --generate-symsets \ + $reference \ + --modules=%my_builddir/unsupported-modules-br \ + --required-modules=%my_builddir/base-modules-br \ + --required-modules=%my_builddir/main-modules-br \ + --output-dir=%my_builddir/extra-symsets +%endif + # check for kabi changes + KABI=0 + if [ -n "$reference" ]; then + %_sourcedir/symsets.pl --check-kabi \ + $reference \ + --symvers=Module.symvers \ + --modules=%my_builddir/base-modules-br \ + --modules=%my_builddir/main-modules-br \ + --modules=%my_builddir/unsupported-modules-br \ + --commonsyms=%my_builddir/kabi/commonsyms \ + --usedsyms=%my_builddir/kabi/usedsyms \ + --severities=%my_builddir/kabi/severities \ + --max-badness=%tolerate_kabi_changes || KABI=$? + fi + if [ $KABI -ne 0 ]; then + if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-xen -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." + exit 1 + fi + # Indicate the ABI badness in build result emails. + echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag + fi + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir -p $symsets + find %my_builddir/{base,main,extra}-symsets -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # Set up some module aliases + install -d -m 755 %buildroot/etc/modprobe.d/ + install -m 644 %_sourcedir/module-renames \ + %buildroot/etc/modprobe.d/50-module-renames.conf +fi +add_dirs_to_filelist() { + local filelist + filelist=$(cat "$@") + echo "$filelist" + # Below, we do this: + # - remove filelist macros + # - remove last pathname component + # - generate all parents and make the list unique + # - skip directories owned be other packages + # - add the %dir prefix (double-escaped for find and rpm) + echo "$filelist" \ + | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \ + | sed -re 's:/[^/]+$::' \ + | sed -nre ':a; p; s:/[^/]+$::; ta' \ + | sort -u \ + | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \ + | sed -e 's:^:%%%%dir :' +} +# Collect the file lists. +{ cd %buildroot + find boot \ + \( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \ + -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' + touch $RPM_BUILD_ROOT/boot/initrd-${KERNELRELEASE}-kdump + if [ $CONFIG_MODULES = y ]; then + find lib/modules/$KERNELRELEASE \ + -type d -o \ + \( -path '*/modules.*' ! -path '*/modules.order' \) \ + -printf '%%%%%%%%ghost /%%p\n' -o \ + -name '*.ko' -prune -o \ + -printf '/%%p\n' + cat %my_builddir/base-modules + echo '%%%%config /etc/modprobe.d/50-module-renames.conf' + find $obj_dir \ + -type d -o \ + -printf '/%%p\n' + fi + test -d lib/firmware/$KERNELRELEASE && \ + find lib/firmware/$KERNELRELEASE \ + -type d -o \ + -printf '/%%p\n' + if [ -e .%_docdir/%name ]; then + echo "%%%%doc %_docdir/%name" + fi +} | add_dirs_to_filelist > %my_builddir/kernel-base.files +%if %split_packages + add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files + add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files +%endif +# Hardlink duplicate files automatically (from package fdupes): It doesn't save +# much, but it keeps rpmlint from breaking the package build. +%fdupes $RPM_BUILD_ROOT + +%preun -f preun.sh + +%postun -f postun.sh + +%pre -f pre.sh + +%post -f post.sh +%if %split_packages + +%files -f kernel-main.files +%else + +%files -f kernel-base.files +%endif %defattr(-, root, root) -/etc/dummy + +%package -n kernel-xen-base +Summary: The Xen Kernel - base modules +License: GPL v2 only +Group: System/Kernel +Url: http://www.kernel.org/ +AutoReqProv: on +Provides: kernel-xen-base_%_target_cpu = %version-%release +Requires(pre): coreutils awk +Requires(post): module-init-tools +Requires(post): perl-Bootloader +Requires(post): mkinitrd +%ifarch %ix86 +Conflicts: libc.so.6()(64bit) +%endif + +%description -n kernel-xen-base +The Linux kernel for Xen paravirtualization. + +This kernel can be used both as the domain0 ("xen0") and as an +unprivileged ("xenU") kernel. + +This package contains only the base modules, required in all installs. + + + +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c +GIT Branch: master + +%preun base -f preun-base.sh + +%postun base -f postun-base.sh + +%pre base -f pre-base.sh + +%post base -f post-base.sh +%if %split_packages + +%files -n kernel-xen-base -f kernel-base.files +%defattr(-, root, root) +%endif + +%package -n kernel-xen-extra +Summary: The Xen Kernel - extra modules +License: GPL v2 only +Group: System/Kernel +Url: http://www.kernel.org/ +AutoReqProv: on +Provides: kernel-xen-extra_%_target_cpu = %version-%release +Requires: kernel-xen_%_target_cpu = %version-%release +Requires(pre): coreutils awk +Requires(post): module-init-tools +Requires(post): perl-Bootloader +Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-xen_%_target_cpu) +Supplements: packageand(product(openSUSE):kernel-xen_%_target_cpu) +%ifarch %ix86 +Conflicts: libc.so.6()(64bit) +%endif + +%description -n kernel-xen-extra +The Linux kernel for Xen paravirtualization. + +This kernel can be used both as the domain0 ("xen0") and as an +unprivileged ("xenU") kernel. + +This package contains additional modules not supported by Novell. + + + +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c +GIT Branch: master + +%preun extra -f preun-extra.sh + +%postun extra -f postun-extra.sh + +%pre extra -f pre-extra.sh + +%post extra -f post-extra.sh +%if %split_packages + +%files -n kernel-xen-extra -f kernel-extra.files +%defattr(-, root, root) +%endif +%if %CONFIG_KMSG_IDS == "y" + +%package -n kernel-xen-man +License: GPL v2 only +Summary: The Xen Kernel +Group: System/Kernel + +%description -n kernel-xen-man +The Linux kernel for Xen paravirtualization. + +This kernel can be used both as the domain0 ("xen0") and as an +unprivileged ("xenU") kernel. + + + +Source Timestamp: 2009-03-09 21:27:03 +0100 +GIT Revision: ec5a2ef564980bbb965671ac3a03fd23cc96ca6c +GIT Branch: master + +%files -n kernel-xen-man +%defattr(-,root,root) +/usr/share/man/man9/* +%endif %changelog +* Mon Mar 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: renamed modprobe config to + /etc/modprobe.d/50-module-renames.conf (required by new + module-init-tools). +* Mon Mar 09 2009 jbeulich@novell.com +- patches.xen/xen3-patch-2.6.29-rc4: fix ia64 build. +* Mon Mar 09 2009 jbeulich@novell.com +- Update Xen config files (get tracing options back in sync with + default). +* Fri Mar 06 2009 jeffm@suse.de +- Update config files: Enable CONFIG_FRAME_POINTER on Xen. +* Fri Mar 06 2009 jeffm@suse.de +- config.conf: Enabled Xen for building. +* Fri Mar 06 2009 jbeulich@novell.com +- Update Xen patches to 2.6.29-rc7. +* Fri Mar 06 2009 jbenc@suse.cz +- Update config files: enabled wireless debugging in -debug flavors. +* Fri Mar 06 2009 mmarek@suse.cz +- rpm/get_release_number.sh.in, rpm/kernel-binary.spec.in, + rpm/kernel-source.spec.in, rpm/kernel-syms.spec.in, + scripts/tar-up.sh, doc/README.SUSE: finally drop kernel-dummy +- rpm/prepare-build.sh: Delete. +* Wed Mar 04 2009 jeffm@suse.com +- Update to 2.6.29-rc7. + - Eliminated 1 patch. +* Wed Mar 04 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in: workaround a bash bug (bnc#481817) + in kernel-vanilla.spec. +* Tue Mar 03 2009 jeffm@suse.com +- patches.suse/export-security_inode_permission: Export + security_inode_permission for aufs. +* Thu Feb 26 2009 jeffm@suse.com +- scripts/tar-up.sh: Add -u to update existing spec files. +* Thu Feb 26 2009 sven@suse.de +- rpm/kernel-binary.spec.in: Fix sub-package install-time conflict. +* Wed Feb 25 2009 mmarek@suse.cz +- scripts/tar-up.sh: create tarballs that don't change + unnecessarily: set owner/group to nobody/nobody, mtime to time of + the latest commit and sort the input files. * Tue Feb 24 2009 jeffm@suse.com - Update to 2.6.29-rc6-git1. * Sat Feb 21 2009 mmarek@suse.cz diff --git a/patches.addon.tar.bz2 b/patches.addon.tar.bz2 index c3c2259b..1a69ba14 100644 --- a/patches.addon.tar.bz2 +++ b/patches.addon.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cddfbf5c767dd5c74ca7a5b7a1e2d6e262fb1c1cf057571a7e3da3e3c4780a30 -size 127 +oid sha256:33f5b730de64e74e9367dc8ffd34c2bd39aa1cf0abd2261324213665beb882d4 +size 129 diff --git a/patches.apparmor.tar.bz2 b/patches.apparmor.tar.bz2 index 6a38d445..b67c8b3d 100644 --- a/patches.apparmor.tar.bz2 +++ b/patches.apparmor.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e957df2cc06bb5e463b813477c8701ba5ef14a8f69082ef1e5a8bd46b5117e1d -size 60211 +oid sha256:d7284fcfae8e1ef87a373733b6e9db06e878a76c9f251a4410ece466113e18a9 +size 60018 diff --git a/patches.arch.tar.bz2 b/patches.arch.tar.bz2 index f58766a1..dbce093a 100644 --- a/patches.arch.tar.bz2 +++ b/patches.arch.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:530ea8f8ba9b9c60b06ab3cea526b3e3fc3deb4e6bf99036302e5b9e32b3b6d4 -size 36636 +oid sha256:6d93a0e81ecd598c1450c20d1ec2bcb0af2c0f46c4831794106b72e55f010ae3 +size 36607 diff --git a/patches.drivers.tar.bz2 b/patches.drivers.tar.bz2 index 3bb040ea..0160377a 100644 --- a/patches.drivers.tar.bz2 +++ b/patches.drivers.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d31f940fa06d0a3b9bf080ce519c93d99e87fb6b467ae645258f44a722fcaadb -size 174322 +oid sha256:8a2fb9d88132985542a4fca1cb5a509f382509c326a53d676e44c4b1071c40b8 +size 173520 diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index 437832b8..25b5e92f 100644 --- a/patches.fixes.tar.bz2 +++ b/patches.fixes.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60b63b46f05f0229c3b93a9dc86e87a6f225542346e6c64df9c2f011db988b00 -size 43028 +oid sha256:fc3907d8e759380cae2ad43a61b9a60bf53023f2d4257f0dd06703ed06a01cb1 +size 42993 diff --git a/patches.kabi.tar.bz2 b/patches.kabi.tar.bz2 index 1abb9722..3b8d825c 100644 --- a/patches.kabi.tar.bz2 +++ b/patches.kabi.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:161007f3585a32f8818de02495223c826b360189a6fdb685e41b6fd270418c1c +oid sha256:c07656a007da848ce3eb77de4263482fc23f8570a7e00d660a4c609454d26b79 size 125 diff --git a/patches.kernel.org.tar.bz2 b/patches.kernel.org.tar.bz2 index 120dd9cb..3cdd5f84 100644 --- a/patches.kernel.org.tar.bz2 +++ b/patches.kernel.org.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88c68e4bfd3c357782bc09607b8036fb4b2742bf20774bc9ad6c35b2ee63801b -size 12667403 +oid sha256:343e197079f5ff0c9a6456a42e7d7534958309e9afa33cb9152773196b00031c +size 12766840 diff --git a/patches.rpmify.tar.bz2 b/patches.rpmify.tar.bz2 index 6db735b0..686679e4 100644 --- a/patches.rpmify.tar.bz2 +++ b/patches.rpmify.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d480295f359a405e3161812df20f7e1d2f691d93bf51040accb57ded7337254 -size 3376 +oid sha256:0c1d2b0da5a3cf100cbd6a3616a4436c48637062ff4c9c173a2e7e634d6c559f +size 3367 diff --git a/patches.rt.tar.bz2 b/patches.rt.tar.bz2 index 460c3ef0..6aefd94b 100644 --- a/patches.rt.tar.bz2 +++ b/patches.rt.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:744e897802dfc34311d8608e91d29ad12ce5d74d0b294de5c7e0413f7c3ae533 -size 124 +oid sha256:cc58fc5f6be31ebe34ef66e2cb2be71ea17f2be48553ae980d850e684461cd69 +size 125 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 2f3a41c9..b61b7e5e 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5aeddfb89a7b7d1d1be88342954408c73cd4f92c4115c0622bd1fc3fff93599b -size 1280183 +oid sha256:760e06de96ed47bd8d923de7c404f094cec4a2e13b86cb711a7adad77322e64d +size 1278997 diff --git a/patches.trace.tar.bz2 b/patches.trace.tar.bz2 index 09f9ce1d..6aa03796 100644 --- a/patches.trace.tar.bz2 +++ b/patches.trace.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1243232814644478a8aa36091d8117e7d888476a229ec058540b523ba3b7ebdd -size 43323 +oid sha256:a662a7becae55b1d8e0bc7d379f004834543b7fe0b43a40a687a2a7bae8c4bf5 +size 43303 diff --git a/patches.xen.tar.bz2 b/patches.xen.tar.bz2 index 21a9d12e..df860817 100644 --- a/patches.xen.tar.bz2 +++ b/patches.xen.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fcd21b1cfc0e99f583f443c6d552a07538ced5b8fce4df631206c9fc1b16142 -size 1498744 +oid sha256:9912c6b07ee1c53572e9082d6f6d7aba47b0c2e2ce824317acc3239f1f8f639b +size 1651376 diff --git a/prepare-build.sh b/prepare-build.sh deleted file mode 100644 index a8211f5a..00000000 --- a/prepare-build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# vim: syntax=sh -#set -x -set -e -test -f /.buildenv || exit 0 -this_release=`rpm -q --qf %{RELEASE} kernel-dummy` -echo this_release $this_release -test -n "$this_release" || exit 1 -shopt -s nullglob -for i in /usr/src/packages/SOURCES/*.spec; do - sed -i -e '/^BuildRequires:/s@kernel-dummy@@g' \ - -e '/^BuildRequires:[ \t]*$/d' \ - -e "/^Release:/s@^.*@Release: $this_release@" $i -done diff --git a/series.conf b/series.conf index 85703fe8..8dbc46ee 100644 --- a/series.conf +++ b/series.conf @@ -33,7 +33,7 @@ patches.kernel.org/patch-2.6.29-rc3-rc4 patches.kernel.org/patch-2.6.29-rc4-rc5 patches.kernel.org/patch-2.6.29-rc5-rc6 - patches.kernel.org/patch-2.6.29-rc6-git1 + patches.kernel.org/patch-2.6.29-rc6-rc7 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -83,6 +83,7 @@ patches.suse/reiser4-exports patches.suse/kvm-as-kmp patches.suse/export-release_open_intent + patches.suse/export-security_inode_permission ######################################################## # Bug workarounds for binutils @@ -528,7 +529,6 @@ patches.suse/bootsplash patches.drivers/elousb.patch patches.fixes/input-add-acer-aspire-5710-to-nomux.patch - patches.drivers/input-usbtouchscreen-hw-calibration.patch ########################################################## # Sound @@ -777,114 +777,115 @@ # re-basing to a newer xen tree. # ### both uml framebuffer and xen need this one. -+xen_needs_update patches.xen/add-console-use-vt + patches.xen/add-console-use-vt # split out patches -+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch -+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch -+xen_needs_update patches.xen/ipv6-no-autoconf -+xen_needs_update patches.xen/pci-reassign-resources -+xen_needs_update patches.xen/sfc-driverlink -+xen_needs_update patches.xen/sfc-resource-driver -+xen_needs_update patches.xen/sfc-driverlink-conditional + patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch + patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch + patches.xen/ipv6-no-autoconf + patches.xen/pci-reassign-resources + patches.xen/sfc-driverlink + patches.xen/sfc-resource-driver + patches.xen/sfc-driverlink-conditional # bulk stuff, new files for xen -+xen_needs_update patches.xen/xen3-auto-xen-arch.diff -+xen_needs_update patches.xen/xen3-auto-xen-drivers.diff -+xen_needs_update patches.xen/xen3-auto-include-xen-interface.diff + patches.xen/xen3-auto-xen-arch.diff + patches.xen/xen3-auto-xen-drivers.diff + patches.xen/xen3-auto-include-xen-interface.diff # kconfig bits for xen -+xen_needs_update patches.xen/xen3-auto-xen-kconfig.diff + patches.xen/xen3-auto-xen-kconfig.diff # common code changes -+xen_needs_update patches.xen/xen3-auto-common.diff -+xen_needs_update patches.xen/xen3-auto-arch-x86.diff -+xen_needs_update patches.xen/xen3-auto-arch-i386.diff -+xen_needs_update patches.xen/xen3-auto-arch-x86_64.diff + patches.xen/xen3-auto-common.diff + patches.xen/xen3-auto-arch-x86.diff + patches.xen/xen3-auto-arch-i386.diff + patches.xen/xen3-auto-arch-x86_64.diff # fixups due to upstream Xen parts -+xen_needs_update patches.xen/xen3-fixup-xen + patches.xen/xen3-fixup-xen # newer changeset backports -+xen_needs_update patches.xen/735-balloon-exit.patch -+xen_needs_update patches.xen/737-kexec-free.patch -+xen_needs_update patches.xen/740-blkback-resource-leak.patch -+xen_needs_update patches.xen/746-pirq-status-page.patch -+xen_needs_update patches.xen/747-x86-undo-mfn-limit.patch -+xen_needs_update patches.xen/748-x86-ioapic-cleanup.patch + patches.xen/735-balloon-exit.patch + patches.xen/737-kexec-free.patch + patches.xen/740-blkback-resource-leak.patch + patches.xen/746-pirq-status-page.patch + patches.xen/747-x86-undo-mfn-limit.patch + patches.xen/748-x86-ioapic-cleanup.patch + patches.xen/761-highpte.patch + patches.xen/762-xencons-hvc.patch + patches.xen/764-netback-foreign-pages.patch + patches.xen/769-evtchn-CPU-offline.patch + patches.xen/782-netback-error-handling.patch + patches.xen/791-x86-pcifront-register-pirq.patch # changes outside arch/{i386,x86_64}/xen -+xen_needs_update patches.xen/xen3-fixup-kconfig -+xen_needs_update patches.xen/xen3-fixup-common -+xen_needs_update patches.xen/xen3-fixup-arch-x86 -+xen_needs_update patches.xen/xen3-fixup-sfc + patches.xen/xen3-fixup-kconfig + patches.xen/xen3-fixup-common + patches.xen/xen3-fixup-arch-x86 + patches.xen/xen3-fixup-sfc # ports of other patches -+xen_needs_update patches.xen/xen3-patch-2.6.18 -+xen_needs_update patches.xen/xen3-patch-2.6.19 -+xen_needs_update patches.xen/xen3-patch-2.6.20 -+xen_needs_update patches.xen/xen3-patch-2.6.21 -+xen_needs_update patches.xen/xen3-patch-2.6.22 -+xen_needs_update patches.xen/xen3-patch-2.6.23 -+xen_needs_update patches.xen/xen3-patch-2.6.24 -+xen_needs_update patches.xen/xen3-patch-2.6.25 -+xen_needs_update patches.xen/xen3-patch-2.6.26 -+xen_needs_update patches.xen/xen3-patch-2.6.27 -+xen_needs_update patches.xen/xen3-patch-2.6.27.1-2 -+xen_needs_update patches.xen/xen3-patch-2.6.27.3-4 -+xen_needs_update patches.xen/xen3-patch-2.6.27.4-5 -+xen_needs_update patches.xen/xen3-patch-2.6.27.5-6 -+xen_needs_update patches.xen/xen3-seccomp-disable-tsc-option -+xen_needs_update patches.xen/xen3-rwlocks-enable-interrupts -+xen_needs_update patches.xen/xen3-x2APIC_PATCH_20_of_41_cff73a6ffaed726780b001937d2a42efde553922 -+xen_needs_update patches.xen/xen3-x2APIC_PATCH_27_of_41_9fa8c481b55e80edd8c637573f87853bb6b600f5 -+xen_needs_update patches.xen/xen3-x2APIC_PATCH_40_of_41_bbb65d2d365efe9951290e61678dcf81ec60add4 -+xen_needs_update patches.xen/xen3-x86_sgi_cpus4096-02-fix-send_call_func_ip.patch -+xen_needs_update patches.xen/xen3-x86_sgi_cpus4096-05-update-send_IPI_mask.patch -+xen_needs_update patches.xen/xen3-uv_setup_irq.diff -+xen_needs_update patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor -+andrea+xen_needs_update patches.xen/xen3-silent-stack-overflow -+xen_needs_update patches.xen/xen3-e1000e_Export_set_memory_ro-rw -+xen_needs_update patches.xen/xen3-x86_sgi_uv_early_detect_oem.patch -+xen_needs_update patches.xen/xen3-panic-on-io-nmi.diff -+xen_needs_update patches.xen/xen3-intel-ibex-peak-device-ids.patch -+xen_needs_update patches.xen/xen3-sysfs-crash-debugging.patch -+xen_needs_update patches.xen/xen3-stack-unwind -+xen_needs_update patches.xen/xen3-x86_64-unwind-annotations -+xen_needs_update patches.xen/xen3-perfmon2.patch -+xen_needs_update patches.xen/xen3-perfmon2-remove_syscalls.patch + patches.xen/xen3-patch-2.6.18 + patches.xen/xen3-patch-2.6.19 + patches.xen/xen3-patch-2.6.20 + patches.xen/xen3-patch-2.6.21 + patches.xen/xen3-patch-2.6.22 + patches.xen/xen3-patch-2.6.23 + patches.xen/xen3-patch-2.6.24 + patches.xen/xen3-patch-2.6.25 + patches.xen/xen3-patch-2.6.26 + patches.xen/xen3-patch-2.6.27 + patches.xen/xen3-patch-2.6.28 + patches.xen/xen3-patch-2.6.29-rc4 + patches.xen/xen3-patch-2.6.29-rc4-rc5 + patches.xen/xen3-patch-2.6.29-rc5-rc6 + patches.xen/xen3-patch-2.6.29-rc6-rc7 + patches.xen/xen3-seccomp-disable-tsc-option + patches.xen/xen3-rwlocks-enable-interrupts + patches.xen/xen3-x86-mark_rodata_rw.patch ++andrea patches.xen/xen3-silent-stack-overflow + patches.xen/xen3-kdb-x86 + patches.xen/xen3-stack-unwind + patches.xen/xen3-perfmon2.patch + patches.xen/xen3-perfmon2-remove_syscalls.patch + patches.xen/xen3-panic-on-io-nmi.diff + patches.xen/xen3-x86_64-unwind-annotations # bugfixes and enhancements -+xen_needs_update patches.xen/xen-balloon-max-target -+xen_needs_update patches.xen/xen-modular-blktap -+xen_needs_update patches.xen/xen-blkback-bimodal-suse -+xen_needs_update patches.xen/xen-blkif-protocol-fallback-hack -+xen_needs_update patches.xen/xen-blkback-cdrom -+xen_needs_update patches.xen/xen-blktap-write-barriers -+xen_needs_update patches.xen/xen-scsifront-block-timeout-update -+xen_needs_update patches.xen/xen-op-packet -+xen_needs_update patches.xen/xen-blkfront-cdrom -+xen_needs_update patches.xen/xen-sections -+xen_needs_update patches.xen/xen-swiotlb-heuristics -+xen_needs_update patches.xen/xen-kconfig-compat-3.2.0 -+xen_needs_update patches.xen/xen-cpufreq-report -+xen_needs_update patches.xen/xen-rt2860-build -+xen_needs_update patches.xen/xen-sysdev-suspend -+xen_needs_update patches.xen/xen-ipi-per-cpu-irq -+xen_needs_update patches.xen/xen-virq-per-cpu-irq -+xen_needs_update patches.xen/xen-configurable-guest-devices -+xen_needs_update patches.xen/xen-netback-nr-irqs -+xen_needs_update patches.xen/xen-netback-notify-multi -+xen_needs_update patches.xen/xen-x86-panic-no-reboot -+xen_needs_update patches.xen/xen-x86-dcr-fallback -+xen_needs_update patches.xen/xen-x86-consistent-nmi -+xen_needs_update patches.xen/xen-x86-no-lapic -+xen_needs_update patches.xen/xen-x86-pmd-handling -+xen_needs_update patches.xen/xen-x86-bigmem -+xen_needs_update patches.xen/xen-x86-machphys-prediction -+xen_needs_update patches.xen/xen-x86-no-lazy-tlb -+xen_needs_update patches.xen/xen-x86-exit-mmap -+xen_needs_update patches.xen/xen-i386-panic-on-oops -+xen_needs_update patches.xen/xen-x86_64-pgd-pin -+xen_needs_update patches.xen/xen-x86_64-pgd-alloc-order -+xen_needs_update patches.xen/xen-x86_64-dump-user-pgt + patches.xen/xen-balloon-max-target + patches.xen/xen-modular-blktap + patches.xen/xen-blkback-bimodal-suse + patches.xen/xen-blkif-protocol-fallback-hack + patches.xen/xen-blkback-cdrom + patches.xen/xen-blktap-write-barriers + patches.xen/xen-scsifront-block-timeout-update + patches.xen/xen-op-packet + patches.xen/xen-blkfront-cdrom + patches.xen/xen-blkfront-map-sg + patches.xen/xen-sections + patches.xen/xen-swiotlb-heuristics + patches.xen/xen-kconfig-compat + patches.xen/xen-cpufreq-report + patches.xen/xen-staging-build + patches.xen/xen-sysdev-suspend + patches.xen/xen-ipi-per-cpu-irq + patches.xen/xen-virq-per-cpu-irq + patches.xen/xen-configurable-guest-devices + patches.xen/xen-netback-nr-irqs + patches.xen/xen-netback-notify-multi + patches.xen/xen-S3-MSI + patches.xen/xen-x86-panic-no-reboot + patches.xen/xen-x86-dcr-fallback + patches.xen/xen-x86-consistent-nmi + patches.xen/xen-x86-no-lapic + patches.xen/xen-x86-pmd-handling + patches.xen/xen-x86-bigmem + patches.xen/xen-x86-machphys-prediction + patches.xen/xen-x86-no-lazy-tlb + patches.xen/xen-x86-exit-mmap + patches.xen/xen-x86-exports + patches.xen/xen-x86_64-pgd-pin + patches.xen/xen-x86_64-pgd-alloc-order + patches.xen/xen-x86_64-dump-user-pgt + patches.xen/xen-x86_64-note-init-p2m