Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Thu Apr 8 15:15:20 CEST 2010.
--------
--- kernel-source/kernel-debug.changes 2010-03-30 07:00:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-04-01 07:00:20.000000000 +0200
@@ -1,0 +2,55 @@
+Wed Mar 31 17:12:43 CEST 2010 - jeffm@suse.de
+
+- Updated sparc64 config.
+
+-------------------------------------------------------------------
+Wed Mar 31 16:46:56 CEST 2010 - jeffm@suse.de
+
+- Update to 2.6.34-rc3.
+
+-------------------------------------------------------------------
+Wed Mar 31 14:29:46 CEST 2010 - mmarek@suse.cz
+
+- rpm/kernel-docs.spec.in: Fix path to kernel source.
+
+-------------------------------------------------------------------
+Wed Mar 31 14:18:52 CEST 2010 - mmarek@suse.cz
+
+- rpm/configtool.pl, rpm/kernel-binary.spec.in,
+ rpm/kernel-source.spec.in: Add support for custom config options
+ in config.addon.tar.bz2. This tarball is expected to have the
+ same layout as config.tar.bz2 and the config options listed there
+ take precedence over config.tar.bz2.
+
+-------------------------------------------------------------------
+Wed Mar 31 14:03:10 CEST 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, rpm/mkspec:
+ Generate the chmod +x line automatically.
+
+-------------------------------------------------------------------
+Wed Mar 31 13:45:33 CEST 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/mkspec, scripts/tar-up.sh:
+ Generate the Source: lines from kernel-source.spec.in.
+
+-------------------------------------------------------------------
+Tue Mar 30 19:18:01 CEST 2010 - jeffm@suse.de
+
+- patches.fixes/reiserfs-remove-2-tb-file-size-limit: reiserfs:
+ Remove 2 TB file size limit (bnc#592100).
+
+-------------------------------------------------------------------
+Tue Mar 30 17:03:54 CEST 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, rpm/mkspec:
+ Generated the NoSource and %setup lines automatically from the
+ preamble.
+
+-------------------------------------------------------------------
+Tue Mar 30 14:36:25 CEST 2010 - mmarek@suse.cz
+
+- rpm/kernel-source.spec.in: Provide $pkg = %version-%source_rel
+ in kernel-devel and kernel-source-vanilla.
+
+-------------------------------------------------------------------
@@ -226,0 +282,12 @@
+Fri Mar 5 02:02:01 UTC 2010 - jengelh@medozas.de
+
+- rpm/kernel-source.spec.in: split devel files and full source
+ into two rpms, of which only the former is really required for
+ KMP building
+
+-------------------------------------------------------------------
+Fri Mar 5 02:00:50 UTC 2010 - jengelh@medozas.de
+
+- add configs/sparc64/default
+
+-------------------------------------------------------------------
@@ -318,0 +386,5 @@
+Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
+
+- rpm/kernel-source.spec.in: use macros in a few more places
+
+-------------------------------------------------------------------
@@ -326,0 +399,5 @@
+
+-------------------------------------------------------------------
+Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
+
+- use standard short options in tar commands
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-vmi.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
New:
----
config.addon.tar.bz2
configtool.pl
group-source-files.pl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -130,28 +130,52 @@
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -171,11 +195,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -232,7 +259,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -261,7 +288,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -348,7 +381,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -443,6 +476,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -514,7 +553,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -583,8 +622,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -787,8 +826,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -146,28 +146,52 @@
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -177,7 +201,7 @@
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64
+ExclusiveArch: %ix86 ia64 ppc ppc64 s390x sparc64 x86_64
# These files are found in the kernel-source package:
NoSource: 0
@@ -187,11 +211,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -247,7 +274,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -276,7 +303,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -363,7 +396,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -458,6 +491,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -529,7 +568,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -598,8 +637,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -800,8 +839,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -126,28 +126,52 @@
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -167,11 +191,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -240,7 +267,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -269,7 +296,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -356,7 +389,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -451,6 +484,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -522,7 +561,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -591,8 +630,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -819,8 +858,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -17,6 +17,8 @@
# norootforbuild
+%define patchversion 2.6.34-rc3
+
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
@@ -27,7 +29,7 @@
Group: Documentation/Man
AutoReqProv: on
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -56,8 +58,8 @@
# use texmf.cnf from local source
export TEXMFCNF=$RPM_BUILD_DIR
export LANG=en_US
-make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i mandocs %{?jobs:-j%jobs}
-make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i pdfdocs %{?jobs:-j%jobs}
+make -C /usr/src/linux-%kernelrelease O=$PWD -k -i mandocs %{?jobs:-j%jobs}
+make -C /usr/src/linux-%kernelrelease O=$PWD -k -i pdfdocs %{?jobs:-j%jobs}
%install
rm -rf $RPM_BUILD_ROOT
@@ -81,7 +83,7 @@
ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz
-cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} .
+cp -a /usr/src/linux-%kernelrelease/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} .
%clean
rm -rf $RPM_BUILD_ROOT
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -126,28 +126,52 @@
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -167,11 +191,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -230,7 +257,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -259,7 +286,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -346,7 +379,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -441,6 +474,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -512,7 +551,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -581,8 +620,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -789,8 +828,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -130,28 +130,52 @@
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -171,11 +195,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -238,7 +265,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -267,7 +294,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -354,7 +387,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -449,6 +482,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -520,7 +559,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -589,8 +628,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -805,8 +844,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
kernel-ppc64.spec: same change
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -126,28 +126,52 @@
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -167,11 +191,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -230,7 +257,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -259,7 +286,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -346,7 +379,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -441,6 +474,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -512,7 +551,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -581,8 +620,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -789,8 +828,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -130,28 +130,52 @@
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -171,11 +195,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -231,7 +258,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -260,7 +287,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -347,7 +380,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -442,6 +475,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -513,7 +552,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -582,8 +621,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -784,8 +823,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -31,7 +31,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -40,7 +40,7 @@
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils sed
-BuildRequires: fdupes
+BuildRequires: fdupes pcre-tools
Requires(post): coreutils sed
Provides: multiversion(kernel)
Provides: linux
@@ -61,6 +61,7 @@
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
@@ -83,12 +84,14 @@
Source63: arch-symbols
Source64: package-descriptions
Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -100,8 +103,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Prefix: /usr/src
+# Source is only complete with devel files.
+Requires: kernel-devel = %version-%release
-%(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
@@ -113,12 +118,27 @@
%source_timestamp
+%package -n kernel-devel%variant
+Summary: Development files needed for building kernel modules
+License: GPLv2
+Group: Development/Sources
+AutoReqProv: off
+Provides: multiversion(kernel)
+Provides: kernel-devel%variant = %version-%source_rel
+
+%description -n kernel-devel%variant
+Kernel-level headers and Makefiles required for development of
+external kernel modules.
+
+
+%source_timestamp
%package vanilla
Summary: Vanilla Linux kernel sources with minor build fixes.
License: GPLv2
Group: Development/Sources
AutoReqProv: off
Provides: multiversion(kernel)
+Provides: %name-vanilla = %version-%source_rel
%description vanilla
Vanilla Linux kernel sources with minor build fixes.
@@ -134,7 +154,7 @@
echo "Symbol(s): %symbols"
# Unpack all sources and patches
-%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113
+%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
%build
# Release number without the EXTRAVERSION
@@ -149,18 +169,18 @@
ln -sf linux%variant linux%variant # dummy symlink
# Unpack the vanilla kernel sources
-tar xjf %_sourcedir/linux-%srcversion.tar.bz2
-mv linux-%srcversion linux-%kernelrelease%variant
+tar -xjf %_sourcedir/linux-%srcversion.tar.bz2
+mv linux-%srcversion "%buildroot/%src_install_dir"
%if %do_vanilla
-cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla
+cp -al "%buildroot/%src_install_dir" linux-%kernelrelease-vanilla
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
cd ..
%endif
-cd linux-%kernelrelease%variant
+cd "%buildroot/%src_install_dir"
%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
@@ -190,15 +210,27 @@
%_sourcedir/source-$script.sh > %name-$script.sh
done
+pushd "%buildroot"
+perl "%_sourcedir/group-source-files.pl" \
+ -D "$OLDPWD/devel.files" -N "$OLDPWD/nondevel.files" \
+ -L "%src_install_dir"
+popd
+
%post -f %name-post.sh
-%files
+%post -n kernel-devel%variant -f %name-post.sh
+
+%files -f nondevel.files
%defattr(-, root, root)
%ghost /usr/src/linux%variant
+/usr/src/linux%variant-%kernelrelease/README.SUSE
+
+%files -n kernel-devel%variant -f devel.files
+%defattr(-,root,root)
+%ghost /usr/src/linux%variant
/usr/share/doc/packages/%name
/etc/rpm/macros.kernel-source
/usr/lib/rpm/kernel-module-subpackage
-/%src_install_dir
%if %do_vanilla
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -24,17 +24,17 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
-%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
+%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
%endif
License: GPLv2
Group: Development/Sources
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils
-%ifarch %ix86 ia64 ppc ppc64 s390x x86_64
+%ifarch %ix86 ia64 ppc ppc64 s390x sparc64 x86_64
Requires: kernel-default-devel = %version-%source_rel
%endif
%ifarch %ix86 x86_64
@@ -54,9 +54,9 @@
%endif
Provides: multiversion(kernel)
Source: README.KSYMS
-Requires: kernel-source%variant = %version-%source_rel
+Requires: kernel-devel%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64
+ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x sparc64 x86_64
Prefix: /usr/src
%description
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -138,28 +138,52 @@
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -179,11 +203,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -239,7 +266,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -268,7 +295,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -355,7 +388,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -450,6 +483,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -521,7 +560,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -590,8 +629,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -792,8 +831,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
kernel-vanilla.spec: same change
++++++ kernel-vmi.spec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.34-rc2-git3
+%define patchversion 2.6.34-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -56,7 +56,7 @@
Name: kernel-vmi
Summary: VMI-enabled kernel
Version: 2.6.34
-Release: 1
+Release: 2
%if %using_buildservice
%else
%endif
@@ -126,28 +126,52 @@
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source2: source-post.sh
+Source3: kernel-source.rpmlintrc
+Source8: devel-pre.sh
+Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
+Source14: series.conf
+Source16: guards
+Source17: apply-patches
+Source21: config.conf
+Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
+Source37: README.SUSE
+Source38: README.KSYMS
Source40: source-timestamp
Source44: find-provides
+Source45: split-modules
Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
+Source47: extract-modaliases
+Source48: macros.kernel-source
+Source49: kernel-module-subpackage
+Source50: kabi.pl
+Source51: mkspec
+Source52: kernel-source%variant.changes
+Source53: kernel-source.spec.in
+Source54: kernel-binary.spec.in
+Source55: kernel-syms.spec.in
+Source56: kernel-docs.spec.in
+Source60: config.sh
+Source61: compute-PATCHVERSION.sh
+Source62: old-packages.conf
+Source63: arch-symbols
+Source64: package-descriptions
+Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -167,11 +191,14 @@
NoSource: 103
NoSource: 104
NoSource: 105
+NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
+NoSource: 112
+NoSource: 113
NoSource: 120
# The following KMPs have been integrated into the kernel package,
@@ -228,7 +255,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
@@ -257,7 +284,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -344,7 +377,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -439,6 +472,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -510,7 +549,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -579,8 +618,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -783,8 +822,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
kernel-xen.spec: same change
++++++ README.SUSE ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:50.000000000 +0200
@@ -302,9 +302,9 @@
$ cd /usr/src/packages/SOURCES
$ for f in patches.*.tar.bz2; do \
- tar xfj $f || break; \
+ tar -xjf "$f" || break; \
done
- $ tar xfj linux-2.6.5.tar.bz2
+ $ tar -xjf linux-2.6.5.tar.bz2
# Apply the patches
++++++ compute-PATCHVERSION.sh ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:51.000000000 +0200
@@ -49,7 +49,7 @@
warned=true
fi
tmp_files="$tmp_files $dir"
- tar xjf "$p/$dir.tar.bz2"
+ tar -xjf "$p/$dir.tar.bz2"
echo "$patch"
continue 2
fi
++++++ config.conf ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:51.000000000 +0200
@@ -60,3 +60,5 @@
+s390x s390x/default
+s390x -syms s390x/trace
+s390x s390x/vanilla
+
++sparc64 sparc64/default
++++++ config.tar.bz2 ++++++
++++ 4416 lines of diff (skipped)
++++++ configtool.pl ++++++
#!/usr/bin/perl
#
# Merge two kernel configs, eliminating duplicated assignments.
# TODO:
# support for #include-style directives in config files, to make the
# kernel configs more maintainable
use strict;
use warnings;
# ( { source => <file> name => ... value => ...}, { comment => ...}, ... )
my @lines;
# references into the @lines array
my %variables;
sub store_var {
my ($file, $line, $name, $value) = @_;
if (exists($variables{$name})) {
if ($variables{$name}->{source} eq $file) {
print STDERR "$file:$line: warning: $name redefined\n";
}
} else {
my $new = {};
push(@lines, $new);
$variables{$name} = $new;
}
$variables{$name}->{source} = $file;
$variables{$name}->{name} = $name;
$variables{$name}->{value} = $value;
}
sub store_comment {
my ($comment) = @_;
push(@lines, { comment => $comment });
}
while (<>) {
chomp;
if (/^CONFIG_(\w+)=(.*)/) {
store_var($ARGV, $., $1, $2);
} elsif (/^# CONFIG_(\w+) is not set/) {
store_var($ARGV, $., $1, 'n');
} elsif (/^$|^#/) {
store_comment($_);
} else {
print STDERR "$ARGV:$.: warning: ignoring unknown line\n";
}
}
for my $line (@lines) {
if (exists($line->{comment})) {
print "$line->{comment}\n";
} elsif ($line->{value} eq 'n') {
print "# CONFIG_$line->{name} is not set\n";
} else {
print "CONFIG_$line->{name}=$line->{value}\n";
}
}
++++++ group-source-files.pl ++++++
#!/usr/bin/perl
use Getopt::Long;
use strict;
&main();
sub main
{
my($dev_output, $ndev_output, $loc) = ("-", "-", ".");
&Getopt::Long::Configure(qw(bundling));
&GetOptions(
"D=s" => \$dev_output,
"N=s" => \$ndev_output,
"L=s" => \$loc,
);
my($dev, $ndev) = &scan($loc);
&output($dev, $ndev, $dev_output, $ndev_output);
}
sub scan
{
my $loc = shift @_;
my(@dev, @ndev);
foreach $_ (`find "$loc"`)
{
chomp $_;
if (!-f $_) {
# Generate directory list later.
next;
}
my $is_devel =
m{^\Q$loc\E.*/Kconfig} ||
m{^\Q$loc\E.*/Kbuild} ||
m{^\Q$loc\E.*/Makefile} ||
m{^\Q$loc\E/arch/[^/]+/include\b} ||
m{^\Q$loc\E/include/[^/]+\b} ||
m{^\Q$loc\E/scripts\b};
if (substr($_, 0, 1) ne "/") {
# We cannot use an absolute path during find,
# but rpm wants one later.
$_ = "/$_";
}
$is_devel ? push(@dev, $_) : push(@ndev, $_);
}
push(@dev, &calc_dirs("/$loc", \@dev));
push(@ndev, &calc_dirs("/$loc", \@ndev));
return (\@dev, \@ndev);
}
sub calc_dirs
{
my($base, $files) = @_;
my %dirs;
foreach my $file (@$files) {
my $path = $file;
do {
$path =~ s{/[^/]+$}{};
$dirs{$path} = 1;
} while ($path ne $base);
# This loop also makes sure that $base itself is included.
}
return map { "\%dir $_" } keys %dirs;
}
sub output
{
my($dev, $ndev, $dev_out, $ndev_out) = @_;
local *FH;
open(FH, "> $dev_out") || warn "Error writing to $dev_out: $!";
print FH join("\n", @$dev), "\n";
close FH;
open(FH, "> $ndev_out") || warn "Error writing to $ndev_out: $!";
print FH join("\n", @$ndev), "\n";
close FH;
}
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:51.000000000 +0200
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{@SCRIPTS@})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -43,7 +43,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
-%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
@@ -126,55 +126,12 @@
%endif
Provides: kernel = %version-%source_rel
@PROVIDES_OBSOLETES@
-
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
-Source10: preun.sh
-Source11: postun.sh
-Source12: pre.sh
-Source13: post.sh
-Source20: series.conf
-Source22: supported.conf
-Source30: arch-symbols
-Source31: guards
-Source33: check-for-config-changes
-Source34: check-supported-list
-Source40: source-timestamp
-Source44: find-provides
-Source46: modversions
-Source47: kabi.pl
-Source48: split-modules
-Source49: kernel-spec-macros
-Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
-Source108: patches.addon.tar.bz2
-Source109: patches.kernel.org.tar.bz2
-Source110: patches.apparmor.tar.bz2
-Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
-Source113: patches.kabi.tar.bz2
-Source120: kabi.tar.bz2
+@SOURCES@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: @ARCHS@
# These files are found in the kernel-source package:
-NoSource: 0
-NoSource: 100
-NoSource: 101
-NoSource: 102
-NoSource: 103
-NoSource: 104
-NoSource: 105
-NoSource: 107
-NoSource: 108
-NoSource: 109
-NoSource: 110
-NoSource: 111
-NoSource: 120
+@NOSOURCE@
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
@@ -229,7 +186,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+%setup -q -c -T -a 0 @UNPACK_PATCHES@
mkdir -p %kernel_build_dir
@@ -258,7 +215,13 @@
cat %_sourcedir/localversion > localversion
fi
-cp ../config/%cpu_arch_flavor .config
+if test -e ../config.addon/%cpu_arch_flavor; then
+ # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
+ # the top of the specfile
+ %_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
+else
+ cp ../config/%cpu_arch_flavor .config
+fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
@@ -346,7 +309,7 @@
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
-# kernel-source package is installed. Don't check for stale symlinks
+# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
@@ -441,6 +404,12 @@
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
+%ifarch sparc64
+ add_vmlinux --compressed
+ image=zImage
+ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+ image=vmlinux
+%endif
# end of build_kdump
%endif
@@ -513,7 +482,7 @@
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
- # so that kernel-source + kernel-%build_flavor is sufficient for building
+ # so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
@@ -582,8 +551,8 @@
fi
fi
- tar cf - -T %my_builddir/obj-files | \
- tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+ tar -cf - -T %my_builddir/obj-files | \
+ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@@ -771,8 +740,8 @@
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
-Requires: kernel-source%variant = %version-%source_rel
-Supplements: packageand(%name:kernel-source)
+Requires: kernel-devel%variant = %version-%source_rel
+Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
++++++ kernel-docs.spec.in ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:51.000000000 +0200
@@ -17,6 +17,8 @@
# norootforbuild
+%define patchversion @PATCHVERSION@
+
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
@@ -57,8 +59,8 @@
# use texmf.cnf from local source
export TEXMFCNF=$RPM_BUILD_DIR
export LANG=en_US
-make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i mandocs %{?jobs:-j%jobs}
-make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i pdfdocs %{?jobs:-j%jobs}
+make -C /usr/src/linux-%kernelrelease O=$PWD -k -i mandocs %{?jobs:-j%jobs}
+make -C /usr/src/linux-%kernelrelease O=$PWD -k -i pdfdocs %{?jobs:-j%jobs}
%install
rm -rf $RPM_BUILD_ROOT
@@ -82,7 +84,7 @@
ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz
-cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} .
+cp -a /usr/src/linux-%kernelrelease/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} .
%clean
rm -rf $RPM_BUILD_ROOT
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:51.000000000 +0200
@@ -41,7 +41,7 @@
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils sed
-BuildRequires: fdupes
+BuildRequires: fdupes pcre-tools
Requires(post): coreutils sed
Provides: multiversion(kernel)
Provides: linux
@@ -62,6 +62,7 @@
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
+Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
@@ -84,12 +85,14 @@
Source63: arch-symbols
Source64: package-descriptions
Source65: kernel-spec-macros
+Source66: configtool.pl
Source100: config.tar.bz2
-Source101: patches.arch.tar.bz2
-Source102: patches.drivers.tar.bz2
-Source103: patches.fixes.tar.bz2
-Source104: patches.rpmify.tar.bz2
-Source105: patches.suse.tar.bz2
+Source101: config.addon.tar.bz2
+Source102: patches.arch.tar.bz2
+Source103: patches.drivers.tar.bz2
+Source104: patches.fixes.tar.bz2
+Source105: patches.rpmify.tar.bz2
+Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
@@ -101,8 +104,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Prefix: /usr/src
+# Source is only complete with devel files.
+Requires: kernel-devel = %version-%release
-%(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+%(chmod +x %_sourcedir/{@SCRIPTS@})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
@@ -114,12 +119,27 @@
%source_timestamp
+%package -n kernel-devel%variant
+Summary: Development files needed for building kernel modules
+License: GPL v2 only
+Group: Development/Sources
+AutoReqProv: off
+Provides: multiversion(kernel)
+Provides: kernel-devel%variant = %version-%source_rel
+
+%description -n kernel-devel%variant
+Kernel-level headers and Makefiles required for development of
+external kernel modules.
+
+%source_timestamp
+
%package vanilla
Summary: Vanilla Linux kernel sources with minor build fixes.
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
Provides: multiversion(kernel)
+Provides: %name-vanilla = %version-%source_rel
%description vanilla
Vanilla Linux kernel sources with minor build fixes.
@@ -135,7 +155,7 @@
echo "Symbol(s): %symbols"
# Unpack all sources and patches
-%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113
+%setup -q -c -T @UNPACK_PATCHES@
%build
# Release number without the EXTRAVERSION
@@ -150,19 +170,19 @@
ln -sf linux%variant linux%variant # dummy symlink
# Unpack the vanilla kernel sources
-tar xjf %_sourcedir/linux-%srcversion.tar.bz2
-mv linux-%srcversion linux-%kernelrelease%variant
+tar -xjf %_sourcedir/linux-%srcversion.tar.bz2
+mv linux-%srcversion "%buildroot/%src_install_dir"
%if %do_vanilla
-cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla
+cp -al "%buildroot/%src_install_dir" linux-%kernelrelease-vanilla
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
cd ..
%endif
-cd linux-%kernelrelease%variant
+cd "%buildroot/%src_install_dir"
%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
@@ -192,15 +212,27 @@
%_sourcedir/source-$script.sh > %name-$script.sh
done
+pushd "%buildroot"
+perl "%_sourcedir/group-source-files.pl" \
+ -D "$OLDPWD/devel.files" -N "$OLDPWD/nondevel.files" \
+ -L "%src_install_dir"
+popd
%post -f %name-post.sh
-%files
+
+%post -n kernel-devel%variant -f %name-post.sh
+
+%files -f nondevel.files
%defattr(-, root, root)
%ghost /usr/src/linux%variant
+/usr/src/linux%variant-%kernelrelease/README.SUSE
+
+%files -n kernel-devel%variant -f devel.files
+%defattr(-,root,root)
+%ghost /usr/src/linux%variant
/usr/share/doc/packages/%name
/etc/rpm/macros.kernel-source
/usr/lib/rpm/kernel-module-subpackage
-/%src_install_dir
%if %do_vanilla
%files vanilla
++++++ kernel-syms.spec.in ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:52.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:52.000000000 +0200
@@ -27,7 +27,7 @@
%if %using_buildservice
Release: @RELEASE_PREFIX@<RELEASE>
%else
-%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
+%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
Release: %kernel_source_release
%endif
License: GPL v2 only
@@ -38,7 +38,7 @@
@REQUIRES@
Provides: multiversion(kernel)
Source: README.KSYMS
-Requires: kernel-source%variant = %version-%source_rel
+Requires: kernel-devel%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: @ARCHS@
Prefix: /usr/src
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:52.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:52.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:52.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:52.000000000 +0200
@@ -51,12 +51,28 @@
$rpmrelease =~ s/[^.]$/$&./;
$rpmrelease =~ s/-/./g;
+my $sources = join("", $templates{source} =~ /\nSource\d+:[^\n]*/mg);
+# Find all SourceN: foo.tar.bz2 lines and generate the NoSource:
+# lines and the %setup line
+my @tarballs = ($sources =~ /\nSource(\d+):[^\n]*\.tar\.bz2/mg);
+my $nosource = join("\n", map { "NoSource: $_" } @tarballs);
+# Source0 (the linux tarball) is unpacked manually
+@tarballs = grep { $_ > 0 } @tarballs;
+my $unpack_patches = join(" ", map { "-a $_" } @tarballs);
+# List of scripts to automatically chmod +x before build
+my $scripts = join(",", grep { is_script($_) }
+ ($sources =~ /\nSource\d+:\s*([^\s]*)/mg));
+
my %macros = (
VARIANT => $variant,
SRCVERSION => $srcversion,
PATCHVERSION => $patchversion,
RPMVERSION => $rpmversion,
RELEASE_PREFIX => $rpmrelease,
+ SOURCES => $sources,
+ NOSOURCE => $nosource,
+ UNPACK_PATCHES => $unpack_patches,
+ SCRIPTS => $scripts,
);
# binary spec files
@@ -133,8 +149,8 @@
for my $template qw(binary source syms docs) {
xopen(my $fh, '<', "$dir/kernel-$template.spec.in");
- my @lines = <$fh>;
- $res{$template} = join("", @lines);
+ local $/ = undef;
+ $res{$template} = <$fh>;
close($fh);
}
return %res;
@@ -223,6 +239,19 @@
return %res;
}
+sub is_script {
+ my $script = shift;
+
+ return undef if $script =~ /\.(tar\.(gz|bz2)|in|conf)$/;
+ return undef if $script =~ /^README/;
+ return 1 if $script =~ /\.pl$/;
+ open(my $fh, '<', $script) or return undef;
+ sysread($fh, my $shebang, 2);
+ close($fh);
+ return 1 if $shebang eq "#!";
+ return undef;
+}
+
sub arch2rpm {
if (wantarray) {
return map { _arch2rpm($_) } @_;
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.r84wkO/_old 2010-04-08 15:13:52.000000000 +0200
+++ /var/tmp/diff_new_pack.r84wkO/_new 2010-04-08 15:13:52.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hid-fix-gyration-oops.patch new/patches.fixes/hid-fix-gyration-oops.patch
--- old/patches.fixes/hid-fix-gyration-oops.patch 2010-03-29 21:26:59.000000000 +0200
+++ new/patches.fixes/hid-fix-gyration-oops.patch 2010-04-07 11:00:19.000000000 +0200
@@ -1,7 +1,7 @@
From: Jiri Kosina