Hello community,
here is the log from the commit of package kernel-source
checked in at Tue Mar 11 17:35:59 CET 2008.
--------
--- kernel-source/kernel-debug.changes 2008-03-06 17:40:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-03-11 05:16:35.772455000 +0100
@@ -1,0 +2,39 @@
+Tue Mar 11 00:34:29 CET 2008 - gregkh@suse.de
+
+- update to 2.6.25-rc5
+
+-------------------------------------------------------------------
+Mon Mar 10 12:38:31 CET 2008 - agruen@suse.de
+
+- scripts/tar-up.sh: Don't lose the EXTRAVERSION when overriding
+ the release number with --release-string or --timestamp.
+
+-------------------------------------------------------------------
+Sun Mar 9 16:58:10 CET 2008 - jeffm@suse.de
+
+- patches.fixes/hibernation-snapshot-numa-workaround.patch:
+ swsusp: workaround for crash on NUMA (kernel.org#9966).
+
+-------------------------------------------------------------------
+Sat Mar 8 14:05:20 CET 2008 - agruen@suse.de
+
+- Encode the EXTRAVERSION part of kernel release numbers in the
+ RPM release instead of in the version. This resolves the problem
+ that kernel releases like 2.6.25-rc4 would result in a package
+ with a higher version than 2.6.25 according to RPM's versioning
+ scheme (bug 271712).
+
+-------------------------------------------------------------------
+Fri Mar 7 17:52:55 CET 2008 - schwab@suse.de
+
+- Update kdb patches.
+
+-------------------------------------------------------------------
+Thu Mar 6 19:14:44 CET 2008 - trenn@suse.de
+
+- patches.fixes/acpi_fix_mem_corruption.patch: ACPI: Fix mem
+ corruption (350017).
+- patches.fixes/acpi_thermal_passive_cleanup.patch: Warn user
+ about a BIOS bug in asus boards (350017).
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.o21742/_old 2008-03-11 17:27:58.000000000 +0100
+++ /var/tmp/diff_new_pack.o21742/_new 2008-03-11 17:27:58.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.25_rc4_git1)
+# spec file for package kernel-debug (Version 2.6.25)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,10 +13,10 @@
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%.*})
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::' -e 's:\.[0-9]\+$::')
%else
# We don't have build numbers internally
-%define source_rel %release
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::')
%endif
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor "debug"
@@ -43,7 +43,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 2.6.25_rc4_git1
+Version: 2.6.25
Release: 1
License: GPL v2 or later
Group: System/Kernel
@@ -97,7 +97,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25_rc4_git1-%source_rel
+Provides: kernel = 2.6.25-%source_rel
%endif
%endif
%ifarch %ix86
@@ -177,12 +177,12 @@
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "The kernel-debug-2.6.25_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25_rc4_git1.src.rpm."
+ echo "The kernel-debug-2.6.25.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -229,7 +229,12 @@
fi
done
%endif
-%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir .. $RELEASE
config=arch/$subarch/defconfig.debug
cat $config \
%if 0%{?__debug_package:1}
@@ -250,6 +255,9 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
+cat >> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <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%.*})
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::' -e 's:\.[0-9]\+$::')
%else
# We don't have build numbers internally
-%define source_rel %release
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::')
%endif
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor "default"
@@ -43,7 +43,7 @@
Name: kernel-default
Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
-Version: 2.6.25_rc4_git1
+Version: 2.6.25
Release: 1
License: GPL v2 or later
Group: System/Kernel
@@ -97,7 +97,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25_rc4_git1-%source_rel
+Provides: kernel = 2.6.25-%source_rel
%endif
%endif
%ifarch alpha
@@ -198,12 +198,12 @@
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "The kernel-default-2.6.25_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25_rc4_git1.src.rpm."
+ echo "The kernel-default-2.6.25.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -250,7 +250,12 @@
fi
done
%endif
-%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir .. $RELEASE
config=arch/$subarch/defconfig.default
cat $config \
%if 0%{?__debug_package:1}
@@ -271,6 +276,9 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
+cat >> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%install
rm -rf %buildroot
@@ -40,6 +40,27 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Tue Mar 11 2008 gregkh@suse.de
+- update to 2.6.25-rc5
+* Mon Mar 10 2008 agruen@suse.de
+- scripts/tar-up.sh: Don't lose the EXTRAVERSION when overriding
+ the release number with --release-string or --timestamp.
+* Sun Mar 09 2008 jeffm@suse.de
+- patches.fixes/hibernation-snapshot-numa-workaround.patch:
+ swsusp: workaround for crash on NUMA (kernel.org#9966).
+* Sat Mar 08 2008 agruen@suse.de
+- Encode the EXTRAVERSION part of kernel release numbers in the
+ RPM release instead of in the version. This resolves the problem
+ that kernel releases like 2.6.25-rc4 would result in a package
+ with a higher version than 2.6.25 according to RPM's versioning
+ scheme (bug 271712).
+* Fri Mar 07 2008 schwab@suse.de
+- Update kdb patches.
+* Thu Mar 06 2008 trenn@suse.de
+- patches.fixes/acpi_fix_mem_corruption.patch: ACPI: Fix mem
+ corruption (350017).
+- patches.fixes/acpi_thermal_passive_cleanup.patch: Warn user
+ about a BIOS bug in asus boards (350017).
* Thu Mar 06 2008 gregkh@suse.de
- Update s390 config files.
* Thu Mar 06 2008 gregkh@suse.de
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.o21742/_old 2008-03-11 17:27:59.000000000 +0100
+++ /var/tmp/diff_new_pack.o21742/_new 2008-03-11 17:27:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.25_rc4_git1)
+# spec file for package kernel-kdump (Version 2.6.25)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,10 +13,10 @@
Url: http://lse.sourceforge.net/kdump/
%if 0%{?opensuse_bs}
# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::' -e 's:\.[0-9]\+$::')
%else
# We don't have build numbers internally
-%define source_rel %release
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::')
%endif
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor "kdump"
@@ -43,7 +43,7 @@
Name: kernel-kdump
Summary: kernel for kdump
-Version: 2.6.25_rc4_git1
+Version: 2.6.25
Release: 1
License: GPL v2 or later
Group: System/Kernel
@@ -97,7 +97,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25_rc4_git1-%source_rel
+Provides: kernel = 2.6.25-%source_rel
%endif
%endif
%ifarch ppc
@@ -176,12 +176,12 @@
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.25_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25_rc4_git1.src.rpm."
+ echo "The kernel-kdump-2.6.25.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -228,7 +228,12 @@
fi
done
%endif
-%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir .. $RELEASE
config=arch/$subarch/defconfig.kdump
cat $config \
%if 0%{?__debug_package:1}
@@ -249,6 +254,9 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
+cat >> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <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%.*})
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::' -e 's:\.[0-9]\+$::')
%else
# We don't have build numbers internally
-%define source_rel %release
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::')
%endif
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor "pae"
@@ -43,7 +43,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
-Version: 2.6.25_rc4_git1
+Version: 2.6.25
Release: 1
License: GPL v2 or later
Group: System/Kernel
@@ -97,7 +97,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25_rc4_git1-%source_rel
+Provides: kernel = 2.6.25-%source_rel
%endif
%endif
Provides: k_smp4G kernel-bigsmp
@@ -172,12 +172,12 @@
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "The kernel-pae-2.6.25_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25_rc4_git1.src.rpm."
+ echo "The kernel-pae-2.6.25.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -224,7 +224,12 @@
fi
done
%endif
-%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir .. $RELEASE
config=arch/$subarch/defconfig.pae
cat $config \
%if 0%{?__debug_package:1}
@@ -245,6 +250,9 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
+cat >> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.25_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25_rc4_git1.src.rpm."
+ echo "The kernel-ppc64-2.6.25.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -240,7 +240,12 @@
fi
done
%endif
-%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir .. $RELEASE
config=arch/$subarch/defconfig.ppc64
cat $config \
%if 0%{?__debug_package:1}
@@ -261,6 +266,9 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
+cat >> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <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%.*})
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::' -e 's:\.[0-9]\+$::')
%else
# We don't have build numbers internally
-%define source_rel %release
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::')
%endif
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor "s390"
@@ -43,7 +43,7 @@
Name: kernel-s390
Summary: The Standard Kernel
-Version: 2.6.25_rc4_git1
+Version: 2.6.25
Release: 1
License: GPL v2 or later
Group: System/Kernel
@@ -97,7 +97,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25_rc4_git1-%source_rel
+Provides: kernel = 2.6.25-%source_rel
%endif
%endif
Provides: kernel-32bit k_deflt
@@ -170,12 +170,12 @@
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "The kernel-s390-2.6.25_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25_rc4_git1.src.rpm."
+ echo "The kernel-s390-2.6.25.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -222,7 +222,12 @@
fi
done
%endif
-%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir .. $RELEASE
config=arch/$subarch/defconfig.s390
cat $config \
%if 0%{?__debug_package:1}
@@ -243,6 +248,9 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
+cat >> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv < %_builddir/kernel-source-2.6.25_rc4_git1/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.25_rc4_git1/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.25_rc4_git1/$patch; then
+ > %_builddir/kernel-source-2.6.25/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.25/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.25/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.25_rc4_git1 %source_rel
-KERNELRELEASE=2.6.25-rc4-git1-%source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir %_builddir/%buildsubdir $RELEASE
+KERNELRELEASE=2.6.25-rc5-$RELEASE
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.25_rc4_git1/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.25_rc4_git1/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.25/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.25/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -277,6 +282,27 @@
%files -f kernel-source.files
%changelog
+* Tue Mar 11 2008 gregkh@suse.de
+- update to 2.6.25-rc5
+* Mon Mar 10 2008 agruen@suse.de
+- scripts/tar-up.sh: Don't lose the EXTRAVERSION when overriding
+ the release number with --release-string or --timestamp.
+* Sun Mar 09 2008 jeffm@suse.de
+- patches.fixes/hibernation-snapshot-numa-workaround.patch:
+ swsusp: workaround for crash on NUMA (kernel.org#9966).
+* Sat Mar 08 2008 agruen@suse.de
+- Encode the EXTRAVERSION part of kernel release numbers in the
+ RPM release instead of in the version. This resolves the problem
+ that kernel releases like 2.6.25-rc4 would result in a package
+ with a higher version than 2.6.25 according to RPM's versioning
+ scheme (bug 271712).
+* Fri Mar 07 2008 schwab@suse.de
+- Update kdb patches.
+* Thu Mar 06 2008 trenn@suse.de
+- patches.fixes/acpi_fix_mem_corruption.patch: ACPI: Fix mem
+ corruption (350017).
+- patches.fixes/acpi_thermal_passive_cleanup.patch: Warn user
+ about a BIOS bug in asus boards (350017).
* Thu Mar 06 2008 gregkh@suse.de
- Update s390 config files.
* Thu Mar 06 2008 gregkh@suse.de
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.o21742/_old 2008-03-11 17:28:00.000000000 +0100
+++ /var/tmp/diff_new_pack.o21742/_new 2008-03-11 17:28:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.25_rc4_git1)
+# spec file for package kernel-syms (Version 2.6.25)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,7 +21,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 2.6.25_rc4_git1
+Version: 2.6.25
Release: 1
License: GPL v2 or later
Group: Development/Sources
@@ -65,7 +65,7 @@
#!BuildIgnore: irqbalance xen
#!BuildIgnore: perl-Bootloader mkinitrd
Requires: linux
-Requires: kernel-source = 2.6.25_rc4_git1-%source_rel
+Requires: kernel-source = 2.6.25-%source_rel
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -96,7 +96,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
echo "Architecture symbol(s):" %symbols
@@ -148,6 +148,27 @@
/boot/symsets-*-*.tar.gz
/lib/modules/*/build
%changelog
+* Tue Mar 11 2008 gregkh@suse.de
+- update to 2.6.25-rc5
+* Mon Mar 10 2008 agruen@suse.de
+- scripts/tar-up.sh: Don't lose the EXTRAVERSION when overriding
+ the release number with --release-string or --timestamp.
+* Sun Mar 09 2008 jeffm@suse.de
+- patches.fixes/hibernation-snapshot-numa-workaround.patch:
+ swsusp: workaround for crash on NUMA (kernel.org#9966).
+* Sat Mar 08 2008 agruen@suse.de
+- Encode the EXTRAVERSION part of kernel release numbers in the
+ RPM release instead of in the version. This resolves the problem
+ that kernel releases like 2.6.25-rc4 would result in a package
+ with a higher version than 2.6.25 according to RPM's versioning
+ scheme (bug 271712).
+* Fri Mar 07 2008 schwab@suse.de
+- Update kdb patches.
+* Thu Mar 06 2008 trenn@suse.de
+- patches.fixes/acpi_fix_mem_corruption.patch: ACPI: Fix mem
+ corruption (350017).
+- patches.fixes/acpi_thermal_passive_cleanup.patch: Warn user
+ about a BIOS bug in asus boards (350017).
* Thu Mar 06 2008 gregkh@suse.de
- Update s390 config files.
* Thu Mar 06 2008 gregkh@suse.de
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.o21742/_old 2008-03-11 17:28:01.000000000 +0100
+++ /var/tmp/diff_new_pack.o21742/_new 2008-03-11 17:28:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.25_rc4_git1)
+# spec file for package kernel-vanilla (Version 2.6.25)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,10 +13,10 @@
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%.*})
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::' -e 's:\.[0-9]\+$::')
%else
# We don't have build numbers internally
-%define source_rel %release
+%define source_rel %(echo %release | sed -e 's:^\([^0-9]*[^.]*\.\)*::')
%endif
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor "vanilla"
@@ -43,7 +43,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
-Version: 2.6.25_rc4_git1
+Version: 2.6.25
Release: 1
License: GPL v2 or later
Group: System/Kernel
@@ -97,7 +97,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25_rc4_git1-%source_rel
+Provides: kernel = 2.6.25-%source_rel
%endif
%endif
%ifarch alpha
@@ -190,12 +190,12 @@
-Source Timestamp: 2008/03/06 16:35:32 UTC
+Source Timestamp: 2008/03/10 23:38:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "The kernel-vanilla-2.6.25_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25_rc4_git1.src.rpm."
+ echo "The kernel-vanilla-2.6.25.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -242,7 +242,12 @@
fi
done
%endif
-%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
+# Release number without the EXTRAVERSION
+RELEASE=%source_rel
+while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
+ RELEASE=${RELEASE#[^0-9]*.}
+done
+%_sourcedir/install-configs %_sourcedir .. $RELEASE
config=arch/$subarch/defconfig.vanilla
cat $config \
%if 0%{?__debug_package:1}
@@ -263,6 +268,9 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
+cat >> ../.rpm-defs <> ../.rpm-defs <&2
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "$KERNELRELEASE" ]; then
+ echo "Kernel release mismatch: $krel != $KERNELRELEASE" >&2
exit 1
fi
-echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <
+Subject: ACPI: Fix mem corruption
+References: 350017
+Patch-mainline: hopefully soon
+
+Fix a memory overflow bug when copying NULL internal package element object to
+external.
+
+Signed-off-by: Thomas Renninger
+
+---
+ drivers/acpi/utilities/utobject.c | 2 +-
+ drivers/acpi/utils.c | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+Index: linux-2.6.24/drivers/acpi/utilities/utobject.c
+===================================================================
+--- linux-2.6.24.orig/drivers/acpi/utilities/utobject.c
++++ linux-2.6.24/drivers/acpi/utilities/utobject.c
+@@ -432,7 +432,7 @@ acpi_ut_get_simple_object_size(union acp
+ * element -- which is legal)
+ */
+ if (!internal_object) {
+- *obj_length = 0;
++ *obj_length = sizeof(union acpi_object);
+ return_ACPI_STATUS(AE_OK);
+ }
+
+Index: linux-2.6.24/drivers/acpi/utils.c
+===================================================================
+--- linux-2.6.24.orig/drivers/acpi/utils.c
++++ linux-2.6.24/drivers/acpi/utils.c
+@@ -407,6 +407,12 @@ acpi_evaluate_reference(acpi_handle hand
+ break;
+ }
+
++ if (!element->reference.handle) {
++ printk(KERN_WARNING PREFIX "Invalid reference in"
++ " package %s\n", pathname);
++ status = AE_NULL_ENTRY;
++ break;
++ }
+ /* Get the acpi_handle. */
+
+ list->handles[i] = element->reference.handle;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_thermal_passive_cleanup.patch new/patches.fixes/acpi_thermal_passive_cleanup.patch
--- old/patches.fixes/acpi_thermal_passive_cleanup.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/acpi_thermal_passive_cleanup.patch 2008-03-06 19:16:37.000000000 +0100
@@ -0,0 +1,49 @@
+From: Thomas Renninger
+Subject: Warn user about a BIOS bug in asus boards
+References: 350017
+Patch-mainline: hopefully soon
+
+Also add a message in case _PSL has invalid references, might be
+the case, due a BIOS bug in recent ASUS and other mainboards.
+
+The invalid reference case can only be handled gracefully with
+another patch that should get merged mainline with this one.
+
+Signed-off-by: Thomas Renninger
+
+---
+ drivers/acpi/thermal.c | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+Index: linux-2.6.24/drivers/acpi/thermal.c
+===================================================================
+--- linux-2.6.24.orig/drivers/acpi/thermal.c
++++ linux-2.6.24/drivers/acpi/thermal.c
+@@ -440,16 +440,18 @@ static int acpi_thermal_trips_update(str
+ memset(&devices, 0, sizeof(struct acpi_handle_list));
+ status = acpi_evaluate_reference(tz->device->handle, "_PSL",
+ NULL, &devices);
+- if (ACPI_FAILURE(status))
+- tz->trips.passive.flags.valid = 0;
+- else
++ if (ACPI_SUCCESS(status)) {
+ tz->trips.passive.flags.valid = 1;
+-
+- if (memcmp(&tz->trips.passive.devices, &devices,
+- sizeof(struct acpi_handle_list))) {
+- memcpy(&tz->trips.passive.devices, &devices,
+- sizeof(struct acpi_handle_list));
+- ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");
++ if (memcmp(&tz->trips.passive.devices, &devices,
++ sizeof(struct acpi_handle_list))) {
++ memcpy(&tz->trips.passive.devices, &devices,
++ sizeof(struct acpi_handle_list));
++ ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");
++ }
++ } else {
++ tz->trips.passive.flags.valid = 0;
++ ACPI_EXCEPTION((AE_INFO, status, "Invalid passiv trip"
++ " point\n"));
+ }
+ }
+ if ((flag & ACPI_TRIPS_PASSIVE) || (flag & ACPI_TRIPS_DEVICES)) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/hibernation-snapshot-numa-workaround.patch new/patches.fixes/hibernation-snapshot-numa-workaround.patch
--- old/patches.fixes/hibernation-snapshot-numa-workaround.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/hibernation-snapshot-numa-workaround.patch 2008-03-09 16:58:10.000000000 +0100
@@ -0,0 +1,110 @@
+From: Rafael J. Wysocki
+Subject: [PATCH] swsusp: workaround for crash on NUMA
+References: kernel.org#9966
+Patch-mainline: Hopefully 2.6.25, but a real solution may be found by then
+
+ This patch is only a workaround for a problem where pages without a zone
+ are still marked valid by pfn_valid(). The problem manifests itself by
+ BUG'ing when resume is called, even if there is nothing to resume. So,
+ on openSUSE, it causes an oops on every boot. Bad sauce.
+
+Acked-by: Jeff Mahoney
+---
+ kernel/power/snapshot.c | 40 ++++++++++++++++++++++++++++++++--------
+ 1 file changed, 32 insertions(+), 8 deletions(-)
+
+Index: linux-2.6/kernel/power/snapshot.c
+===================================================================
+--- linux-2.6.orig/kernel/power/snapshot.c
++++ linux-2.6/kernel/power/snapshot.c
+@@ -447,7 +447,7 @@ static void memory_bm_free(struct memory
+ * of @bm->cur_zone_bm are updated.
+ */
+
+-static void memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
++static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
+ void **addr, unsigned int *bit_nr)
+ {
+ struct zone_bitmap *zone_bm;
+@@ -461,7 +461,8 @@ static void memory_bm_find_bit(struct me
+ while (pfn < zone_bm->start_pfn || pfn >= zone_bm->end_pfn) {
+ zone_bm = zone_bm->next;
+
+- BUG_ON(!zone_bm);
++ if (!zone_bm)
++ return -EFAULT;
+ }
+ bm->cur.zone_bm = zone_bm;
+ }
+@@ -479,23 +480,40 @@ static void memory_bm_find_bit(struct me
+ pfn -= bb->start_pfn;
+ *bit_nr = pfn % BM_BITS_PER_CHUNK;
+ *addr = bb->data + pfn / BM_BITS_PER_CHUNK;
++ return 0;
+ }
+
+ static void memory_bm_set_bit(struct memory_bitmap *bm, unsigned long pfn)
+ {
+ void *addr;
+ unsigned int bit;
++ int error;
+
+- memory_bm_find_bit(bm, pfn, &addr, &bit);
++ error = memory_bm_find_bit(bm, pfn, &addr, &bit);
++ BUG_ON(error);
+ set_bit(bit, addr);
+ }
+
++static int mem_bm_set_bit_check(struct memory_bitmap *bm, unsigned long pfn)
++{
++ void *addr;
++ unsigned int bit;
++ int error;
++
++ error = memory_bm_find_bit(bm, pfn, &addr, &bit);
++ if (!error)
++ set_bit(bit, addr);
++ return error;
++}
++
+ static void memory_bm_clear_bit(struct memory_bitmap *bm, unsigned long pfn)
+ {
+ void *addr;
+ unsigned int bit;
++ int error;
+
+- memory_bm_find_bit(bm, pfn, &addr, &bit);
++ error = memory_bm_find_bit(bm, pfn, &addr, &bit);
++ BUG_ON(error);
+ clear_bit(bit, addr);
+ }
+
+@@ -503,8 +521,10 @@ static int memory_bm_test_bit(struct mem
+ {
+ void *addr;
+ unsigned int bit;
++ int error;
+
+- memory_bm_find_bit(bm, pfn, &addr, &bit);
++ error = memory_bm_find_bit(bm, pfn, &addr, &bit);
++ BUG_ON(error);
+ return test_bit(bit, addr);
+ }
+
+@@ -708,9 +728,13 @@ static void mark_nosave_pages(struct mem
+ region->start_pfn << PAGE_SHIFT,
+ region->end_pfn << PAGE_SHIFT);
+
+- for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
+- if (pfn_valid(pfn))
+- memory_bm_set_bit(bm, pfn);
++ for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++) {
++ if (!pfn_valid(pfn))
++ continue;
++ if (mem_bm_set_bit_check(bm, pfn))
++ printk(KERN_ERR "PM: Invalid page: %016lx\n",
++ pfn << PAGE_SHIFT);
++ }
+ }
+ }
+
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1
++++++ patches.suse.tar.bz2 ++++++
++++ 63901 lines of diff (skipped)
++++++ series.conf ++++++
--- kernel-source/series.conf 2008-03-06 17:39:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-03-11 04:40:09.420291000 +0100
@@ -27,8 +27,7 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
- patches.kernel.org/patch-2.6.25-rc4
- patches.kernel.org/patch-2.6.25-rc4-git1
+ patches.kernel.org/patch-2.6.25-rc5
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -38,7 +37,6 @@
# packages don't build, that's pretty useless too.
########################################################
patches.kernel.org/powerpc-needs-uboot
- patches.kernel.org/gcc43-workaround.diff
patches.kernel.org/psmouse-section-conflict.diff
patches.kernel.org/ipmi-section-conflict.diff
patches.kernel.org/fixed-phy-select
@@ -50,12 +48,6 @@
# kABI consistency patches
########################################################
- ########################################################
- # kbuild/module infrastructure fixes
- ########################################################
- patches.suse/supported-flag
-
-
########################################################
#
# packaging-specific patches (tweaks for autobuild,
@@ -70,6 +62,11 @@
patches.rpmify/cloneconfig.diff
########################################################
+ # kbuild/module infrastructure fixes
+ ########################################################
+ patches.suse/supported-flag
+
+ ########################################################
# Simple export additions/removals
########################################################
patches.suse/reiser4-exports
@@ -187,6 +184,9 @@
patches.arch/check-for-acpi-resource-conflicts-in-hwmon-drivers.patch
patches.arch/check-for-acpi-resource-conflicts-in-i2c-bus-drivers.patch
+ patches.fixes/acpi_thermal_passive_cleanup.patch
+ patches.fixes/acpi_fix_mem_corruption.patch
+
########################################################
# Suse specific stuff
########################################################
@@ -404,6 +404,7 @@
########################################################
# Suspend/Resume stuff
########################################################
+ patches.fixes/hibernation-snapshot-numa-workaround.patch
########################################################
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org