From 962af14239b3330356b45f57129f114825032db1b7d9fc22bb09473a5f574325 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Tue, 14 Jun 2011 05:00:57 +0000 Subject: [PATCH] GIT Revision: b3f32a6430201b9919c368e02d482c7426a1ca4b OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6990 --- compute-PATCHVERSION.sh | 7 +++-- config.tar.bz2 | 4 +-- kernel-binary.spec.in | 9 ++---- kernel-debug.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-debug.spec | 56 +++++++++++++++++++++++++++++------- kernel-default.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-default.spec | 56 +++++++++++++++++++++++++++++------- kernel-desktop.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-desktop.spec | 56 +++++++++++++++++++++++++++++------- kernel-docs.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-docs.spec | 47 ++++++++++++++++++++++++++---- kernel-pae.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-pae.spec | 56 +++++++++++++++++++++++++++++------- kernel-ppc64.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-ppc64.spec | 56 +++++++++++++++++++++++++++++------- kernel-ps3.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-ps3.spec | 56 +++++++++++++++++++++++++++++------- kernel-s390.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-s390.spec | 56 +++++++++++++++++++++++++++++------- kernel-source.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-source.spec | 47 ++++++++++++++++++++++++++---- kernel-syms.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-syms.spec | 43 +++++++++++++++++++++++++-- kernel-trace.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-trace.spec | 56 +++++++++++++++++++++++++++++------- kernel-vanilla.changes | 64 +++++++++++++++++++++++++++++++++++++++++ kernel-vanilla.spec | 56 +++++++++++++++++++++++++++++------- mkspec | 10 +++++-- patches.fixes.tar.bz2 | 4 +-- patches.rpmify.tar.bz2 | 4 +-- series.conf | 4 ++- source-timestamp | 4 +-- 32 files changed, 1322 insertions(+), 133 deletions(-) diff --git a/compute-PATCHVERSION.sh b/compute-PATCHVERSION.sh index f350345e..12da67d1 100644 --- a/compute-PATCHVERSION.sh +++ b/compute-PATCHVERSION.sh @@ -25,8 +25,8 @@ parse_srcversion() local IFS=. set -- ${SRCVERSION%%-*} VERSION=$1 - PATCHLEVEL=$2 - SUBLEVEL=$3 + PATCHLEVEL=${2:-0} + SUBLEVEL=${3:-0} EXTRAVERSION=${SRCVERSION#${SRCVERSION%%-*}} } parse_srcversion @@ -73,4 +73,5 @@ eval "$( ' \ | sed -e 's,^+,,' -e 's, *= *\(.*\),="\1",' )" -echo "$VERSION${PATCHLEVEL:+.$PATCHLEVEL}${SUBLEVEL:+.$SUBLEVEL}$EXTRAVERSION" + +echo "$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" diff --git a/config.tar.bz2 b/config.tar.bz2 index c44216a5..1651cd7e 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dc5f5fb24a60338b1d68a233e3d49eb1579e140bc3968a5f8083e235496e042 -size 222706 +oid sha256:7b3382348059092d3ca3e73143d29b5743be6037e9b126e0d4aaac7dbbe6d5c2 +size 217810 diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 1c13cca7..2080f84a 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -238,9 +238,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -359,7 +356,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -473,7 +470,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -504,7 +501,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi diff --git a/kernel-debug.changes b/kernel-debug.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index 483ebd03..5c2bd390 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 3.0) +# spec file for package kernel-debug (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -315,9 +315,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -436,7 +433,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -550,7 +547,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -581,7 +578,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -878,6 +875,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-default.changes b/kernel-default.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 4fa67759..0dc5b756 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 3.0) +# spec file for package kernel-default (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-default Summary: The Standard Kernel -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -330,9 +330,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -451,7 +448,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -565,7 +562,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -596,7 +593,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -891,6 +888,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 1ce190b1..80257f33 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-desktop (Version 3.0) +# spec file for package kernel-desktop (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -324,9 +324,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -445,7 +442,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -559,7 +556,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -590,7 +587,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -911,6 +908,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-docs.changes b/kernel-docs.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index 4b594bf9..9fc5f070 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-docs (Version 3.0) +# spec file for package kernel-docs (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,18 +17,18 @@ # norootforbuild -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant @@ -99,6 +99,43 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/kernel %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-pae.changes b/kernel-pae.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 85d5ecaf..09e13d45 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-pae (Version 3.0) +# spec file for package kernel-pae (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -321,9 +321,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -442,7 +439,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -556,7 +553,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -587,7 +584,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -896,6 +893,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index 05752c38..3505ea48 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 3.0) +# spec file for package kernel-ppc64 (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -325,9 +325,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -446,7 +443,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -560,7 +557,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -591,7 +588,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -900,6 +897,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-ps3.changes b/kernel-ps3.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 02670b59..7fd13e52 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-ps3 (Version 3.0) +# spec file for package kernel-ps3 (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -314,9 +314,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -435,7 +432,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -549,7 +546,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -580,7 +577,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -881,6 +878,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-s390.changes b/kernel-s390.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-s390.spec b/kernel-s390.spec index b5c2e622..cfac22ba 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 3.0) +# spec file for package kernel-s390 (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -314,9 +314,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -435,7 +432,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -549,7 +546,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -580,7 +577,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -875,6 +872,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-source.changes b/kernel-source.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index f89f2d85..211f1e02 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 3.0) +# spec file for package kernel-source (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -29,11 +29,11 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: Development/Sources @@ -255,6 +255,43 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts" %endif %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-syms.changes b/kernel-syms.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index 8cd3047d..14219de1 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 3.0) +# spec file for package kernel-syms (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,9 +23,9 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release @@ -78,6 +78,43 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %_docdir/%name/README.SUSE %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-trace.changes b/kernel-trace.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index 25c9872e..640364d1 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-trace (Version 3.0) +# spec file for package kernel-trace (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -322,9 +322,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -443,7 +440,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -557,7 +554,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -588,7 +585,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -883,6 +880,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 6a24bbb3..a197b63e 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - jeffm@suse.com + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - jeffm@suse.com + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - jeffm@suse.com + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - jeffm@suse.com + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - mmarek@suse.cz + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - mmarek@suse.cz + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - mmarek@suse.cz + +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 + +------------------------------------------------------------------- +Mon Jun 13 14:06:28 CEST 2011 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 + ------------------------------------------------------------------- Sat Jun 11 23:37:42 CEST 2011 - jeffm@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 014dec12..b48a5329 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 3.0) +# spec file for package kernel-vanilla (Version 3.0.rc2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.0-rc2 -%define patchversion 3.0-rc2 +%define patchversion 3.0.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,11 +55,11 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 3.0 +Version: 3.0.rc2 %if %using_buildservice -Release: rc2. +Release: %else -Release: rc2.0 +Release: 0 %endif License: GPL v2 only Group: System/Kernel @@ -318,9 +318,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -# Temporary hack until the 3.0 vs 3.0.0 situation is clarified -MAKE_ARGS="$MAKE_ARGS SUBLEVEL=" - MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -439,7 +436,7 @@ add_vmlinux() fi %endif if $compressed; then - gzip -9 %buildroot/$vmlinux + gzip -n -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } @@ -553,7 +550,7 @@ if [ %CONFIG_MODULES = y ]; then mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor - gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -584,7 +581,7 @@ if [ %CONFIG_MODULES = y ]; then # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then - gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor + gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi @@ -879,6 +876,43 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Mon Jun 13 2011 jeffm@suse.com +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 +* Mon Jun 13 2011 jeffm@suse.com +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 +* Mon Jun 13 2011 jeffm@suse.com +- Update config files. +- commit 2cd7359 +* Mon Jun 13 2011 jeffm@suse.com +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d +* Mon Jun 13 2011 mmarek@suse.cz +- Remove copypasted lines from vanilla configs. +- commit b395e52 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 +* Mon Jun 13 2011 mmarek@suse.cz +- x86, build: Do not set the root_dev field in bzImage. +- commit 15e4a82 +* Mon Jun 13 2011 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/compute-PATCHVERSION.sh: Set default PATCHLEVEL and SUBLEVEL to 0. + The package version will thus always match the Makefile version and + the SRCVERSION variable will only be used to determine the tarball + version. +- rpm/kernel-binary.spec.in: Revert the previous hack. +- commit 95c9977 * Sat Jun 11 2011 jeffm@suse.de - kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL. - kbuild: Fix for empty SUBLEVEL or PATCHLEVEL. diff --git a/mkspec b/mkspec index 2f1700a5..9988534a 100644 --- a/mkspec +++ b/mkspec @@ -38,9 +38,13 @@ my %binary_descriptions = parse_descriptions(); $patches="--patches $patches" if $patches; my $patchversion = `$dir/compute-PATCHVERSION.sh $patches`; chomp $patchversion; -my $rpmversion; +my $rpmversion = $patchversion; +# stuff the -rcX tag into the rpm version if possible; +$rpmversion =~ s/\.0-rc/.rc/; +$rpmversion =~ s/-rc\d+//; +$rpmversion =~ s/-/./g; + if (defined($rpmrelease)) { - ($rpmversion = $patchversion) =~ s/-.*//; # convince abuild that we really want this release number xopen(my $fh, '>', "$dir/get_release_number.sh"); print $fh "#!/bin/sh\n"; @@ -48,7 +52,7 @@ if (defined($rpmrelease)) { close($fh); chmod(0755, "$dir/get_release_number.sh"); } else { - ($rpmversion, $rpmrelease) = (split(/-/, $patchversion, 2), ""); + $rpmrelease = ""; } $rpmrelease =~ s/[^.]$/$&./; $rpmrelease =~ s/-/./g; diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index 23160fc5..90702a80 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:0c97afb251da73d759b86f1dda5b8a5b8813758febb6530ae4b14c8d39e1b58e -size 28213 +oid sha256:748f58925541ca2f6eebed3fde61a93b5142989d67e4f1f9a69d19b7295e4693 +size 29585 diff --git a/patches.rpmify.tar.bz2 b/patches.rpmify.tar.bz2 index c255f202..a3baa6e5 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:27649038297f97f3c2f1281b7aecdb0af0d0bcbc78241104b79623483ae29368 -size 2331 +oid sha256:b77f31327dd5dfafb5b9fae40600e78ec6e596606423decee89d64b7d52708d1 +size 3923 diff --git a/series.conf b/series.conf index a85809a2..d5c59501 100644 --- a/series.conf +++ b/series.conf @@ -35,7 +35,8 @@ # Patches in patches.rpmify are applied to both -vanilla # and patched flavors. ######################################################## - patches.rpmify/qla4xx-missing-readq-definition + patches.rpmify/apm-honor-config_apm_cpu_idle-n + patches.rpmify/nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo ######################################################## # kABI consistency patches @@ -63,6 +64,7 @@ patches.suse/supported-flag-enterprise patches.suse/genksyms-add-override-flag.diff patches.suse/kconfig-automate-kernel-desktop + patches.fixes/no-built-in-root_dev ######################################################## # Simple export additions/removals diff --git a/source-timestamp b/source-timestamp index 5738649a..8d51591c 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2011-06-11 23:37:42 +0200 -GIT Revision: a95ebd8494d3b6a4856179c936e61094abc9f905 +2011-06-13 21:52:37 +0200 +GIT Revision: b3f32a6430201b9919c368e02d482c7426a1ca4b GIT Branch: master