Hello community,
here is the log from the commit of package kernel-source
checked in at Sun Apr 20 16:19:54 CEST 2008.
--------
--- kernel-source/kernel-debug.changes 2008-04-17 11:01:53.000000000 +0200
+++ kernel-source/kernel-debug.changes 2008-04-19 12:42:58.000000000 +0200
@@ -2 +2,48 @@
-Thu Apr 17 03:46:00 CEST 2008 - jeffm@suse.de
+Sat Apr 19 12:41:56 CEST 2008 - aj@suse.de
+
+- Conflict with apparmor-parser < 2.3 (not <=) in kernel-binary
+ spec files.
+
+-------------------------------------------------------------------
+Sat Apr 19 00:34:10 CEST 2008 - jeffm@suse.de
+
+- Re-synced reiserfs patch set due to broken local repo.
+
+-------------------------------------------------------------------
+Sat Apr 19 00:30:42 CEST 2008 - jeffm@suse.de
+
+- Updated reiserfs patch set
+ - Eliminated xattr interaction with AppArmor
+ - Eliminated xattr deadlock under load between journal lock and
+ xattr dir i_mutex
+ - Properly annotated xattr i_mutex locking for lockdep
+ - Code cleanup
+
+-------------------------------------------------------------------
+Fri Apr 18 23:04:24 CEST 2008 - jjohanse@suse.de
+
+- Update fsetattr.diff to EXPORT_SYMBOL_GPL(fnotify_change)
+
+-------------------------------------------------------------------
+Fri Apr 18 22:53:57 CEST 2008 - jjohanse@suse.de
+
+- patches.apparmor/__d_path-keep-connected.diff: Fix __d_path
+ to allow for old and new behavior bnc#380763.
+
+-------------------------------------------------------------------
+Thu Apr 17 07:30:52 CEST 2008 - gregkh@suse.de
+
+- refresh patches to apply without fuzz
+
+-------------------------------------------------------------------
+Thu Apr 17 07:08:43 CEST 2008 - gregkh@suse.de
+
+- Update to 2.6.25-final
+
+-------------------------------------------------------------------
+Wed Apr 16 08:22:25 CEST 2008 - jjohanse@suse.de
+
+- Update to AppArmor 2.3 patch series
+
+-------------------------------------------------------------------
+Wed Apr 16 03:46:00 CEST 2008 - jeffm@suse.de
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
kernel-xen.changes: same change
Old:
----
linux-2.6.24.tar.bz2
New:
----
linux-2.6.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.k23822/_old 2008-04-20 16:13:33.000000000 +0200
+++ /var/tmp/diff_new_pack.k23822/_new 2008-04-20 16:13:33.000000000 +0200
@@ -43,7 +43,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.25
-Release: 16
+Release: 17
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-debug-nongpl
Obsoletes: kernel-debug-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -110,7 +110,7 @@
%endif
%endif
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -179,11 +179,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
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
@@ -199,8 +198,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -259,7 +258,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-default-nongpl
Obsoletes: kernel-default-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -129,7 +129,7 @@
%endif
%endif
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -197,11 +197,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
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
@@ -217,8 +216,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -277,7 +276,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%install
rm -rf %buildroot
@@ -41,7 +40,30 @@
%defattr(-, root, root)
/etc/dummy
%changelog
-* Thu Apr 17 2008 jeffm@suse.de
+* Sat Apr 19 2008 aj@suse.de
+- Conflict with apparmor-parser < 2.3 (not <=) in kernel-binary
+ spec files.
+* Sat Apr 19 2008 jeffm@suse.de
+- Re-synced reiserfs patch set due to broken local repo.
+* Sat Apr 19 2008 jeffm@suse.de
+- Updated reiserfs patch set
+ - Eliminated xattr interaction with AppArmor
+ - Eliminated xattr deadlock under load between journal lock and
+ xattr dir i_mutex
+ - Properly annotated xattr i_mutex locking for lockdep
+ - Code cleanup
+* Sat Apr 19 2008 jjohanse@suse.de
+- Update fsetattr.diff to EXPORT_SYMBOL_GPL(fnotify_change)
+* Sat Apr 19 2008 jjohanse@suse.de
+- patches.apparmor/__d_path-keep-connected.diff: Fix __d_path
+ to allow for old and new behavior bnc#380763.
+* Thu Apr 17 2008 gregkh@suse.de
+- refresh patches to apply without fuzz
+* Thu Apr 17 2008 gregkh@suse.de
+- Update to 2.6.25-final
+* Wed Apr 16 2008 jjohanse@suse.de
+- Update to AppArmor 2.3 patch series
+* Wed Apr 16 2008 jeffm@suse.de
- patches.suse/reiserfs-kill-xattr-readdir.diff: Fixed accidental
passing of -ENODATA to userspace during chown, and messages during
chown and delete.
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.k23822/_old 2008-04-20 16:13:34.000000000 +0200
+++ /var/tmp/diff_new_pack.k23822/_new 2008-04-20 16:13:34.000000000 +0200
@@ -43,7 +43,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.25
-Release: 16
+Release: 17
License: GPL v2 or later
Group: System/Kernel
Url: http://lse.sourceforge.net/kdump/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-kdump-nongpl
Obsoletes: kernel-kdump-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -107,7 +107,7 @@
%ifarch ppc64
%endif
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -178,11 +178,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
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
@@ -198,8 +197,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -258,7 +257,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-pae-nongpl
Obsoletes: kernel-pae-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -104,7 +104,7 @@
%endif
Provides: k_smp4G kernel-bigsmp
Obsoletes: k_smp4G kernel-bigsmp
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -174,11 +174,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
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
@@ -194,8 +193,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -254,7 +253,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-ppc64-nongpl
Obsoletes: kernel-ppc64-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -109,7 +109,7 @@
%ifarch ppc64
%endif
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -191,11 +191,10 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
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
@@ -211,8 +210,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -271,7 +270,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-ps3-nongpl
Obsoletes: kernel-ps3-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -107,7 +107,7 @@
%ifarch ppc64
%endif
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -177,11 +177,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
echo "The kernel-ps3-2.6.25.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
@@ -197,8 +196,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -257,7 +256,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-s390-nongpl
Obsoletes: kernel-s390-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -104,7 +104,7 @@
%endif
Provides: kernel-32bit k_deflt
Obsoletes: kernel-32bit k_deflt
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -172,11 +172,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
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
@@ -192,8 +191,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -252,7 +251,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source2: source-post.sh
Source10: pre.sh
@@ -105,12 +105,11 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
- echo "Please get a copy of linux-2.6.24.tar.bz2 from" \
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
+ echo "Please get a copy of linux-2.6.25.tar.bz2 from" \
"ftp://ftp.kernel.org/pub/linux/kernel/v2.6/."
fi
echo "Architecture symbol(s): %symbols"
@@ -121,9 +120,9 @@
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src
# Unpack the vanilla kernel sources
-bzip2 -cd %_sourcedir/linux-2.6.24.tar.bz2 \
+bzip2 -cd %_sourcedir/linux-2.6.25.tar.bz2 \
| tar xf -
-cd linux-2.6.24
+cd linux-2.6.25
# Hello Linus: hint, hint ...
chmod -Rf a+rX,g-w,o-w .
# Apply the patches needed for this architecture.
@@ -141,13 +140,13 @@
RELEASE=${RELEASE#[^0-9]*.}
done
%_sourcedir/install-configs %_sourcedir %_builddir/%buildsubdir $RELEASE
-KERNELRELEASE=2.6.25-rc9-$RELEASE
+KERNELRELEASE=2.6.25-$RELEASE
cat > %_builddir/%{name}-%{version}/.rpm-defs <http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-vanilla-nongpl
Obsoletes: kernel-vanilla-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -121,7 +121,7 @@
%endif
%endif
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -189,11 +189,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
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
@@ -209,8 +208,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -269,7 +268,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -86,8 +86,8 @@
%endif
Provides: kernel-xen-nongpl
Obsoletes: kernel-xen-nongpl
-Conflicts: apparmor-profiles <= 2.0.1
-Conflicts: apparmor-parser <= 2.0.1
+Conflicts: apparmor-profiles <= 2.1
+Conflicts: apparmor-parser < 2.3
Conflicts: sysfsutils < 2.0
# root-lvm only works with newer udevs
Conflicts: udev < 118
@@ -107,7 +107,7 @@
%ifarch x86_64
%endif
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -178,11 +178,10 @@
-Source Timestamp: 2008-04-15 22:54:53 +0200
-CVS Date: 2008.04.16.06.00.00
+Source Timestamp: 2008-04-19 12:46:18 +0200
%prep
-if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
+if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
echo "The kernel-xen-2.6.25.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.25.src.rpm."
exit 1
@@ -198,8 +197,8 @@
%_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.24/Module.supported
-cd linux-2.6.24
+) | sed -e 's,.*/,,' | sort > linux-2.6.25/Module.supported
+cd linux-2.6.25
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -258,7 +257,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs < linux-2.6.25.tar.bz2 ++++++
kernel-source/linux-2.6.24.tar.bz2 kernel-source/linux-2.6.25.tar.bz2 differ: byte 11, line 1
++++++ needed_space_in_mb ++++++
--- kernel-source/needed_space_in_mb 2008-04-17 14:18:28.000000000 +0200
+++ kernel-source/needed_space_in_mb 2008-04-19 12:43:12.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.addon.tar.bz2 ++++++
++++++ patches.apparmor.tar.bz2 ++++++
++++ 8181 lines of diff (skipped)
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1
++++++ patches.suse.tar.bz2 ++++++
++++ 17141 lines of diff (skipped)
++++++ patches.xen.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/ipv6-no-autoconf new/patches.xen/ipv6-no-autoconf
--- old/patches.xen/ipv6-no-autoconf 2008-04-13 12:20:54.000000000 +0200
+++ new/patches.xen/ipv6-no-autoconf 2008-04-17 11:04:16.000000000 +0200
@@ -19,7 +19,7 @@
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -2636,6 +2636,7 @@
+@@ -2637,6 +2637,7 @@
spin_lock_bh(&ifp->lock);
if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
@@ -27,7 +27,7 @@
!(ifp->flags&IFA_F_TENTATIVE) ||
ifp->flags & IFA_F_NODAD) {
ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC);
-@@ -2729,6 +2730,7 @@
+@@ -2730,6 +2731,7 @@
if (ifp->idev->cnf.forwarding == 0 &&
ifp->idev->cnf.rtr_solicits > 0 &&
(dev->flags&IFF_LOOPBACK) == 0 &&
++++++ series.conf ++++++
--- kernel-source/series.conf 2008-04-17 11:01:36.000000000 +0200
+++ kernel-source/series.conf 2008-04-19 12:42:47.000000000 +0200
@@ -27,8 +27,6 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
- patches.kernel.org/patch-2.6.25-rc8
- patches.kernel.org/patch-2.6.25-rc8-rc9
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -215,8 +213,19 @@
########################################################
# Reiserfs Patches
########################################################
- patches.suse/reiserfs-buffer-info-for-balance.diff
+ # From -mm
+ patches.suse/reiserfs-le_add_cpu-conversion.patch
+ patches.suse/reiserfs-fix-sparse-warning-in-journalc.patch
+ patches.suse/reiserfs-fix-more-sparse-warnings-in-do_balanc.patch
+ patches.suse/reiserfs-replace-remaining-__function__-occurrences.patch
+ patches.suse/reiserfs-use-open_bdev_excl.patch
+
+ patches.suse/reiserfs-mount-count
+ patches.suse/reiserfs-inode-init
+
+ # Better error handling and reporting
+ patches.suse/reiserfs-buffer-info-for-balance.diff
patches.suse/reiserfs-consistent-messages.diff
patches.suse/reiserfs-reiserfs_info.diff
patches.suse/reiserfs-reiserfs-warning.diff
@@ -225,17 +234,23 @@
patches.suse/reiserfs-add-reiserfs_error.diff
patches.suse/reiserfs-use-reiserfs_error.diff
+ # Extended attribute rework
+ patches.suse/reiserfs-remove-xinode
+ patches.suse/reiserfs-xattr-get-page
+ patches.suse/reiserfs-remove-link-detection.diff
+ patches.suse/reiserfs-xattr-S_PRIVATE
+ patches.suse/reiserfs-clean-up-xattrs
patches.suse/reiserfs-simplify-xattr-internal-file-lookups-opens.diff
patches.suse/reiserfs-eliminate-per-super-xattr-lock.diff
patches.suse/reiserfs-make-per-inode-xattr-locking-more-fine-grained.diff
patches.suse/reiserfs-remove-i_has_xattr_dir.diff
- patches.suse/reiserfs-remove-link-detection.diff
patches.suse/reiserfs-use-generic-xattr-handlers.diff
- patches.suse/reiserfs-add-per-file-data-ordered-mode.diff
patches.suse/reiserfs-journaled-xattrs.diff
patches.suse/reiserfs-kill-xattr-readdir.diff
patches.suse/reiserfs-selinux.diff
+ # Code cleanups
+ patches.suse/reiserfs-simplify-buffer-info.diff
patches.suse/reiserfs-cleanup-path-funcs.diff
patches.suse/reiserfs-strip-whitespace.diff
patches.suse/reiserfs-rename-p_s_sb.diff
@@ -244,28 +259,11 @@
patches.suse/reiserfs-rename-p_s_tb.diff
patches.suse/reiserfs-rename-p_._.diff
patches.suse/reiserfs-rename-._.diff
- patches.suse/reiserfs-mount-count
-
- # These are currently known to cause corruption on disk.
-+jeffm patches.suse/reiserfs-simplify-buffer-info.diff
-+jeffm patches.suse/reiserfs-snum-sbytes-array
-+jeffm patches.suse/reiserfs-split-balance_leaf-left.diff
-+jeffm patches.suse/reiserfs-split-balance_leaf-right.diff
-+jeffm patches.suse/reiserfs-split-balance_leaf-new_nodes.diff
-+jeffm patches.suse/reiserfs-split-balance_leaf-remainder.diff
-+jeffm patches.suse/reiserfs-split-balance_leaf.diff
-+jeffm patches.suse/reiserfs-cleanup-balancing-modes.diff
-+jeffm patches.suse/reiserfs-balance_leaf_when_cut_or_delete.diff
-+jeffm patches.suse/reiserfs-balance_leaf_comment.diff
-
########################################################
# ocfs2
########################################################
- # Parts of the o2cb heartbeat were reworked in 2.6.23,
- # disabling since this isn't a showstopper for an update.
- # -jeffm
patches.suse/ocfs2-01-event-driven-quorum.diff
patches.suse/ocfs2-02-introduce-generic-heartbeat-resource.diff
patches.suse/ocfs2-03-split-disk-heartbeat-out.diff
@@ -454,10 +452,16 @@
patches.apparmor/unambiguous-__d_path.diff
patches.apparmor/mount-consistent-__d_path.diff
patches.apparmor/d_namespace_path.diff
+ patches.apparmor/__d_path-keep-connected.diff
+ patches.apparmor/fsetattr.diff
+ patches.apparmor/fsetattr-reintro-ATTR_FILE.diff
patches.apparmor/file-handle-ops.diff
patches.apparmor/security-xattr-file.diff
patches.apparmor/sysctl-pathname.diff
patches.apparmor/parent-permission.diff
+ patches.apparmor/do_path_lookup-nameidata.diff
+ patches.apparmor/sys_fchdir-nameidata.diff
+ patches.apparmor/file_permission-nameidata.diff
patches.apparmor/apparmor-audit.diff
patches.apparmor/apparmor-main.diff
patches.apparmor/apparmor-lsm.diff
@@ -465,12 +469,9 @@
patches.apparmor/apparmor-misc.diff
patches.apparmor/apparmor-intree.diff
patches.apparmor/apparmor-network.diff
+ patches.apparmor/apparmor-rlimits.diff
+ patches.apparmor/apparmor-2.6.25.diff
patches.apparmor/apparmor-stack_secondary.diff
- patches.apparmor/apparmor-log-audit-type.diff
- patches.apparmor/do_path_lookup-nameidata.diff
- patches.apparmor/sys_fchdir-nameidata.diff
- patches.apparmor/file_permission-nameidata.diff
- patches.apparmor/apparmor-disable.diff
patches.apparmor/export-security_inode_permission-for-aufs
########################################################
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org