Mailinglist Archive: opensuse-commit (1318 mails)

< Previous

Hello community,

here is the log from the commit of package kernel-source
checked in at Sun Aug 6 22:08:25 CEST 2006.

--------
--- kernel-source/kernel-bigsmp.changes 2006-07-27 16:31:08.000000000 +0200
+++ kernel-source/kernel-bigsmp.changes 2006-08-04 20:13:30.000000000 +0200
@@ -1,0 +2,187 @@
+Fri Aug 4 11:21:48 CEST 2006 - hare@xxxxxxx
+
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+
+-------------------------------------------------------------------
+Wed Aug 2 23:06:17 CEST 2006 - gregkh@xxxxxxx
+
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+
+-------------------------------------------------------------------
+Wed Aug 2 22:34:18 CEST 2006 - gregkh@xxxxxxx
+
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+
+-------------------------------------------------------------------
+Wed Aug 2 21:10:28 CEST 2006 - gregkh@xxxxxxx
+
+- reorder some patches
+
+-------------------------------------------------------------------
+Wed Aug 2 20:53:52 CEST 2006 - gregkh@xxxxxxx
+
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+
+-------------------------------------------------------------------
+Wed Aug 2 20:23:24 CEST 2006 - gregkh@xxxxxxx
+
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+
+-------------------------------------------------------------------
+Wed Aug 2 20:19:57 CEST 2006 - gregkh@xxxxxxx
+
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+
+-------------------------------------------------------------------
+Wed Aug 2 19:24:18 CEST 2006 - gregkh@xxxxxxx
+
+- fix config so that x86 should build (wrong sound config settings)
+
+-------------------------------------------------------------------
+Wed Aug 2 19:04:05 CEST 2006 - gregkh@xxxxxxx
+
+- Disable KDB from i386 debug build as it does not build properly :(
+
+-------------------------------------------------------------------
+Wed Aug 2 14:54:01 CEST 2006 - hare@xxxxxxx
+
+- config/s390/default: update config file.
+
+-------------------------------------------------------------------
+Wed Aug 2 00:08:37 CEST 2006 - schwab@xxxxxxx
+
+- config-md-raid456: Fix misspelt config.
+
+-------------------------------------------------------------------
+Tue Aug 1 22:29:36 CEST 2006 - schwab@xxxxxxx
+
+- suse-ppc32-mol-mm-context: Fix mol build.
+
+-------------------------------------------------------------------
+Tue Aug 1 20:58:40 CEST 2006 - gregkh@xxxxxxx
+
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+
+-------------------------------------------------------------------
+Tue Aug 1 20:43:56 CEST 2006 - gregkh@xxxxxxx
+
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+
+-------------------------------------------------------------------
+Tue Aug 1 20:16:05 CEST 2006 - gregkh@xxxxxxx
+
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+
+-------------------------------------------------------------------
+Tue Aug 1 19:53:57 CEST 2006 - gregkh@xxxxxxx
+
+- Update to 2.6.17-rc2
+
+-------------------------------------------------------------------
+Tue Aug 1 19:37:44 CEST 2006 - gregkh@xxxxxxx
+
+- Update config files.
+
+-------------------------------------------------------------------
+Tue Aug 1 11:41:57 CEST 2006 - schwab@xxxxxxx
+
+- Update kdb patches.
+
+-------------------------------------------------------------------
+Tue Aug 1 11:10:14 CEST 2006 - gregkh@xxxxxxx
+
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+
+-------------------------------------------------------------------
+Tue Aug 1 07:46:52 CEST 2006 - gregkh@xxxxxxx
+
+- Update config files.
+
+-------------------------------------------------------------------
+Tue Aug 1 06:22:28 CEST 2006 - gregkh@xxxxxxx
+
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+
+-------------------------------------------------------------------
+Tue Aug 1 05:04:56 CEST 2006 - gregkh@xxxxxxx
+
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 1 03:33:44 CEST 2006 - gregkh@xxxxxxx
+
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+
+-------------------------------------------------------------------
+Tue Aug 1 03:30:13 CEST 2006 - gregkh@xxxxxxx
+
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+
+-------------------------------------------------------------------
+Tue Aug 1 02:21:48 CEST 2006 - gregkh@xxxxxxx
+
+- more 2.6.17 port work (still does not build)
+
+-------------------------------------------------------------------
+Mon Jul 31 22:01:10 CEST 2006 - gregkh@xxxxxxx
+
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+
+-------------------------------------------------------------------
+Mon Jul 31 21:28:12 CEST 2006 - gregkh@xxxxxxx
+
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+
+-------------------------------------------------------------------
+Mon Jul 31 15:05:22 CEST 2006 - olh@xxxxxxx
+
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+
+-------------------------------------------------------------------
+Fri Jul 28 20:56:06 CEST 2006 - gregkh@xxxxxxx
+
+- update mainline tags
+
+-------------------------------------------------------------------
+Fri Jul 28 18:03:40 CEST 2006 - mason@xxxxxxx
+
+- more mainline tags on obsolete code
+
+-------------------------------------------------------------------
+Fri Jul 28 17:32:04 CEST 2006 - mason@xxxxxxx
+
+- update mainline tags on reversable patches
+
+-------------------------------------------------------------------
+Fri Jul 28 12:12:31 CEST 2006 - jbeulich@xxxxxxxxxx
+
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+
+-------------------------------------------------------------------
+Thu Jul 27 21:54:18 CEST 2006 - jeffm@xxxxxxx
+
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+
+-------------------------------------------------------------------
+Thu Jul 27 21:53:47 CEST 2006 - jeffm@xxxxxxx
+
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-iseries64.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-smp.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-um.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change

Old:
----
linux-2.6.16.tar.bz2

New:
----
linux-2.6.17.tar.bz2
needed_space_in_mb

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:19.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.16.21)
+# spec file for package kernel-bigsmp (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: Kernel with Multiprocessor Support and PAE
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-bigsmp-nongpl
@@ -48,7 +48,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -105,7 +105,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -116,12 +119,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-bigsmp-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -141,8 +144,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -192,7 +195,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -203,6 +206,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -239,7 +243,7 @@
-e "s:@FLAVOR""@:bigsmp:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -410,8 +414,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-bigsmp} \
@@ -459,6 +463,91 @@
%files -f kernel.files

%changelog -n kernel-bigsmp
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.16.21)
+# spec file for package kernel-debug (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: A Debug Version of the Kernel
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-debug-nongpl
@@ -54,7 +54,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -111,7 +111,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -121,12 +124,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-debug-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-debug-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -146,8 +149,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -197,7 +200,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -208,6 +211,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -244,7 +248,7 @@
-e "s:@FLAVOR""@:debug:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -415,8 +419,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-debug} \
@@ -464,6 +468,91 @@
%files -f kernel.files

%changelog -n kernel-debug
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-default (Version 2.6.16.21)
+# spec file for package kernel-default (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-default-nongpl
@@ -73,7 +73,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -130,7 +130,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -139,12 +142,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-default-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-default-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -164,8 +167,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -215,7 +218,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -226,6 +229,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -262,7 +266,7 @@
-e "s:@FLAVOR""@:default:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -433,8 +437,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-default} \
@@ -482,6 +486,91 @@
%files -f kernel.files

%changelog -n kernel-default
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.16.21)
+# spec file for package kernel-dummy (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
Autoreqprov: off
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher <agruen@xxxxxxx>

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%install
@@ -40,6 +40,91 @@
/etc/dummy

%changelog -n kernel-dummy
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-iseries64 (Version 2.6.16.21)
+# spec file for package kernel-iseries64 (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-iseries64-nongpl
@@ -51,7 +51,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -108,7 +108,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -117,12 +120,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-iseries64-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-iseries64-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -142,8 +145,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -193,7 +196,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -204,6 +207,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -240,7 +244,7 @@
-e "s:@FLAVOR""@:iseries64:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -411,8 +415,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-iseries64} \
@@ -460,6 +464,91 @@
%files -f kernel.files

%changelog -n kernel-iseries64
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.16.21)
+# spec file for package kernel-kdump (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: kernel for kdump
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-kdump-nongpl
@@ -57,7 +57,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -114,7 +114,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -126,12 +129,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-kdump-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -151,8 +154,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -202,7 +205,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -213,6 +216,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -249,7 +253,7 @@
-e "s:@FLAVOR""@:kdump:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -420,8 +424,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-kdump} \
@@ -469,6 +473,91 @@
%files -f kernel.files

%changelog -n kernel-kdump
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.16.21)
+# spec file for package kernel-ppc64 (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,8 +19,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -28,7 +28,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-ppc64-nongpl
@@ -52,7 +52,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -109,7 +109,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -131,12 +134,12 @@
Tom Gall <tom_gall@xxxxxxxxxxxx>
see /usr/src/linux-pmac-benh/CREDITS for more details.

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-ppc64-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -156,8 +159,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -207,7 +210,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -218,6 +221,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -254,7 +258,7 @@
-e "s:@FLAVOR""@:ppc64:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -425,8 +429,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-ppc64} \
@@ -474,6 +478,91 @@
%files -f kernel.files

%changelog -n kernel-ppc64
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.16.21)
+# spec file for package kernel-s390 (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-s390-nongpl
@@ -48,7 +48,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -105,7 +105,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -114,12 +117,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-s390-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-s390-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -139,8 +142,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -190,7 +193,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -201,6 +204,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -237,7 +241,7 @@
-e "s:@FLAVOR""@:s390:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -408,8 +412,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-s390} \
@@ -457,6 +461,91 @@
%files -f kernel.files

%changelog -n kernel-s390
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-smp.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-smp (Version 2.6.16.21)
+# spec file for package kernel-smp (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: Kernel with Multiprocessor Support
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-smp-nongpl
@@ -58,7 +58,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -115,7 +115,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -125,12 +128,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-smp-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-smp-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -150,8 +153,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -201,7 +204,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -212,6 +215,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -248,7 +252,7 @@
-e "s:@FLAVOR""@:smp:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -419,8 +423,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-smp} \
@@ -468,6 +472,91 @@
%files -f kernel.files

%changelog -n kernel-smp
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.16.21)
+# spec file for package kernel-source (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,9 +24,9 @@
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
%endif
PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
-Version: 2.6.16.21
-Release: 2
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Version: 2.6.18_rc3
+Release: 1
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source2: source-post.sh
Source11: post.sh
@@ -49,7 +49,7 @@
Source43: find-provides
Source45: module-renames
Source46: find-types
-source47: extract-modaliases
+Source47: extract-modaliases
Source50: kernel-syms.spec
Source51: kernel-bigsmp.spec
Source52: kernel-debug.spec
@@ -93,11 +93,11 @@

see /usr/src/linux/CREDITS for more details.

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "Please get a copy of linux-2.6.16.tar.bz2 from" \
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "Please get a copy of linux-2.6.17.tar.bz2 from" \
"ftp://ftp.kernel.org/pub/linux/kernel/v2.6/.";
fi
echo "Architecture symbol(s): %symbols"
@@ -108,30 +108,30 @@
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src
# Unpack the vanilla kernel sources
-bzip2 -cd %_sourcedir/linux-2.6.16.tar.bz2 \
+bzip2 -cd %_sourcedir/linux-2.6.17.tar.bz2 \
| tar xf -
-cd linux-2.6.16
+cd linux-2.6.17
# Hello Linus: hint, hint ...
chmod -Rf a+rX,g-w,o-w .
# Apply the patches needed for this architecture.

%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.16.21/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.16.21/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.21/$patch; then
+ > %_builddir/kernel-source-2.6.18_rc3/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.18_rc3/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.18_rc3/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done

-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.21 %release
-KERNELRELEASE=2.6.16.21-%release
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.18_rc3 %release
+KERNELRELEASE=2.6.18-rc3-%release
cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF
KERNELRELEASE=$KERNELRELEASE
SYMBOLS=$symbols
EOF
cd ..
-mv linux-2.6.16 linux-$KERNELRELEASE
+mv linux-2.6.17 linux-$KERNELRELEASE
cd linux-$KERNELRELEASE
chmod +x arch/ia64/scripts/toolchain-flags # agruen: necessary?
cd $RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE
@@ -146,8 +146,8 @@
;;
esac
%_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.16.21/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.16.21/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.18_rc3/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.18_rc3/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -274,6 +274,91 @@
%files -f kernel-source.files

%changelog -n kernel-source
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.16.21)
+# spec file for package kernel-syms (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -48,10 +48,10 @@
Autoreqprov: off
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Requires: linux
-Requires: kernel-source = 2.6.16.21-%release
+Requires: kernel-source = 2.6.18_rc3-%release
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -84,7 +84,7 @@

see /usr/src/linux/CREDITS for more details.

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%install
@@ -127,6 +127,91 @@
/boot/symsets-*-*.tar.gz

%changelog -n kernel-syms
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-um (Version 2.6.16.21)
+# spec file for package kernel-um (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-um-nongpl
@@ -48,7 +48,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -105,7 +105,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -117,12 +120,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-um-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-um-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -142,8 +145,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -193,7 +196,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -204,6 +207,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -240,7 +244,7 @@
-e "s:@FLAVOR""@:um:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -411,8 +415,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-um} \
@@ -460,6 +464,91 @@
%files -f kernel.files

%changelog -n kernel-um
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xen (Version 2.6.16.21)
+# spec file for package kernel-xen (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: The Xen Kernel
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-xen-nongpl
@@ -51,7 +51,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -108,7 +108,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -120,12 +123,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-xen-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-xen-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -145,8 +148,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -196,7 +199,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -207,6 +210,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -243,7 +247,7 @@
-e "s:@FLAVOR""@:xen:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -414,8 +418,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-xen} \
@@ -463,6 +467,91 @@
%files -f kernel.files

%changelog -n kernel-xen
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ kernel-xenpae.spec ++++++
--- /var/tmp/diff_new_pack.Nduc1n/_old 2006-08-06 22:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Nduc1n/_new 2006-08-06 22:00:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xenpae (Version 2.6.16.21)
+# spec file for package kernel-xenpae (Version 2.6.18_rc3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.21
-Release: 2
+Version: 2.6.18_rc3
+Release: 1
Summary: The Xen Kernel with PAE support
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.21-%release
+Provides: kernel = 2.6.18_rc3-%release
%endif
%endif
Provides: kernel-xenpae-nongpl
@@ -46,7 +46,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -103,7 +103,10 @@
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 6, 8 or 15;
# see scripts/kabi-checks)
-%define tolerate_kabi_changes 6
+#%define tolerate_kabi_changes 6
+# for now, for HEAD make this a big number so we can build
+# FIXME for a SLES release!!!
+%define tolerate_kabi_changes 999

%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})

@@ -117,12 +120,12 @@

-Source Timestamp: 2006/07/27 14:25:54 UTC
+Source Timestamp: 2006/08/04 09:22:50 UTC

%prep
-if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-xenpae-2.6.16.21.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.21.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
+ echo "The kernel-xenpae-2.6.18_rc3.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc3.src.rpm."
exit 1
fi
symbols=$(
@@ -142,8 +145,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.16/Module.supported
-cd linux-2.6.16
+) | sed -e 's,.*/,,' | sort > linux-2.6.17/Module.supported
+cd linux-2.6.17
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -193,7 +196,7 @@

%build
source .rpm-defs
-cd linux-2.6.16
+cd linux-2.6.17
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -204,6 +207,7 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
%endif
+make prepare
KERNELRELEASE=$(make -s kernelrelease)
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
# Override the timestamp `uname -v' reports with the build
@@ -240,7 +244,7 @@
-e "s:@FLAVOR""@:xenpae:g" \
%_sourcedir/postun.sh
) > postun.sh
-cd linux-2.6.16
+cd linux-2.6.17
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -411,8 +415,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.16, but the sources will
-# later be installed in /usr/src/linux-2.6.16-%release. Fix up the
+# We were building in %my_builddir/linux-2.6.17, but the sources will
+# later be installed in /usr/src/linux-2.6.17-%release. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-xenpae} \
@@ -460,6 +464,91 @@
%files -f kernel.files

%changelog -n kernel-xenpae
+* Fri Aug 04 2006 - hare@xxxxxxx
+- patches.fixes/dm-suspend-resume-events:
+ Send out 'change' events as discussed at OLS.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Reorder some patches to group common things.
+- remove some unneeded patches and merge 2 together.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable pci express hotplug driver on ppc64, as it doesn't build,
+ and requires ACPI, which PPC doesn't have...
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- reorder some patches
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- disable Intel DMA driver for ppc as it doesn't build on that platform..
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: pretty much disable the kabi checks
+ for now, for HEAD.
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix build error on ppc
+- remove CONFIG_NCP_FS from s390 configs as it kills the assember
+ (and it's not like we care about IPX connectivity to s390 machines...)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- fix config so that x86 should build (wrong sound config settings)
+* Wed Aug 02 2006 - gregkh@xxxxxxx
+- Disable KDB from i386 debug build as it does not build properly :(
+* Wed Aug 02 2006 - hare@xxxxxxx
+- config/s390/default: update config file.
+* Wed Aug 02 2006 - schwab@xxxxxxx
+- config-md-raid456: Fix misspelt config.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- suse-ppc32-mol-mm-context: Fix mol build.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- rpm/kernel-binary.spec.in: add "make prepare" before trying to
+ get the kernel version
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.drivers/qla4xxx: Delete.
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc3
+ (last commit should have said .18, not .17...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update to 2.6.17-rc2
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - schwab@xxxxxxx
+- Update kdb patches.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- update to 2.6.18-rc1 (only i386 configs will build right now, I
+ will fix the rest up tomorrow, must sleep...)
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- Update config files.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build (xen patch was busted), i386 should now build properly
+ for 2.6.17
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- patches.fixes/ieee1394-sbp2-maxtor-allow_restart.patch: Delete.
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- fix build error in patches.fixes/export-symbols-gpl: export some symbols for
+ SGI GPL kernel modules (SUSE46082, 141533).
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- 2.6.17 port work build breaks, but the patch set is relativly stable
+* Tue Aug 01 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build)
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- more 2.6.17 port work (still does not build, but need to save this state)
+- forward ported apparmor helper patches to 2.6.17 to keep that feature working
+* Mon Jul 31 2006 - gregkh@xxxxxxx
+- first step at doing 2.6.17 update (NOTE, will not build, only half-way done).
+* Mon Jul 31 2006 - olh@xxxxxxx
+- update patches.fixes/ignore-aix-disk-label.patch
+ look also for '_LVM' at the beginning of block #7
+* Fri Jul 28 2006 - gregkh@xxxxxxx
+- update mainline tags
+* Fri Jul 28 2006 - mason@xxxxxxx
+- more mainline tags on obsolete code
+* Fri Jul 28 2006 - mason@xxxxxxx
+- update mainline tags on reversable patches
+* Fri Jul 28 2006 - jbeulich@xxxxxxxxxx
+- patches.arch/x86_64-hotadd-pud, patches.arch/microcode-quiet,
+ patches.fixes/per-cpu-enough-room: Updated Patch-mainline tags
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/reiserfs-procfs-slashes.diff: Updated mainline tag
+* Thu Jul 27 2006 - jeffm@xxxxxxx
+- patches.fixes/netfilter-sctp-conntrack-fix-crash.diff:
+ [PATCH] NETFILTER: SCTP conntrack: fix crash triggered by
+ packet without chunks [CVE ... (190136).
* Thu Jul 27 2006 - agruen@xxxxxxx
- Abort Autobuild builds with a kernel ABI badness that exceeds
the maximum tolerated level.

++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-07-27 16:31:00.000000000 +0200
+++ kernel-source/build-source-timestamp 2006-08-04 20:13:23.000000000 +0200
@@ -1 +1 @@
-2006/07/27 14:25:54 UTC
+2006/08/04 09:22:50 UTC

++++++ config.tar.bz2 ++++++
++++ 24497 lines of diff (skipped)

++++++ kabi-checks ++++++
--- kernel-source/kabi-checks 2006-07-27 16:31:01.000000000 +0200
+++ kernel-source/kabi-checks 2006-08-04 20:13:33.000000000 +0200
@@ -49,7 +49,7 @@
"

# Turning off UTF-8 processing provides a major speedup.
-export LANG=POSIX
+export LC_ALL=C

echo "${0##*/} $@"

++++++ kabi.tar.bz2 ++++++
++++ 8050 lines of diff (skipped)

++++++ linux-2.6.16.tar.bz2 -> linux-2.6.17.tar.bz2 ++++++
kernel-source/linux-2.6.16.tar.bz2 kernel-source/linux-2.6.17.tar.bz2 differ: char 11, line 1

++++++ novell-kmp.tar.bz2 ++++++

++++++ patches.arch.tar.bz2 ++++++
++++ 39666 lines of diff (skipped)

++++++ patches.drivers.tar.bz2 ++++++
++++ 112031 lines of diff (skipped)

++++++ patches.fixes.tar.bz2 ++++++
++++ 32467 lines of diff (skipped)

++++++ patches.kernel.org.tar.bz2 ++++++
++++ 917944 lines of diff (skipped)

++++++ patches.rpmify.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/default-configuration new/patches.rpmify/default-configuration
--- old/patches.rpmify/default-configuration 2005-01-18 19:16:27.000000000 +0100
+++ new/patches.rpmify/default-configuration 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-From: Andreas Gruenbacher <agruen@xxxxxxx>
-Subject: Don't use running kernel's config file by default
-
-Users ran into the following problem: They grab a SuSE kernel-source
-package that is more recent than their running kernel. The tree under
-/usr/src/linux is unconfigured by default; there is no .config. User
-does a ``make menuconfig'', which gets its default values from
-/boot/config-$(uname -r). User tries to build the kernel, and the result
-doesn't work.
-
-I would like to get rid of using the running kernel's configuration
-unless the user explicitly requests it. Instead, please add the
-cloneconfig target to clone the running kernel's config file. See other
-patch.
-
-Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
-
-Index: linux-2.6.10/scripts/kconfig/confdata.c
-===================================================================
---- linux-2.6.10.orig/scripts/kconfig/confdata.c
-+++ linux-2.6.10/scripts/kconfig/confdata.c
-@@ -20,9 +20,6 @@ const char conf_defname[] = "arch/$ARCH/
-
- const char *conf_confnames[] = {
- ".config",
-- "/lib/modules/$UNAME_RELEASE/.config",
-- "/etc/kernel-config",
-- "/boot/config-$UNAME_RELEASE",
- conf_defname,
- NULL,
- };
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/extmod-fix new/patches.rpmify/extmod-fix
--- old/patches.rpmify/extmod-fix 2006-04-05 23:45:39.000000000 +0200
+++ new/patches.rpmify/extmod-fix 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From: Andreas Gruenbacher <agruen@xxxxxxx>
-Subject: modules_install must not remove existing modules
-
-When installing external modules with `make modules_install', the
-first thing that happens is a rm -rf of the target directory. This
-works only once, and breaks when installing more than one (set of)
-external module(s). Bug introduced in:
- http://www.kernel.org/hg/linux-2.6/?cs=bbb3915836f5
-
-Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
-
-Index: linux-2.6.16/Makefile
-===================================================================
---- linux-2.6.16.orig/Makefile
-+++ linux-2.6.16/Makefile
-@@ -1131,7 +1131,6 @@ modules_install: _emodinst_ _emodinst_po
- install-dir := $(if $(INSTALL_MOD_DIR),$(INSTALL_MOD_DIR),extra)
- .PHONY: _emodinst_
- _emodinst_:
-- $(Q)rm -rf $(MODLIB)/$(install-dir)
- $(Q)mkdir -p $(MODLIB)/$(install-dir)
- $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/fix-separate-compilation-with-preconf-kernel.diff new/patches.rpmify/fix-separate-compilation-with-preconf-kernel.diff
--- old/patches.rpmify/fix-separate-compilation-with-preconf-kernel.diff 2006-03-24 12:52:37.000000000 +0100
+++ new/patches.rpmify/fix-separate-compilation-with-preconf-kernel.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,186 +0,0 @@
-From: Andreas Gruenbacher <agruen@xxxxxxx>
-Subject: Fix compiling /usr/src/linux directly with O=
-References: 65891
-
-/etc/init.d/running-kernel creates the /usr/src/linux/include/asm
-symlink among other things so that user-space programs which include
-kernel headers directly won't fail miserably. While including kernel
-headers directly is not recommended, it's sometimes the most sensible
-thing to do. Now when trying to compile the /usr/src/linux tree with
-a different output directory as below, a check in the main kernel
-Makefile aborts the build. This patch fixes it.
-
- /usr/src/linux$ mkdir /var/tmp/obj
- /usr/src/linux$ cp arch/i386/defconfig.default /var/tmp/obj/.config
- /usr/src/linux$ make O=/var/tmp/obj
-
-Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
-
-Index: linux-2.6.15/Makefile
-===================================================================
---- linux-2.6.15.orig/Makefile
-+++ linux-2.6.15/Makefile
-@@ -301,7 +301,7 @@ AFLAGS_KERNEL =
- # Needed to be compatible with the O= option
- LINUXINCLUDE := -Iinclude \
- $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
-- -include include/linux/autoconf.h
-+ -include $(objtree)/include/linux/autoconf.h
-
- CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
-
-@@ -425,7 +425,7 @@ ifeq ($(KBUILD_EXTMOD),)
- scripts: scripts_basic include/config/MARKER
- $(Q)$(MAKE) $(build)=$(@)
-
--scripts_basic: include/linux/autoconf.h
-+scripts_basic: $(objtree)/include/linux/autoconf.h
-
- # Objects we will link into vmlinux / subdirs we need to visit
- init-y := init/
-@@ -453,12 +453,12 @@ include .config
- # with it and forgot to run make oldconfig.
- # If kconfig.d is missing then we are probarly in a cleaned tree so
- # we execute the config step to be sure to catch updated Kconfig files
--include/linux/autoconf.h: .kconfig.d .config
-+$(objtree)/include/linux/autoconf.h: .kconfig.d .config
- $(Q)mkdir -p include/linux
- $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
- else
- # Dummy target needed, because used as prerequisite
--include/linux/autoconf.h: ;
-+$(objtree)/include/linux/autoconf.h: ;
- endif
-
- # The all: target is the default when no target is given on the
-@@ -798,7 +798,7 @@ endif
- # prepare2 creates a makefile if using a separate output directory
- prepare2: prepare3 outputmakefile
-
--prepare1: prepare2 include/linux/version.h include/asm \
-+prepare1: prepare2 $(objtree)/include/linux/version.h $(objtree)/include/asm \
- include/config/MARKER
- ifneq ($(KBUILD_MODULES),)
- $(Q)rm -rf $(MODVERDIR)
-@@ -822,14 +822,14 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$
- # hard to detect, but I suppose "make mrproper" is a good idea
- # before switching between archs anyway.
-
--include/asm:
-+$(objtree)/include/asm:
- @echo ' SYMLINK $@ -> include/asm-$(ARCH)'
- $(Q)if [ ! -d include ]; then mkdir -p include; fi;
- @ln -fsn asm-$(ARCH) $@
-
- # Split autoconf.h into include/linux/config/*
-
--include/config/MARKER: scripts/basic/split-include include/linux/autoconf.h
-+include/config/MARKER: scripts/basic/split-include $(objtree)/include/linux/autoconf.h
- @echo ' SPLIT include/linux/autoconf.h -> include/config/*'
- @scripts/basic/split-include include/linux/autoconf.h include/config
- @touch $@
-@@ -853,7 +853,7 @@ define filechk_version.h
- )
- endef
-
--include/linux/version.h: $(srctree)/Makefile .config .kernelrelease FORCE
-+$(objtree)/include/linux/version.h: $(srctree)/Makefile .config .kernelrelease FORCE
- $(call filechk,version.h)
-
- # ---------------------------------------------------------------------------
-@@ -947,7 +947,7 @@ CLEAN_FILES += vmlinux System.map \
-
- # Directories & files removed with 'make mrproper'
- MRPROPER_DIRS += include/config include2
--MRPROPER_FILES += .config .config.old include/asm .version .old_version \
-+MRPROPER_FILES += .config .config.old $(objtree)/include/asm .version .old_version \
- include/linux/autoconf.h include/linux/version.h \
- .kernelrelease Module.symvers tags TAGS cscope*
-
-Index: linux-2.6.15/arch/arm/Makefile
-===================================================================
---- linux-2.6.15.orig/arch/arm/Makefile
-+++ linux-2.6.15/arch/arm/Makefile
-@@ -177,7 +177,7 @@ endif
- archprepare: maketools
-
- .PHONY: maketools FORCE
--maketools: include/linux/version.h include/asm-arm/.arch FORCE
-+maketools: $(objtree)/include/linux/version.h include/asm-arm/.arch FORCE
- $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
-
- # Convert bzImage to zImage
-Index: linux-2.6.15/arch/powerpc/Makefile
-===================================================================
---- linux-2.6.15.orig/arch/powerpc/Makefile
-+++ linux-2.6.15/arch/powerpc/Makefile
-@@ -177,7 +177,7 @@ archprepare: checkbin
-
- ifeq ($(CONFIG_PPC32),y)
- # Temporary hack until we have migrated to asm-powerpc
--include/asm: arch/$(ARCH)/include/asm
-+$(objtree)/include/asm: arch/$(ARCH)/include/asm
- arch/$(ARCH)/include/asm: FORCE
- $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
- $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
-Index: linux-2.6.15/arch/ppc/Makefile
-===================================================================
---- linux-2.6.15.orig/arch/ppc/Makefile
-+++ linux-2.6.15/arch/ppc/Makefile
-@@ -117,7 +117,7 @@ archclean:
- archprepare: checkbin
-
- # Temporary hack until we have migrated to asm-powerpc
--include/asm: arch/$(ARCH)/include/asm
-+$(objtree)/include/asm: arch/$(ARCH)/include/asm
- arch/$(ARCH)/include/asm:
- $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
- $(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
-Index: linux-2.6.15/arch/sh/Makefile
-===================================================================
---- linux-2.6.15.orig/arch/sh/Makefile
-+++ linux-2.6.15/arch/sh/Makefile
-@@ -138,7 +138,7 @@ boot := arch/sh/boot
- CPPFLAGS_vmlinux.lds := -traditional
-
- ifneq ($(KBUILD_SRC),)
--incdir-prefix := $(srctree)/include/asm-sh/
-+ incdir-prefix := $(srctree)/include/asm-sh/
- else
- incdir-prefix :=
- endif
-@@ -173,7 +173,7 @@ include/asm-sh/.mach: $(wildcard include
- archprepare: maketools include/asm-sh/.cpu include/asm-sh/.mach
-
- .PHONY: maketools FORCE
--maketools: include/linux/version.h FORCE
-+maketools: $(objtree)/include/linux/version.h FORCE
- $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
-
- all: zImage
-Index: linux-2.6.15/scripts/Makefile.lib
-===================================================================
---- linux-2.6.15.orig/scripts/Makefile.lib
-+++ linux-2.6.15/scripts/Makefile.lib
-@@ -100,7 +100,7 @@ __cpp_flags = $(_cpp_flags)
- else
-
- # Prefix -I with $(srctree) if it is not an absolute path
--addtree = $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
-+addtree = $(1) $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)))
- # Find all -I options and call addtree
- flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
-
-Index: linux-2.6.15/scripts/kconfig/util.c
-===================================================================
---- linux-2.6.15.orig/scripts/kconfig/util.c
-+++ linux-2.6.15/scripts/kconfig/util.c
-@@ -44,7 +44,7 @@ int file_write_dep(const char *name)
- else
- fprintf(out, "\t%s\n", file->name);
- }
-- fprintf(out, "\n.config include/linux/autoconf.h: $(deps_config)\n\n$(deps_config):\n");
-+ fprintf(out, "\n.config $(objtree)/include/linux/autoconf.h: $(deps_config)\n\n$(deps_config):\n");
- fclose(out);
- rename("..config.tmp", name);
- return 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/supported-flag new/patches.rpmify/supported-flag
--- old/patches.rpmify/supported-flag 2006-03-24 12:52:37.000000000 +0100
+++ new/patches.rpmify/supported-flag 2006-08-01 20:10:21.000000000 +0200
@@ -19,9 +19,9 @@
scripts/mod/modpost.c | 65 +++++++++++++++++++++++++++++++++++-
10 files changed, 145 insertions(+), 4 deletions(-)

---- linux-2.6.15.orig/Documentation/kernel-parameters.txt 2006-03-01 10:28:43.000000000 -0800
-+++ linux-2.6.15/Documentation/kernel-parameters.txt 2006-03-01 10:30:14.000000000 -0800
-@@ -1543,6 +1543,12 @@
+--- linux-2.6.17.orig/Documentation/kernel-parameters.txt
++++ linux-2.6.17/Documentation/kernel-parameters.txt
+@@ -1612,6 +1612,12 @@ running once the system is up.
stifb= [HW]
Format: bpp:<bpp1>[:<bpp2>[:<bpp3>...]]

@@ -34,9 +34,9 @@
swiotlb= [IA-64] Number of I/O TLB slabs

switches= [HW,M68k]
---- linux-2.6.15.orig/Documentation/sysctl/kernel.txt 2006-03-01 10:28:42.000000000 -0800
-+++ linux-2.6.15/Documentation/sysctl/kernel.txt 2006-03-01 10:30:14.000000000 -0800
-@@ -341,4 +341,15 @@
+--- linux-2.6.17.orig/Documentation/sysctl/kernel.txt
++++ linux-2.6.17/Documentation/sysctl/kernel.txt
+@@ -341,4 +341,15 @@ can be ORed together:
2 - A module was force loaded by insmod -f.
Set by modutils >= 2.4.9 and module-init-tools.
4 - Unsafe SMP processors: SMP with CPUs not designed for SMP.
@@ -52,17 +52,17 @@
+ 1 - warn when loading unsupported modules,
+ 2 - don't warn.

---- linux-2.6.15.orig/include/linux/kernel.h 2006-03-01 10:28:42.000000000 -0800
-+++ linux-2.6.15/include/linux/kernel.h 2006-03-01 10:30:14.000000000 -0800
-@@ -175,6 +175,7 @@
- extern __deprecated_for_modules int panic_timeout;
+--- linux-2.6.17.orig/include/linux/kernel.h
++++ linux-2.6.17/include/linux/kernel.h
+@@ -186,6 +186,7 @@ extern int oops_in_progress; /* If set,
+ extern int panic_timeout;
extern int panic_on_oops;
extern int tainted;
+extern int unsupported;
extern const char *print_tainted(void);
extern void add_taint(unsigned);

-@@ -194,6 +195,8 @@
+@@ -205,6 +206,8 @@ extern enum system_states {
#define TAINT_FORCED_RMMOD (1<<3)
#define TAINT_MACHINE_CHECK (1<<4)
#define TAINT_BAD_PAGE (1<<5)
@@ -71,19 +71,19 @@

extern void dump_stack(void);

---- linux-2.6.15.orig/include/linux/sysctl.h 2006-03-01 10:28:43.000000000 -0800
-+++ linux-2.6.15/include/linux/sysctl.h 2006-03-01 10:30:36.000000000 -0800
-@@ -148,6 +148,7 @@
- KERN_SPIN_RETRY=70, /* int: number of spinlock retries */
- KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
+--- linux-2.6.17.orig/include/linux/sysctl.h
++++ linux-2.6.17/include/linux/sysctl.h
+@@ -150,6 +150,7 @@ enum
KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
-+ KERN_UNSUPPORTED=73, /* int: allow loading of unsupported modules */
+ KERN_COMPAT_LOG=73, /* int: print compat layer messages */
+ KERN_MAX_LOCK_DEPTH=74,
++ KERN_UNSUPPORTED=75, /* int: allow loading of unsupported modules */
};

---- linux-2.6.15.orig/kernel/module.c 2006-03-01 10:28:43.000000000 -0800
-+++ linux-2.6.15/kernel/module.c 2006-03-01 10:30:14.000000000 -0800
-@@ -56,6 +56,20 @@
+--- linux-2.6.17.orig/kernel/module.c
++++ linux-2.6.17/kernel/module.c
+@@ -58,6 +58,20 @@
/* If this is set, the section belongs in the init part of the module */
#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))

@@ -104,16 +104,16 @@
/* Protects module list */
static DEFINE_SPINLOCK(modlist_lock);

-@@ -1532,7 +1546,7 @@
+@@ -1459,7 +1473,7 @@ static struct module *load_module(void _
{
Elf_Ehdr *hdr;
Elf_Shdr *sechdrs;
- char *secstrings, *args, *modmagic, *strtab = NULL;
+ char *secstrings, *args, *modmagic, *strtab = NULL, *supported;
- unsigned int i, symindex = 0, strindex = 0, setupindex, exindex,
- exportindex, modindex, obsparmindex, infoindex, gplindex,
- crcindex, gplcrcindex, versindex, pcpuindex;
-@@ -1652,6 +1666,28 @@
+ unsigned int i;
+ unsigned int symindex = 0;
+ unsigned int strindex = 0;
+@@ -1607,6 +1621,28 @@ static struct module *load_module(void _
goto free_hdr;
}

@@ -140,11 +140,11 @@
+ }
+
/* Now copy in args */
- arglen = strlen_user(uargs);
- if (!arglen) {
---- linux-2.6.15.orig/kernel/panic.c 2006-03-01 10:28:40.000000000 -0800
-+++ linux-2.6.15/kernel/panic.c 2006-03-01 10:30:14.000000000 -0800
-@@ -148,6 +148,8 @@
+ args = strndup_user(uargs, ~0UL >> 1);
+ if (IS_ERR(args)) {
+--- linux-2.6.17.orig/kernel/panic.c
++++ linux-2.6.17/kernel/panic.c
+@@ -149,6 +149,8 @@ EXPORT_SYMBOL(panic);
* 'R' - User forced a module unload.
* 'M' - Machine had a machine check experience.
* 'B' - System has hit bad_page.
@@ -153,7 +153,7 @@
*
* The string is overwritten by the next call to print_taint().
*/
-@@ -156,13 +158,15 @@
+@@ -157,13 +159,15 @@ const char *print_tainted(void)
{
static char buf[20];
if (tainted) {
@@ -171,9 +171,9 @@
}
else
snprintf(buf, sizeof(buf), "Not tainted");
---- linux-2.6.15.orig/kernel/sysctl.c 2006-03-01 10:28:43.000000000 -0800
-+++ linux-2.6.15/kernel/sysctl.c 2006-03-01 10:30:14.000000000 -0800
-@@ -305,6 +305,16 @@
+--- linux-2.6.17.orig/kernel/sysctl.c
++++ linux-2.6.17/kernel/sysctl.c
+@@ -306,6 +306,16 @@ static ctl_table kern_table[] = {
.mode = 0444,
.proc_handler = &proc_dointvec,
},
@@ -190,23 +190,23 @@
{
.ctl_name = KERN_CAP_BSET,
.procname = "cap-bound",
---- linux-2.6.15.orig/Makefile 2006-03-01 10:29:48.000000000 -0800
-+++ linux-2.6.15/Makefile 2006-03-01 10:30:14.000000000 -0800
-@@ -311,6 +311,11 @@
- -ffreestanding
- AFLAGS := -D__ASSEMBLY__
+--- linux-2.6.17.orig/Makefile
++++ linux-2.6.17/Makefile
+@@ -315,6 +315,11 @@ CFLAGS += $(call cc-option, -fn
+ -fno-stack-protector)
+ AFLAGS := -D__ASSEMBLY__

+# Warn about unsupported modules in kernels built inside Autobuild
+ifneq ($(wildcard /.buildenv),)
+CFLAGS += -DUNSUPPORTED_MODULES=1
+endif
+
- # Read KERNELRELEASE from .kernelrelease (if it exists)
- KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
---- linux-2.6.15.orig/scripts/Makefile.modpost 2006-03-01 10:28:43.000000000 -0800
-+++ linux-2.6.15/scripts/Makefile.modpost 2006-03-01 10:30:14.000000000 -0800
-@@ -58,6 +58,8 @@
+--- linux-2.6.17.orig/scripts/Makefile.modpost
++++ linux-2.6.17/scripts/Makefile.modpost
+@@ -58,6 +58,8 @@ quiet_cmd_modpost = MODPOST
$(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \
$(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \
$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
@@ -214,11 +214,11 @@
+ $(objtree)/Module.supported /dev/null)) \
$(filter-out FORCE,$^)

- .PHONY: __modpost
---- linux-2.6.15.orig/scripts/mod/modpost.c 2006-03-01 10:28:43.000000000 -0800
-+++ linux-2.6.15/scripts/mod/modpost.c 2006-03-01 10:30:14.000000000 -0800
-@@ -451,6 +451,48 @@
- return NULL;
+ PHONY += __modpost
+--- linux-2.6.17.orig/scripts/mod/modpost.c
++++ linux-2.6.17/scripts/mod/modpost.c
+@@ -1012,6 +1012,48 @@ static int exit_section_ref_ok(const cha
+ return 0;
}

+void *supported_file;
@@ -266,7 +266,7 @@
static void read_symbols(char *modname)
{
const char *symname;
-@@ -552,6 +594,13 @@
+@@ -1184,6 +1226,13 @@ static void add_header(struct buffer *b,
buf_printf(b, "};\n");
}

@@ -280,7 +280,7 @@
/**
* Record CRCs for unresolved symbols
**/
-@@ -679,6 +728,13 @@
+@@ -1311,6 +1360,13 @@ static void write_if_changed(struct buff
fclose(file);
}

@@ -291,10 +291,10 @@
+ ; /* ignore error */
+}
+
- static void read_dump(const char *fname, unsigned int kernel)
- {
- unsigned long size, pos = 0;
-@@ -763,9 +819,10 @@
+ /* parse Module.symvers file. line format:
+ * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something]
+ **/
+@@ -1401,9 +1457,10 @@ int main(int argc, char **argv)
char fname[SZ];
char *kernel_read = NULL, *module_read = NULL;
char *dump_write = NULL;
@@ -306,7 +306,7 @@
switch(opt) {
case 'i':
kernel_read = optarg;
-@@ -783,11 +840,16 @@
+@@ -1421,11 +1478,16 @@ int main(int argc, char **argv)
case 'a':
all_versions = 1;
break;
@@ -323,7 +323,7 @@
if (kernel_read)
read_dump(kernel_read, 1);
if (module_read)
-@@ -804,6 +866,7 @@
+@@ -1448,6 +1510,7 @@ int main(int argc, char **argv)
buf.pos = 0;

add_header(&buf, mod);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/suse-extmod-legacy new/patches.rpmify/suse-extmod-legacy
--- old/patches.rpmify/suse-extmod-legacy 2006-03-24 12:52:37.000000000 +0100
+++ new/patches.rpmify/suse-extmod-legacy 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-Subject: I have no idea, why is this not upstream?
-From: someone@xxxxxxx
-
-Makefile | 3 +++
- 1 files changed, 3 insertions(+)
-
-diff -r f2c19677c913 Makefile
---- a/Makefile Mon Mar 6 12:32:53 2006 -0500
-+++ b/Makefile Mon Mar 6 12:33:38 2006 -0500
-@@ -1115,6 +1115,9 @@ modules: $(module-dirs)
- @echo ' Building modules, stage 2.';
- $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost
-
-+.PHONY: modules_add
-+modules_add: modules_install
-+
- .PHONY: modules_install
- modules_install: _emodinst_ _emodinst_post
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/symtypes.diff new/patches.rpmify/symtypes.diff
--- old/patches.rpmify/symtypes.diff 2006-05-09 20:17:51.000000000 +0200
+++ new/patches.rpmify/symtypes.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,270 +0,0 @@
-From: Andreas Gruenbacher <agruen@xxxxxxx>
-Subject: Dump the types that make up modversions
-
-Add a new -T option to genksyms that generates a dump of the
-type definition that make up the symbol version hashes. This
-allows to trace modversion changes back to what caused them.
-The dump format is the name of the type defined, followed by
-its definition (which is almost C):
-
- s#list_head struct list_head { s#list_head * next , * prev ; }
-
-The s#, u#, e#, and t# prefixes stand for struct, union, enum,
-and typedef. The exported symbols do not define types, and thus
-do not have an x# prefix:
-
- nfs4_acl_get_whotype int nfs4_acl_get_whotype ( char * , t#u32 )
-
-The symbol type defintion of a single file can be generated with:
-
- make fs/jbd/journal.symtapes
-
-If KBUILD_SYMTYPES is defined, all the *.symtypes of all object
-files that export symbols are generated.
-
-Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
-
-Index: linux-2.6.15/scripts/Makefile.build
-===================================================================
---- linux-2.6.15.orig/scripts/Makefile.build
-+++ linux-2.6.15/scripts/Makefile.build
-@@ -140,6 +140,15 @@ cmd_cc_i_c = $(CPP) $(c_flags) -
- %.i: %.c FORCE
- $(call if_changed_dep,cc_i_c)
-
-+quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
-+cmd_cc_symtypes_c = \
-+ $(CPP) -D__GENKSYMS__ $(c_flags) $< \
-+ | $(GENKSYMS) -T $@ >/dev/null; \
-+ test -s $@ || rm -f $@
-+
-+%.symtypes : %.c FORCE
-+ $(call if_changed_dep,cc_symtypes_c)
-+
- # C (.c) files
- # The C file is compiled and updated dependency information is generated.
- # (See cmd_cc_o_c + relevant part of rule_cc_o_c)
-@@ -166,7 +175,8 @@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D
- cmd_modversions = \
- if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then \
- $(CPP) -D__GENKSYMS__ $(c_flags) $< \
-- | $(GENKSYMS) \
-+ | $(GENKSYMS) $(if $(KBUILD_SYMTYPES), \
-+ -T $(@D)/$(@F:.o=.symtypes)) \
- > $(@D)/.tmp_$(@F:.o=.ver); \
- \
- $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \
-Index: linux-2.6.15/scripts/genksyms/genksyms.c
-===================================================================
---- linux-2.6.15.orig/scripts/genksyms/genksyms.c
-+++ linux-2.6.15/scripts/genksyms/genksyms.c
-@@ -43,12 +43,13 @@ FILE *debugfile;
- int cur_line = 1;
- char *cur_filename, *output_directory;
-
--int flag_debug, flag_dump_defs, flag_warnings;
-+int flag_debug, flag_dump_defs, flag_dump_types, flag_warnings;
-
- static int errors;
- static int nsyms;
-
- static struct symbol *expansion_trail;
-+static struct symbol *visited_symbols;
-
- static const char * const symbol_type_name[] = {
- "normal", "typedef", "enum", "struct", "union"
-@@ -178,6 +179,7 @@ add_symbol(const char *name, enum symbol
- sym->type = type;
- sym->defn = defn;
- sym->expansion_trail = NULL;
-+ sym->visited = NULL;
- sym->is_extern = is_extern;
-
- sym->hash_next = symtab[h];
-@@ -262,27 +264,12 @@ equal_list(struct string_list *a, struct
- static inline void
- print_node(FILE *f, struct string_list *list)
- {
-- switch (list->tag)
-+ if (list->tag != SYM_NORMAL)
- {
-- case SYM_STRUCT:
-- putc('s', f);
-- goto printit;
-- case SYM_UNION:
-- putc('u', f);
-- goto printit;
-- case SYM_ENUM:
-- putc('e', f);
-- goto printit;
-- case SYM_TYPEDEF:
-- putc('t', f);
-- goto printit;
--
-- printit:
-+ putc(symbol_type_name[list->tag][0], f);
- putc('#', f);
-- case SYM_NORMAL:
-- fputs(list->string, f);
-- break;
- }
-+ fputs(list->string, f);
- }
-
- void
-@@ -318,8 +305,9 @@ print_list(FILE *f, struct string_list *
- }
-
- static unsigned long
--expand_and_crc_list(struct string_list *list, unsigned long crc)
-+expand_and_crc_sym(struct symbol *sym, unsigned long crc)
- {
-+ struct string_list *list = sym->defn;
- struct string_list **e, **b;
- struct string_list *tmp, **tmp2;
- int elem = 1;
-@@ -367,7 +355,7 @@ expand_and_crc_list(struct string_list *
- {
- subsym->expansion_trail = expansion_trail;
- expansion_trail = subsym;
-- crc = expand_and_crc_list(subsym->defn, crc);
-+ crc = expand_and_crc_sym(subsym, crc);
- }
- break;
-
-@@ -418,12 +406,23 @@ expand_and_crc_list(struct string_list *
- {
- subsym->expansion_trail = expansion_trail;
- expansion_trail = subsym;
-- crc = expand_and_crc_list(subsym->defn, crc);
-+ crc = expand_and_crc_sym(subsym, crc);
- }
- break;
- }
- }
-
-+ {
-+ static struct symbol **end = &visited_symbols;
-+
-+ if (!sym->visited)
-+ {
-+ *end = sym;
-+ end = &sym->visited;
-+ sym->visited = (struct symbol *)-1L;
-+ }
-+ }
-+
- return crc;
- }
-
-@@ -444,7 +443,7 @@ export_symbol(const char *name)
-
- expansion_trail = (struct symbol *)-1L;
-
-- crc = expand_and_crc_list(sym->defn, 0xffffffff) ^ 0xffffffff;
-+ crc = expand_and_crc_sym(sym, 0xffffffff) ^ 0xffffffff;
-
- sym = expansion_trail;
- while (sym != (struct symbol *)-1L)
-@@ -525,6 +524,7 @@ void genksyms_usage(void)
- int
- main(int argc, char **argv)
- {
-+ FILE *dumpfile = NULL;
- int o;
-
- #ifdef __GNU_LIBRARY__
-@@ -533,12 +533,13 @@ main(int argc, char **argv)
- {"warnings", 0, 0, 'w'},
- {"quiet", 0, 0, 'q'},
- {"dump", 0, 0, 'D'},
-+ {"dump-types", 1, 0, 'T'},
- {"version", 0, 0, 'V'},
- {"help", 0, 0, 'h'},
- {0, 0, 0, 0}
- };
-
-- while ((o = getopt_long(argc, argv, "dwqVDk:p:",
-+ while ((o = getopt_long(argc, argv, "dwqVDT:k:p:",
- &long_opts[0], NULL)) != EOF)
- #else /* __GNU_LIBRARY__ */
- while ((o = getopt(argc, argv, "dwqVDk:p:")) != EOF)
-@@ -560,6 +561,15 @@ main(int argc, char **argv)
- case 'D':
- flag_dump_defs = 1;
- break;
-+ case 'T':
-+ flag_dump_types = 1;
-+ dumpfile = fopen(optarg, "w");
-+ if (!dumpfile)
-+ {
-+ perror(optarg);
-+ return 1;
-+ }
-+ break;
- case 'h':
- genksyms_usage();
- return 0;
-@@ -581,6 +591,27 @@ main(int argc, char **argv)
-
- yyparse();
-
-+ if (flag_dump_types && visited_symbols)
-+ {
-+ while (visited_symbols != (struct symbol *)-1L)
-+ {
-+ struct symbol *sym = visited_symbols;
-+
-+ if (sym->type != SYM_NORMAL)
-+ {
-+ putc(symbol_type_name[sym->type][0], dumpfile);
-+ putc('#', dumpfile);
-+ }
-+ fputs(sym->name, dumpfile);
-+ putc(' ', dumpfile);
-+ print_list(dumpfile, sym->defn);
-+ putc('\n', dumpfile);
-+
-+ visited_symbols = sym->visited;
-+ sym->visited = NULL;
-+ }
-+ }
-+
- if (flag_debug)
- {
- fprintf(debugfile, "Hash table occupancy %d/%d = %g\n",
-Index: linux-2.6.15/scripts/genksyms/genksyms.h
-===================================================================
---- linux-2.6.15.orig/scripts/genksyms/genksyms.h
-+++ linux-2.6.15/scripts/genksyms/genksyms.h
-@@ -46,6 +46,7 @@ struct symbol
- enum symbol_type type;
- struct string_list *defn;
- struct symbol *expansion_trail;
-+ struct symbol *visited;
- int is_extern;
- };
-
-Index: linux-2.6.15/Makefile
-===================================================================
---- linux-2.6.15.orig/Makefile
-+++ linux-2.6.15/Makefile
-@@ -967,7 +967,8 @@ clean: archclean $(clean-dirs)
- $(call cmd,rmfiles)
- @find . $(RCS_FIND_IGNORE) \
- $ -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-- -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' $ \
-+ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-+ -o -name '*.symtypes' \) \
- -type f -print | xargs rm -f
-
- # mrproper - Delete all generated files, including .config
-@@ -1306,6 +1307,8 @@ kernelversion:
- $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
- %.o: %.S scripts FORCE
- $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
-+%.symtypes: %.c scripts FORCE
-+ $(Q)$(MAKE) $(build)=$(@D) $(dir $<)$(notdir $@)
-
- # For external modules we shall include any directory of the target,
- # but usual case there is no directory part.

++++++ patches.suse.tar.bz2 ++++++
++++ 145504 lines of diff (skipped)

++++++ patches.uml.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/fix-build new/patches.uml/fix-build
--- old/patches.uml/fix-build 2006-01-16 12:47:56.000000000 +0100
+++ new/patches.uml/fix-build 2006-08-01 20:10:21.000000000 +0200
@@ -1,15 +1,17 @@
From: Olaf Kirch <okir@xxxxxxx>
Subject: Unbreak "make prepare" on UML

-Index: linux-2.6.15/arch/um/Makefile
-===================================================================
---- linux-2.6.15.orig/arch/um/Makefile 2006-01-16 11:58:48.000000000 +0100
-+++ linux-2.6.15/arch/um/Makefile 2006-01-16 12:09:35.000000000 +0100
-@@ -225,6 +225,7 @@ CLEAN_FILES += $(ARCH_DIR)/user-offsets.
+---
+ arch/um/Makefile | 1 +
+ 1 files changed, 1 insertion(+)
+
+--- linux-2.6.17.orig/arch/um/Makefile
++++ linux-2.6.17/arch/um/Makefile
+@@ -239,6 +239,7 @@ $(ARCH_DIR)/include/user_constants.h: $(

- $(ARCH_DIR)/include/kern_constants.h:
+ $(ARCH_DIR)/include/kern_constants.h: $(objtree)/$(ARCH_DIR)/include
@echo ' SYMLINK $@'
-+ $(Q) mkdir -p $(ARCH_DIR)/include
- $(Q) ln -sf ../../../include/asm-um/asm-offsets.h $@
++ $(Q)mkdir -p $(ARCH_DIR)/include
+ $(Q)ln -sf ../../../include/asm-um/asm-offsets.h $@

- export SUBARCH USER_CFLAGS OS
+ export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/uml-x11-fb new/patches.uml/uml-x11-fb
--- old/patches.uml/uml-x11-fb 2006-01-13 10:39:23.000000000 +0100
+++ new/patches.uml/uml-x11-fb 2006-08-01 20:10:21.000000000 +0200
@@ -4,11 +4,23 @@
Framebuffer driver for UML

Signed-off-by: Gerd Knorr <kraxel@xxxxxxxxxxx>
-Index: linux-2.6.15/arch/um/Kconfig
-===================================================================
---- linux-2.6.15.orig/arch/um/Kconfig 2006-01-13 10:18:44.000000000 +0100
-+++ linux-2.6.15/arch/um/Kconfig 2006-01-13 10:21:50.000000000 +0100
-@@ -117,6 +117,16 @@ config NET
+---
+ arch/um/Kconfig | 10
+ arch/um/Makefile | 12
+ arch/um/drivers/Makefile | 2
+ arch/um/drivers/x11_kern.c | 549 +++++++++++++++++++++++++++++++++++++++++++++
+ arch/um/drivers/x11_user.c | 514 ++++++++++++++++++++++++++++++++++++++++++
+ arch/um/include/x11_kern.h | 9
+ arch/um/include/x11_user.h | 15 +
+ arch/um/kernel/um_arch.c | 12
+ drivers/char/Kconfig | 2
+ drivers/video/fbmem.c | 4
+ include/asm-um/irq.h | 3
+ 11 files changed, 1126 insertions(+), 6 deletions(-)
+
+--- linux-2.6.17.orig/arch/um/Kconfig
++++ linux-2.6.17/arch/um/Kconfig
+@@ -106,6 +106,16 @@ config NET
recommended to read the NET-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.

@@ -25,10 +37,8 @@

source "fs/Kconfig.binfmt"

-Index: linux-2.6.15/arch/um/drivers/Makefile
-===================================================================
---- linux-2.6.15.orig/arch/um/drivers/Makefile 2006-01-13 10:18:44.000000000 +0100
-+++ linux-2.6.15/arch/um/drivers/Makefile 2006-01-13 10:21:50.000000000 +0100
+--- linux-2.6.17.orig/arch/um/drivers/Makefile
++++ linux-2.6.17/arch/um/drivers/Makefile
@@ -16,6 +16,7 @@ hostaudio-objs := hostaudio_kern.o
ubd-objs := ubd_kern.o ubd_user.o
port-objs := port_kern.o port_user.o
@@ -45,10 +55,8 @@
obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
obj-$(CONFIG_UML_WATCHDOG) += harddog.o
obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
-Index: linux-2.6.15/arch/um/drivers/x11_kern.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/um/drivers/x11_kern.c 2006-01-13 10:21:50.000000000 +0100
+--- /dev/null
++++ linux-2.6.17/arch/um/drivers/x11_kern.c
@@ -0,0 +1,549 @@
+#include <linux/init.h>
+#include <linux/config.h>
@@ -599,10 +607,8 @@
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.15/arch/um/drivers/x11_user.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/um/drivers/x11_user.c 2006-01-13 10:21:51.000000000 +0100
+--- /dev/null
++++ linux-2.6.17/arch/um/drivers/x11_user.c
@@ -0,0 +1,514 @@
+#include <stdlib.h>
+#include <string.h>
@@ -1118,10 +1124,8 @@
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.15/arch/um/include/x11_kern.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/um/include/x11_kern.h 2006-01-13 10:21:51.000000000 +0100
+--- /dev/null
++++ linux-2.6.17/arch/um/include/x11_kern.h
@@ -0,0 +1,9 @@
+/* x11_kern */
+
@@ -1132,10 +1136,8 @@
+void x11_mouse_input(struct x11_kerndata *kd, int key, int down,
+ int x, int y);
+void x11_cad(struct x11_kerndata *kd);
-Index: linux-2.6.15/arch/um/include/x11_user.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/um/include/x11_user.h 2006-01-13 10:21:51.000000000 +0100
+--- /dev/null
++++ linux-2.6.17/arch/um/include/x11_user.h
@@ -0,0 +1,15 @@
+/* x11_user */
+
@@ -1152,10 +1154,8 @@
+struct fb_var_screeninfo* x11_get_var(struct x11_window *win);
+void* x11_get_fbmem(struct x11_window *win);
+
-Index: linux-2.6.15/arch/um/kernel/um_arch.c
-===================================================================
---- linux-2.6.15.orig/arch/um/kernel/um_arch.c 2006-01-13 10:18:18.000000000 +0100
-+++ linux-2.6.15/arch/um/kernel/um_arch.c 2006-01-13 10:21:51.000000000 +0100
+--- linux-2.6.17.orig/arch/um/kernel/um_arch.c
++++ linux-2.6.17/arch/um/kernel/um_arch.c
@@ -14,6 +14,7 @@
#include "linux/bootmem.h"
#include "linux/spinlock.h"
@@ -1173,7 +1173,7 @@
.loops_per_jiffy = 0,
.ipi_pipe = { -1, -1 }
};
-@@ -206,7 +207,7 @@ static int __init uml_ncpus_setup(char *
+@@ -224,7 +225,7 @@ static int __init uml_ncpus_setup(char *

__uml_setup("ncpus=", uml_ncpus_setup,
"ncpus=<# of desired CPUs>\n"
@@ -1182,7 +1182,7 @@
);
#endif

-@@ -388,7 +389,7 @@ int linux_main(int argc, char **argv)
+@@ -406,7 +407,7 @@ int linux_main(int argc, char **argv)
argv1_begin = argv[1];
argv1_end = &argv[1][strlen(argv[1])];
#endif
@@ -1191,7 +1191,7 @@
highmem = 0;
iomem_size = (iomem_size + PAGE_SIZE - 1) & PAGE_MASK;
max_physmem = get_kmem_end() - uml_physmem - iomem_size - MIN_VMALLOC;
-@@ -457,6 +458,8 @@ static struct notifier_block panic_exit_
+@@ -475,6 +476,8 @@ static struct notifier_block panic_exit_
.priority = 0
};

@@ -1199,8 +1199,8 @@
+
void __init setup_arch(char **cmdline_p)
{
- notifier_chain_register(&panic_notifier_list, &panic_exit_notifier);
-@@ -464,6 +467,9 @@ void __init setup_arch(char **cmdline_p)
+ atomic_notifier_chain_register(&panic_notifier_list,
+@@ -483,6 +486,9 @@ void __init setup_arch(char **cmdline_p)
strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
*cmdline_p = command_line;
setup_hostinfo();
@@ -1210,11 +1210,9 @@
}

void __init check_bugs(void)
-Index: linux-2.6.15/drivers/video/fbmem.c
-===================================================================
---- linux-2.6.15.orig/drivers/video/fbmem.c 2006-01-13 10:18:44.000000000 +0100
-+++ linux-2.6.15/drivers/video/fbmem.c 2006-01-13 10:21:51.000000000 +0100
-@@ -1206,12 +1206,16 @@ fb_mmap(struct file *file, struct vm_are
+--- linux-2.6.17.orig/drivers/video/fbmem.c
++++ linux-2.6.17/drivers/video/fbmem.c
+@@ -1213,13 +1213,17 @@ fb_mmap(struct file *file, struct vm_are
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
else
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
@@ -1227,14 +1225,13 @@
if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
vma->vm_end - vma->vm_start, vma->vm_page_prot))
return -EAGAIN;
-+#endif
- #endif /* !__sparc_v9__ */
return 0;
++#endif
#endif /* !sparc32 */
-Index: linux-2.6.15/include/asm-um/irq.h
-===================================================================
---- linux-2.6.15.orig/include/asm-um/irq.h 2006-01-13 10:18:44.000000000 +0100
-+++ linux-2.6.15/include/asm-um/irq.h 2006-01-13 10:21:51.000000000 +0100
+ }
+
+--- linux-2.6.17.orig/include/asm-um/irq.h
++++ linux-2.6.17/include/asm-um/irq.h
@@ -15,8 +15,9 @@
#define SIGIO_WRITE_IRQ 11
#define TELNETD_IRQ 12
@@ -1246,10 +1243,8 @@
#define NR_IRQS (LAST_IRQ + 1)

#endif
-Index: linux-2.6.15/drivers/char/Kconfig
-===================================================================
---- linux-2.6.15.orig/drivers/char/Kconfig 2006-01-13 10:18:44.000000000 +0100
-+++ linux-2.6.15/drivers/char/Kconfig 2006-01-13 10:21:51.000000000 +0100
+--- linux-2.6.17.orig/drivers/char/Kconfig
++++ linux-2.6.17/drivers/char/Kconfig
@@ -59,7 +59,7 @@ config VT_CONSOLE

config HW_CONSOLE
@@ -1259,11 +1254,9 @@
default y

config SERIAL_NONSTANDARD
-Index: linux-2.6.15/arch/um/Makefile
-===================================================================
---- linux-2.6.15.orig/arch/um/Makefile 2006-01-13 10:18:44.000000000 +0100
-+++ linux-2.6.15/arch/um/Makefile 2006-01-13 10:21:51.000000000 +0100
-@@ -126,12 +126,22 @@ CPPFLAGS_vmlinux.lds = -U$(SUBARCH) \
+--- linux-2.6.17.orig/arch/um/Makefile
++++ linux-2.6.17/arch/um/Makefile
+@@ -139,12 +139,22 @@ CPPFLAGS_vmlinux.lds = -U$(SUBARCH) \
#The wrappers will select whether using "malloc" or the kernel allocator.
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc

++++++ patches.xen.tar.bz2 ++++++
++++ 10946 lines of diff (skipped)

++++++ series.conf ++++++
++++ 1533 lines (skipped)
++++ between series.conf
++++ and kernel-source/series.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

< Previous

Next >

Mailinglist Archive: opensuse-commit (1318 mails)

commit kernel-source

Search this list

List Navigation

This Thread