pool/kernel-source
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 37364 from Kernel:HEAD

Browse Source 
Copy from Kernel:HEAD/kernel-source based on submit request 37364 from user michal-m

OBS-URL: https://build.opensuse.org/request/show/37364
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=90
This commit is contained in:
OBS User autobuild 2010-04-08 13:15:36 +00:00 committed by Git OBS Bridge
parent 8d95538bac
commit 6932762388
46 changed files with 2239 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.SUSE
View File

@ -302,9 +302,9 @@ can be generated from vanilla sources + patches like this:
$ 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

2
compute-PATCHVERSION.sh
View File

@ -49,7 +49,7 @@ while read patch; do
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

3
config.addon.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1ddc0ec138354be50695298a844500f84b883a419c711785aba32e2c8e657f0
size 129

2
config.conf
View File

@ -60,3 +60,5 @@
+s390x s390x/default
+s390x -syms s390x/trace
+s390x s390x/vanilla
+sparc64 sparc64/default

4
config.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:661790ee04f158c36eb04a65d5ce605bff952c4e0aa054d105b3446b9a060083
size 203569
oid sha256:e7d2354ae2dc1861d6db007c3b2af5668bf564a0b337476263ea945eeb4320b4
size 208202

60
configtool.pl Normal file
View File

@ -0,0 +1,60 @@
#!/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";
}
}

82
group-source-files.pl Normal file
View File

@ -0,0 +1,82 @@
#!/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;
}

79
kernel-binary.spec.in
View File

@ -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 @@ Conflicts: libc.so.6()(64bit)
%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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPL v2 only
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

77
kernel-debug.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-debug.spec
View File

@ -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 @@ Obsoletes: kernel-kdump
%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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-default.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

89
kernel-default.spec
View File

@ -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 @@ Obsoletes: smp kernel-smp
%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 @@ Source112: patches.trace.tar.bz2
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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-desktop.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-desktop.spec
View File

@ -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 @@ Conflicts: libc.so.6()(64bit)
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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-docs.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

10
kernel-docs.spec
View File

@ -17,6 +17,8 @@
# norootforbuild
%define patchversion 2.6.34-rc3
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
@ -27,7 +29,7 @@ License: GPLv2+
Group: Documentation/Man
AutoReqProv: on
Version: 2.6.34
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -56,8 +58,8 @@ EOF
# 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 @@ fi
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

8
kernel-docs.spec.in
View File

@ -17,6 +17,8 @@
# norootforbuild
%define patchversion @PATCHVERSION@
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
@ -57,8 +59,8 @@ EOF
# 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 @@ fi
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

77
kernel-ec2.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-ec2.spec
View File

@ -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 @@ Conflicts: libc.so.6()(64bit)
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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-pae.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-pae.spec
View File

@ -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 @@ Obsoletes: kernel-bigsmp
%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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-ppc64.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-ppc64.spec
View File

@ -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-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.34
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -134,28 +134,52 @@ Obsoletes: kernel-kdump
%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
@ -175,11 +199,14 @@ NoSource: 102
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,
@ -242,7 +269,7 @@ if test -e %_sourcedir/extra-symbols; then
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
@ -271,7 +298,13 @@ if [ -f %_sourcedir/localversion ] ; then
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 \
@ -358,7 +391,7 @@ export NO_BRP_STRIP_DEBUG=true
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
@ -453,6 +486,12 @@ add_vmlinux()
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
@ -524,7 +563,7 @@ if [ %CONFIG_MODULES = y ]; then
%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
@ -593,8 +632,8 @@ if [ %CONFIG_MODULES = y ]; then
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
@ -809,8 +848,8 @@ License: GPLv2
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

77
kernel-ps3.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-ps3.spec
View File

@ -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 @@ Conflicts: libc.so.6()(64bit)
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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-s390.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-s390.spec
View File

@ -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 @@ Obsoletes: kernel-32bit
%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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-source.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

64
kernel-source.spec
View File

@ -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 @@ Group: Development/Sources
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 @@ 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
@ -83,12 +84,14 @@ 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
@ -100,8 +103,10 @@ Source120: kabi.tar.bz2
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)
@ -112,6 +117,20 @@ Prefix: /usr/src
Linux kernel sources with many fixes and improvements.
%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.
@ -119,6 +138,7 @@ 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 @@ fi
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 @@ cd $RPM_BUILD_ROOT/usr/src
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 @@ for script in post; do
%_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

60
kernel-source.spec.in
View File

@ -41,7 +41,7 @@ Group: Development/Sources
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 @@ 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
@ -84,12 +85,14 @@ 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
@ -101,8 +104,10 @@ Source120: kabi.tar.bz2
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 @@ Linux kernel sources with many fixes and improvements.
%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 @@ fi
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 @@ cd $RPM_BUILD_ROOT/usr/src
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 @@ for script in post; do
%_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

77
kernel-syms.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

10
kernel-syms.spec
View File

@ -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 @@ Requires: kernel-xen-devel = %version-%source_rel
%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

4
kernel-syms.spec.in
View File

@ -27,7 +27,7 @@ Version: @RPMVERSION@
%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 @@ BuildRequires: coreutils
@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

77
kernel-trace.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-trace.spec
View File

@ -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 @@ Obsoletes: kernel-64bit
%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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-vanilla.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-vanilla.spec
View File

@ -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-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.34
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -134,28 +134,52 @@ Obsoletes: kernel-64bit
%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
@ -175,11 +199,14 @@ NoSource: 102
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,
@ -235,7 +262,7 @@ if test -e %_sourcedir/extra-symbols; then
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
@ -264,7 +291,13 @@ if [ -f %_sourcedir/localversion ] ; then
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 \
@ -351,7 +384,7 @@ export NO_BRP_STRIP_DEBUG=true
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
@ -446,6 +479,12 @@ add_vmlinux()
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
@ -517,7 +556,7 @@ if [ %CONFIG_MODULES = y ]; then
%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
@ -586,8 +625,8 @@ if [ %CONFIG_MODULES = y ]; then
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
@ -788,8 +827,8 @@ License: GPLv2
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

77
kernel-vmi.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-vmi.spec
View File

@ -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 @@ Conflicts: libc.so.6()(64bit)
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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

77
kernel-xen.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Mon Mar 29 21:26:55 CEST 2010 - jeffm@suse.de
@ -223,6 +278,18 @@ Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de
- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
xfs: Non-blocking inode locking in IO completion (bnc#568319).
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Mar 3 19:38:43 CET 2010 - tonyj@suse.de
@ -315,6 +382,11 @@ Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
(bnc#569014, bnc#571041, bnc#571769, bnc#572146).
-------------------------------------------------------------------
Wed Feb 24 10:54:56 UTC 2010 - jengelh@medozas.de
- rpm/kernel-source.spec.in: use macros in a few more places
-------------------------------------------------------------------
Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
@ -325,6 +397,11 @@ Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
OO documents on NSS Volumes (bnc#508259).
-------------------------------------------------------------------
Sat Feb 20 22:31:31 UTC 2010 - jengelh@medozas.de
- use standard short options in tar commands
-------------------------------------------------------------------
Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de

87
kernel-xen.spec
View File

@ -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-xen
Summary: The Xen Kernel
Version: 2.6.34
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -126,28 +126,52 @@ Conflicts: libc.so.6()(64bit)
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: 102
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 @@ if test -e %_sourcedir/extra-symbols; then
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 @@ if [ -f %_sourcedir/localversion ] ; then
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 NO_BRP_STRIP_DEBUG=true
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 @@ add_vmlinux()
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 @@ if [ %CONFIG_MODULES = y ]; then
%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 @@ if [ %CONFIG_MODULES = y ]; then
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 @@ License: GPLv2
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

33
mkspec
View File

@ -51,12 +51,28 @@ if (defined($rpmrelease)) {
$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 @@ sub read_spec_templates {
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 @@ sub parse_descriptions {
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($_) } @_;

4
patches.fixes.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5bc9a3c36e4275d1fcf1cc5d3f359c33ef2c0f7d2ba2525b2f47d969b2f490ef
size 38583
oid sha256:608ab927ae3acb8cfa6b77d590473232d4e30d89f8aa7a6ca4c9e956c62800d3
size 39239

4
patches.kernel.org.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8bccddf7345244902d8f51db5a9d5b5b2b82dc8e9f1327cb84c03e008aba08a3
size 7581246
oid sha256:e3936009bde18adc06ca4fad944f749293e1c5aa52790362383e91369674630f
size 7601846

3
series.conf
View File

@ -29,7 +29,7 @@
########################################################
patches.kernel.org/patch-2.6.34-rc1
patches.kernel.org/patch-2.6.34-rc1-rc2
patches.kernel.org/patch-2.6.34-rc2-git3
patches.kernel.org/patch-2.6.34-rc2-rc3
########################################################
# Build fixes that apply to the vanilla kernel too.
@ -346,6 +346,7 @@
########################################################
patches.suse/reiserfs-barrier-default
patches.fixes/reiserfs-fix-locking-BUG-during-mount-failure
patches.fixes/reiserfs-remove-2-tb-file-size-limit
########################################################
# dlm

4
source-timestamp
View File

@ -1,3 +1,3 @@
2010-03-29 21:26:59 +0200
GIT Revision: 80160e7a98e3a2d74f68c34786e6a862e8d7786f
2010-04-07 11:00:19 +0200
GIT Revision: e1f591375fa7fbc4f2264857d7b5e4eec93a057d
GIT Branch: master