Accepting request 41897 from Kernel:openSUSE-11.3

Copy from Kernel:openSUSE-11.3/kernel-source based on submit request 41897 from user michal-m

OBS-URL: https://build.opensuse.org/request/show/41897
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=98
This commit is contained in:
OBS User autobuild 2010-06-22 15:48:26 +00:00 committed by Git OBS Bridge
parent 4465f5b7fd
commit a201d7d72d
45 changed files with 2618 additions and 101 deletions

56
built-in-where Normal file
View File

@ -0,0 +1,56 @@
#! /bin/bash
sourcedir=${0%/*}
# A lot of symbols are exported by the main kernel image. Find out
# more precisely which built-in.o file defines them, and fill in
# that information in Module.symvers. (The built-in.o files are
# linked together from one or more object files in a directory.)
# We use this information to better group symbols by subsystems.
#
# Usage: built-in-where < Module.symvers
unset LANG ${!LC_*}
# Create a table of all symbol export in a built-in.o file, e.g.,
# 0xc87c1f84 ktime_get kernel/built-in EXPORT_SYMBOL_GPL
built_in_exports() {
# a/b/c/built-in.o gets linked into a/b/built-in.o, so ensure
# that we visit sub-directories first to split up symbols as
# much as possible.
for obj in $(find -name built-in.o -printf '%d %P\n' \
| sort -r \
| awk '{ print $2 }'); do
$sourcedir/symsets.pl --list-exported-symbols $obj
done
# We could go through the libraries as well, but those functions
# are so unlikely to change that this wouldn't help.
# (All remaining symbols will end up in the vmlinux set.)
#for archive in $(find -name '*.a'); do
# $sourcedir/symsets.pl --list-exported-symbols $archive
#done
}
# Filter out duplicates from a Module.symvers dump
unique_symbols() {
awk '
{ if ($2 in seen)
next
seen[$2] = 1
print
}
'
}
# Join together the two tables, including all lines from the first
# file that don't have a match in the second.
# Finally, remove the duplicate columns.
join -t $'\t' -j 2 -a 1 \
<(sort -k2) \
<(built_in_exports | unique_symbols | sort -k2) \
| awk '
BEGIN { FS = "\t" ; OFS = "\t" }
NF == 7 { print $2, $1, $6, $4 }
NF == 4 { print $2, $1, $3, $4 }
'

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42d749d2816ef4aca8e08eec9c33484dd9d41d6fa0c758e95a543ad77987e159
size 210700
oid sha256:68269fc77b9edc4b00bb239d08b91955aff57a0deab877b7830f0c04922481a4
size 210879

View File

@ -1,18 +1,44 @@
#! /bin/bash
trap 'rm -f "$filelist"' EXIT
filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX)
grep -v '/kernel/drivers/staging/.*\.ko$' >"$filelist"
shopt -s nullglob
builddir="$1"
shift
# pretend that /boot/vmlinux-* is in the -base package and not in -devel
if grep -q '/boot/System\.map\>' "$filelist"; then
prefix=$(sed -rn 's:(.*)/boot/System\.map\>.*:\1:p; T; q' "$filelist")
for f in "$prefix"/boot/vmlinux*; do
echo "$f" >>"$filelist"
done
filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX)
trap "rm -f $filelist" EXIT
cat >"$filelist"
flavor=${1##*-}
grep -v '\.ko$' | /usr/lib/rpm/find-provides "$@" | grep -v '^ksym('
# HACK: find out what subpackage is this and just print the symsets
# computed in %build. We need to do it this way because the provided
# symsets are computed from the modules AND the reference symsets, which
# we don't see here.
subpack=
samemodules()
{
cmp -s <(sed -rn 's:.*/([^/]*\.ko)$:\1:p' "$1" | sort) \
<(sed -rn 's:.*/([^/]*\.ko)$:\1:p' "$2" | sort)
}
if ! grep -q '\.ko$' "$filelist"; then
# no modules, no symsets
exit 0
fi
if samemodules "$builddir"/base-modules "$filelist"; then
subpack=base
elif samemodules "$builddir"/main-modules "$filelist"; then
subpack=main
elif samemodules "$builddir"/unsupported-modules "$filelist"; then
subpack=extra
else
perl -ni -e 'next if /\/boot\/vmlinux/ && !/\.debug$/; print' "$filelist"
echo "find-provides: failed to determine which subpackage is this" >&2
exit 1
fi
/usr/lib/rpm/find-provides "$@" <"$filelist"
find "$builddir/$subpack-symsets" -type f -printf '%f\n' | \
sed -rn 's/^\.?(.+)\.([a-z0-9]{16})(\.fake)?$/kernel('$flavor':\1) = \2/p'
exit 0

View File

@ -85,7 +85,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -163,7 +167,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -455,6 +459,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -540,7 +547,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -554,6 +561,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-@FLAVOR@.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-@FLAVOR@.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-@FLAVOR@/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -565,6 +606,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -587,7 +635,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -150,6 +154,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -235,7 +241,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -526,6 +532,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -611,7 +620,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -625,6 +634,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-debug.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-debug.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-debug/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -636,6 +679,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -658,7 +708,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -166,6 +170,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -251,7 +257,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -541,6 +547,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -626,7 +635,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -640,6 +649,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-default.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-default.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-default/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -651,6 +694,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -673,7 +723,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -146,6 +150,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -231,7 +237,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -534,6 +540,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -619,7 +628,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -633,6 +642,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-desktop.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-desktop.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-desktop/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -644,6 +687,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -666,7 +716,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

View File

@ -30,7 +30,7 @@ License: GPLv2+
Group: Documentation/Man
AutoReqProv: on
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -146,6 +150,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -231,7 +237,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -524,6 +530,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -609,7 +618,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -623,6 +632,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-ec2.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-ec2.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-ec2/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -634,6 +677,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -656,7 +706,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-net
Summary: Minimal kernel with disk and net support
Version: 2.6.34
Release: 7
Release: 8
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -146,6 +150,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -231,7 +237,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -523,6 +529,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -608,7 +617,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -622,6 +631,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-net.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-net.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-net/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -633,6 +676,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -655,7 +705,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -150,6 +154,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -235,7 +241,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -532,6 +538,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -617,7 +626,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -631,6 +640,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-pae.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-pae.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-pae/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -642,6 +685,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -664,7 +714,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -154,6 +158,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -239,7 +245,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -536,6 +542,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -621,7 +630,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -635,6 +644,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-ppc64.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-ppc64.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-ppc64/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -646,6 +689,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -668,7 +718,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -146,6 +150,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -231,7 +237,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -524,6 +530,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -609,7 +618,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -623,6 +632,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-ps3.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-ps3.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-ps3/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -634,6 +677,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -656,7 +706,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -150,6 +154,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -235,7 +241,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -525,6 +531,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -610,7 +619,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -624,6 +633,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-s390.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-s390.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-s390/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -635,6 +678,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -657,7 +707,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

View File

@ -31,7 +31,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -65,6 +65,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -106,7 +108,7 @@ Prefix: /usr/src
# Source is only complete with devel files.
Requires: kernel-devel = %version-%release
%(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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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)

View File

@ -66,6 +66,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

View File

@ -24,7 +24,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -158,6 +162,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -243,7 +249,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -533,6 +539,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -618,7 +627,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -632,6 +641,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-trace.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-trace.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-trace/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -643,6 +686,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -665,7 +715,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -154,6 +158,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -239,7 +245,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -529,6 +535,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -614,7 +623,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -628,6 +637,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-vanilla.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-vanilla.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-vanilla/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -639,6 +682,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -661,7 +711,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-vmi
Summary: VMI-enabled kernel
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -146,6 +150,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -231,7 +237,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -522,6 +528,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -607,7 +616,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -621,6 +630,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-vmi.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-vmi.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-vmi/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -632,6 +675,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -654,7 +704,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Jun 21 14:53:16 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Require a mkinitrd that supports
KMS (bnc#615680).
-------------------------------------------------------------------
Mon Jun 21 01:27:59 CEST 2010 - jeffm@suse.de
- patches.suse/add-initramfs-file_read_write: Fix missing kmap calls
while loading initramfs files.
-------------------------------------------------------------------
Fri Jun 18 15:54:41 CEST 2010 - jbeulich@novell.com
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch:
driver core: add devname module aliases to allow module
on-demand auto-loading.
- Refresh other Xen patches.
- Update Xen config files.
-------------------------------------------------------------------
Thu Jun 17 11:54:01 CEST 2010 - teheo@suse.de
- patches.drivers/libata-ata_generic-mcp89-mbp71:
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
(bko#15923).
-------------------------------------------------------------------
Mon Jun 14 13:47:57 CEST 2010 - jslaby@suse.de
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch: PCI:
hotplug/cpqphp, fix NULL dereference (bnc#609338).
-------------------------------------------------------------------
Thu Jun 3 20:28:12 CEST 2010 - jeffm@suse.de
- Re-enable DSDT in initramfs code.
- patches.suse/acpi-don-t-preempt-until-the-system-is-up: acpi:
don't preempt until the system is up.
-------------------------------------------------------------------
Wed Jun 2 18:28:30 CEST 2010 - bphilips@suse.de
@ -121,6 +162,11 @@ Mon May 17 16:19:09 CEST 2010 - jeffm@suse.com
- Update to 2.6.34-final.
-------------------------------------------------------------------
Wed May 12 15:15:24 CEST 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix preserving of old symsets.
-------------------------------------------------------------------
Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
@ -662,6 +708,16 @@ Wed Mar 10 18:48:00 CET 2010 - jdelvare@suse.de
- supported.conf: Add hwmon/ams back.
-------------------------------------------------------------------
Wed Mar 10 14:52:16 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix symsets for non-split kernels.
-------------------------------------------------------------------
Wed Mar 10 13:09:33 CET 2010 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Add symsets.pl to the src.rpm.
-------------------------------------------------------------------
Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
@ -671,6 +727,22 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de
- Added new doc/config-options.changes to document configuration
changes.
-------------------------------------------------------------------
Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package symsets in the -devel package.
-------------------------------------------------------------------
Tue Mar 9 13:38:42 CET 2010 - mmarek@suse.cz
- rpm/find-provides: Do not generate ksym(...) provides.
-------------------------------------------------------------------
Tue Mar 9 11:11:55 CET 2010 - mmarek@suse.cz
- rpm/find-provides, rpm/symsets.pl: Generate symsets again
(bnc#582907).
-------------------------------------------------------------------
Fri Mar 5 10:48:50 CET 2010 - knikanth@suse.de

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/{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})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.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
@ -56,7 +56,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.34
Release: 9
Release: 10
%if %using_buildservice
%else
%endif
@ -84,7 +84,11 @@ Requires(post): module-init-tools >= 3.4
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
%if 0%{?suse_version} >= 1130
Requires(post): mkinitrd >= 2.6.0
%else
Requires(post): mkinitrd
%endif
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
@ -146,6 +150,8 @@ Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
Source44: find-provides
Source45: split-modules
Source46: modversions
@ -231,7 +237,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
%define __find_provides %_sourcedir/find-provides %my_builddir %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@ -524,6 +530,9 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Figure out where the symbols that vmlinux exports are defined.
%_sourcedir/built-in-where < Module.symvers > Module.symvers.split
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
@ -609,7 +618,7 @@ if [ %CONFIG_MODULES = y ]; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
Module.symvers.split || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
@ -623,6 +632,40 @@ if [ %CONFIG_MODULES = y ]; then
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/%cpu_arch/symsets-xen.tar.gz; then
tar xzf %my_builddir/kabi/%cpu_arch/symsets-xen.tar.gz -C \
%my_builddir/kabi/%cpu_arch
reference="--reference %my_builddir/kabi/%cpu_arch/symsets-*-xen/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers.split \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_base
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%endif
%if %split_extra
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
@ -634,6 +677,13 @@ if [ %CONFIG_MODULES = y ]; then
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
symsets=%my_builddir/symsets-%kernelrelease-%build_flavor
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-%kernelrelease-%build_flavor.tar.gz
fi
add_dirs_to_filelist() {
@ -656,7 +706,7 @@ add_dirs_to_filelist() {
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/sym{sets,types}* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files

View File

@ -18,6 +18,7 @@
esac \
krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \
kver=${krel%%-*} \
[ -e /boot/symsets-$kver-$flavor.tar.gz ] || continue \
flavors_to_build="$flavors_to_build $flavor" \
echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name}-kmp -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-p} $flavor $kver" \
done \

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a201e58c54a381b47e6e2ecd6fefc223bc741378c8de66617e2540ec9b6d223
size 130436
oid sha256:63e115d5b8899d40881a8a49e0eb8faa4e2b4b4563e2e55ac3629f2970d02946
size 131372

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f06f83831e2bcbd291fddf1d0f99da9fd6d31849f68fb558ac2711b59cadc6f4
size 42346
oid sha256:5ae1a3ff25ab9c1fce327920b8a256d37597940e9ea5305eabdada22100a1555
size 43076

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9993b3040ee365d236df0ef07e1487ce356bb19a23f070cac7559bd8aad0f09c
size 851554
oid sha256:8bb472aaf40dd6663774b280238954c57f80edceb9257fa45db86ba01e26939d
size 851646

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8145fb5846da3d62d24a3b70ab553e4c3a4544b674e29c6a1bc13a915ed8163b
size 1948828
oid sha256:8b3912e5f77878d7db3f6dc084dd2fda381686dd1b06a1fbb354874420f5c992
size 1951741

View File

@ -256,9 +256,10 @@
patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch
+trenn patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
+jeffm patches.suse/add-initramfs-file_read_write
+jeffm patches.suse/init-move-populate_rootfs-back-to-start_kernel
+jeffm patches.suse/acpi-generic-initramfs-table-override-support
patches.suse/add-initramfs-file_read_write
patches.suse/init-move-populate_rootfs-back-to-start_kernel
patches.suse/acpi-generic-initramfs-table-override-support
patches.suse/acpi-don-t-preempt-until-the-system-is-up
patches.arch/acpi_thermal_passive_blacklist.patch
patches.arch/acpi-export-hotplug_execute
@ -472,6 +473,7 @@
# libata
patches.drivers/libata-add-waits-for-govault
patches.drivers/libata-unlock-hpa-by-default
patches.drivers/libata-ata_generic-mcp89-mbp71
# Block layer fixes
patches.fixes/scsi-inquiry-too-short-ratelimit
@ -541,6 +543,7 @@
# PCI and PCI hotplug
########################################################
patches.drivers/pci-disable-msi-on-K8M800
patches.fixes/pci-hotplug-cpqphp-fix-crash.patch
########################################################
# sysfs / driver core
@ -836,6 +839,7 @@
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch
patches.xen/xen3-acpi_processor_check_maxcpus.patch
patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
patches.xen/xen3-kdb-x86
patches.xen/xen3-stack-unwind
patches.xen/xen3-x86_64-unwind-annotations
@ -859,7 +863,6 @@
patches.xen/xen-ipi-per-cpu-irq
patches.xen/xen-virq-per-cpu-irq
patches.xen/xen-clockevents
patches.xen/xen-no-reboot-vector
patches.xen/xen-spinlock-poll-early
patches.xen/xen-configurable-guest-devices
patches.xen/xen-netback-nr-irqs

View File

@ -1,3 +1,3 @@
2010-06-03 18:33:51 +0200
GIT Revision: 5d1bde19645c8ade295b7e2c67b7af0e19e452c8
GIT Branch: master
2010-06-21 21:12:08 +0200
GIT Revision: 96535165dc4662f8c01ab98adfb37ab157f08ecb
GIT Branch: openSUSE-11.3

577
symsets.pl Normal file
View File

@ -0,0 +1,577 @@
#!/usr/bin/env perl
=head1 NAME
symsets.pl - tool to generate symsets for the kernel packages
=head1 SYNOPSIS
symsets.pl --list-exported-symbols modules...
symsets.pl --generate-symsets [--reference=DIR] --output-dir=DIR modules...
symsets.pl --list-symsets [--reference=DIR] modules...
symsets.pl --check-kabi --reference=DIR modules...
=head1 OPTIONS
=head3 MODE OPTIONS
One of the following options has to be selected:
=over
=item B<--list-exported-symbols>
List symbols exported by modules in a Module.symvers style format.
=item B<--generate-symsets>
Group exported symbols into symsets. Symbols from modules from the same
directory end up in one symset. This option requires B<--output-dir>.
=item B<--list-symsets>
Like B<--generate-symsets>, but only print the symset names on stdout.
=item B<--check-kabi>
Check for kabi changes. This requires B<--reference>.
=back
=head3 OTHER OPTIONS
=over
=item B<-v, --verbose>
Increase verbosity.
=item B<--symvers-file=Module.symvers>
Load built-in symbols from Module.symvers. Only symbols provided by the main
kernel image (marked as vmlinux or built-in) are read from this file.
=item B<--modules=FILE>
Read list of modules from FILE instead of command line. This option can be used
multiple times to read modules from multiple files.
=item B<--required-modules=FILE>
List of modules that are installed by packages required by this package. If
a module moves from subpackage A to subpackage B, this can result in a changed
symset checksum in A. Together with B<--reference>, this option ensures that
the old checksum is provided in the subpackage that installs or requires
all modules from the symset.
=item B<--reference=DIR>
Load symsets of a previous kernel package from DIR and add them to the output
if the symbols are still provided by this kernel package.
=item B<--fake=FILE>
List of exports in Module.symvers format that do not exist, but are
considered unimportant to break a symset. Symsets that contain these fake
symbols are created as ".$name.$hash.fake", so that KMPs don't see them.
This option only makes sense with when B<--reference> is given.
=item B<--output-dir=DIR>
Write symsets into DIR (B<--generate-symsets> only).
=item B<--max-badness=NUM>
Set maximum allowed badness to NUM. Meaningful values are 4, 6, 8, 15 or 31
(B<--check-kabi> only).
=item B<--commonsyms=FILE>
Read common symbols from FILE. Badness for changes to common symbols is
incremented by 8 (the resulting badness is 16 by default). (B<--check-kabi>
only).
=item B<--usedsyms=FILE>
Read used symbols from FILE. Badness for changes to used symbols is incremented
by 16 (the resulting badness is 24 by default). (B<--check-kabi> only).
=item B<--severities=FILE>
Read a table of kabi change severities from FILE. Each line consists of a
GLOB-SEVERITY pair separated by whitespace. Changes in modules matching GLOB
will have severity SEVERITY instead of the default 8. (B<--check-kabi> only).
=back
=cut
use strict;
use warnings;
#use diagnostics;
use Digest::MD5 qw(md5_hex);
use Getopt::Long;
eval { require Pod::Usage; };
if ($@) {
sub pod2usage {
my %opts = @_;
print STDERR
"Usage:
symsets.pl --list-exported-symbols ...
symsets.pl --generate-symsets [--reference=DIR] --output-dir=DIR ...
symsets.pl --list-symsets [--reference=DIR] ...
symsets.pl --check-kabi --reference=DIR ...
Install Pod::Usage for a better help message.
";
exit $opts{-exitval};
}
} else {
Pod::Usage->import('pod2usage');
}
our ($opt_verbose);
our $kabi_badness = 0;
our (%commonsyms, %usedsyms, @severities);
our ($opt_list_exp, $opt_gen_sets, $opt_list_sets, $opt_check_kabi) = (0,0,0,0);
our ($opt_max_badness, $opt_commonsyms, $opt_usedsyms, $opt_severities);
our ($opt_symvers_file, $opt_reference, $opt_fake);
our ($opt_output_dir);
sub main {
my (@modules, @pulled_modules);
my $res = GetOptions(
'verbose|v' => \$opt_verbose,
'list-exported-symbols' => \$opt_list_exp,
'generate-symsets' => \$opt_gen_sets,
'list-symsets' => \$opt_list_sets,
'check-kabi' => \$opt_check_kabi,
'max-badness=i' => \$opt_max_badness,
'commonsyms|common-syms=s' => \$opt_commonsyms,
'usedsyms|used-syms=s' => \$opt_usedsyms,
'severities=s' => \$opt_severities,
'symvers-file=s' => \$opt_symvers_file,
'modules=s' => sub { push(@modules, load_list($_[1])); },
'required-modules=s' => sub { push(@pulled_modules, load_list($_[1])); },
'reference=s' => \$opt_reference,
'fake=s' => \$opt_fake,
'output-dir=s' => \$opt_output_dir,
'usage' => sub { pod2usage(-exitval => 0, -verbose => 0); },
'help' => sub { pod2usage(-exitval => 0, -verbose => 1); },
);
# boring option checking
my $opt_err = sub {
print STDERR "ERROR: @_\n";
$res = 0;
};
&$opt_err("Please choose one of --list-exported-symbols, --generate-symsets, --list-symsets or --check-kabi")
if ($opt_list_exp + $opt_gen_sets + $opt_list_sets > 1 ||
!($opt_list_exp + $opt_gen_sets + $opt_list_sets + $opt_check_kabi));
&$opt_err("--check-kabi doesn't work with --list-exported-symbols")
if ($opt_list_exp && $opt_check_kabi);
&$opt_err("--check-kabi requires --reference")
if ($opt_check_kabi && !$opt_reference);
&$opt_err("--fake only makes sense with --reference")
if ($opt_fake && !$opt_reference);
&$opt_err("--output-dir only makes sense with --generate-symsets")
if ($opt_output_dir && !$opt_gen_sets);
&$opt_err("--generate-symsets requires --output-dir")
if ($opt_gen_sets && !$opt_output_dir);
if (!$opt_check_kabi) {
for my $opt qw(max-badness commonsyms usedsyms severities) {
no strict 'refs';
my $var = "opt_$opt";
$var =~ s/-/_/g;
if (defined(${$var})) {
&$opt_err("--$opt only makes sense with --check-kabi");
}
}
}
# get list of modules
if (@modules == 0) {
@modules = @ARGV;
}
if (@modules == 0 && !defined($opt_symvers_file)) {
&$opt_err("No modules supplied");
}
if (!$res) {
pod2usage(-exitval => 1, -verbose => 0, -output => ">&2");
}
# get list of exports
my (@exports, @pulled_exports, @fake_exports);
for my $file (@modules) {
push(@exports, module_exports($file));
}
if (defined($opt_symvers_file)) {
push(@exports, builtin_exports(parse_symset($opt_symvers_file)));
}
if ($opt_list_exp) {
print format_exports(@exports);
exit 0;
}
for my $file (@pulled_modules) {
push(@pulled_exports, module_exports($file));
}
if ($opt_fake) {
push(@fake_exports, parse_symset($opt_fake));
}
# generate symsets and optionally check kabi
my (@ref, @sets);
@sets = split_into_symsets(@exports);
if (defined($opt_reference)) {
@ref = load_symsets($opt_reference);
if ($opt_check_kabi) {
load_kabi_files($opt_commonsyms, $opt_usedsyms, $opt_severities);
}
# records kabi breakage if $opt_check_kabi is set
preserve_symsets(\@sets, \@ref, \@pulled_exports, \@fake_exports);
}
if ($opt_gen_sets) {
write_symsets($opt_output_dir, @sets);
} elsif ($opt_list_sets) {
write_symsets(undef, @sets);
}
if ($kabi_badness) {
print STDERR "KABI: badness is $kabi_badness";
if (!defined($opt_max_badness) || $kabi_badness <= $opt_max_badness) {
print STDERR " (tolerated)\n";
} else {
print STDERR " (exceeds threshold $opt_max_badness), aborting\n";
exit 1;
}
}
exit 0;
}
# structures used:
# %export:
# (crc => $crc, sym => $sym, mod => $module, type => $type)
# @exportlist
# ({crc => $crc, sym => $sym, mod => $module, type => $type}, ...)
# @symset:
# ($name,
# [{crc => $crc, sym => $sym, mod => $module, type => $type}, ...],
# $fake
# )
# @symsetlist:
# (
# [$name,
# [{crc => $crc, sym => $sym, mod => $module, type => $type}, ...]
# $fake
# ],
# ...
# )
#
# parse a Modules.symvers-style file
# returns an exportlist
sub parse_symset {
my ($file) = @_;
my @res;
open(my $fh, '<', $file) or die "Error opening $file: $!\n";
while (<$fh>) {
my @l = split(/\s+/);
if (@l < 4) {
print STDERR "$file:$.: unknown line\n";
next;
}
$l[0] =~ s/^0x//;
push(@res, {crc => $l[0], sym => $l[1], mod => $l[2], type => $l[3]});
}
close($fh);
return @res;
}
# greps an exportlist for built-in symbols
sub builtin_exports {
return grep { $_->{mod} =~ /(^vmlinux$)|(\/built-in$)/ } @_;
}
my %export_types = (
__ksymtab => "EXPORT_SYMBOL",
__ksymtab_unused => "EXPORT_UNUSED_SYMBOL",
__ksymtab_gpl => "EXPORT_SYMBOL_GPL",
__ksymtab_unused_gpl => "EXPORT_UNUSED_SYMBOL_GPL",
__ksymtab_gpl_future => "EXPORT_SYMBOL_GPL_FUTURE"
);
# returns an exportlist for a given module
sub module_exports {
my ($file) = @_;
my (%crcs, %types, @res);
my $mod = $file;
$mod =~ s/.*\/lib\/modules\/[^\/]*\/kernel\///;
$mod =~ s/\.(k?o|a)$//;
open(my $pipe, '-|', 'objdump', '-t', $file) or die "objdump -t $file: $!\n";
while (<$pipe>) {
my $l = $_;
my @l = split(/\s+/);
next if (@l < 3);
next if ($l =~ /^[^ ]* .....d/); # debug symbol
my $sym = $l[$#l];
my $sec = $l[$#l - 2];
if ($sym =~ /^__crc_(.*)/) {
$crcs{$1} = $l[0];
$crcs{$1} =~ s/^0{8}//;
} elsif ($sym =~ /^__ksymtab_(.*)/ && exists($export_types{$sec})) {
$types{$1} = $export_types{$sec};
}
}
close($pipe);
if ($? != 0) {
die "objdump returned an error\n";
}
for my $sym (keys(%types)) {
push(@res, {sym => $sym, crc => $crcs{$sym} || "0"x8, mod => $mod,
type => $types{$sym}});
}
return @res;
}
# format an exportlist for output
sub format_exports {
my $res = "";
for my $exp (sort { $a->{sym} cmp $b->{sym} } @_) {
$res .= "0x$exp->{crc}\t$exp->{sym}\t$exp->{mod}\t$exp->{type}\n";
}
return $res;
}
# splits exports by directories, returns a symsetlist
sub split_into_symsets {
my %sets;
for my $exp (@_) {
my $set = $exp->{mod};
$set =~ s/\/[^\/]+$//;
$set =~ s/\//_/g;
$sets{$set} ||= [];
push(@{$sets{$set}}, $exp);
}
return map { [$_, $sets{$_}] } keys(%sets)
}
# loads symsets from a directory created by write_symsets
# returns symsetlist
# FIXME: multiple versions of a symset
sub load_symsets {
my ($dir) = @_;
my @sets;
opendir(my $dh, $dir) or die "Error reading directory $dir: $!\n";
for my $file (readdir($dh)) {
next if $file =~ /^\.\.?$/;
if (!-f "$dir/$file" ||
$file !~ /^\.?([\w-]+)\.[0-9a-f]{16}(\.fake)?$/) {
print STDERR "Ignoring unknown file $dir/$file\n";
next;
}
my $set = $1;
push(@sets, [$set, [parse_symset("$dir/$file")]]);
}
closedir($dh);
return @sets;
}
sub hash {
return substr(md5_hex(@_), 0, 16);
}
# writes symsets as returned by split_into_symsets/load_symsets into $dir
sub write_symsets {
my $dir = shift;
my @sets = @_;
my $print_only = (!defined($dir));
for my $set (@sets) {
my $name = $set->[0];
my $exports = $set->[1];
my $fake = $set->[2];
my $data = format_exports(@$exports);
my $hash = hash($data);
if ($print_only) {
print "$name.$hash\n";
} else {
my $f;
if ($fake) {
$f = "$dir/.$name.$hash.fake";
} else {
$f = "$dir/$name.$hash";
}
open(my $fh, '>', $f) or die "error creating $f: $!\n";
print $fh $data;
close($fh);
}
}
}
# loads kabi check configurations into %commonsyms, %usedsyms and %severities
sub load_kabi_files {
my ($csfile, $usfile, $sevfile) = @_;
if (defined($csfile)) {
open(my $fh, '<', $csfile) or die "Can't open $csfile: $!\n";
%commonsyms = map { s/\s+//g; ; $_ => 1 } <$fh>;
close($fh);
}
if (defined($usfile)) {
open(my $fh, '<', $usfile) or die "Can't open $usfile: $!\n";
%usedsyms = map { s/\s+//g; $_ => 1 } <$fh>;
close($fh);
}
if (defined($sevfile)) {
open(my $fh, '<', $sevfile) or die "Can't open $sevfile: $!\n";
while (<$fh>) {
chomp;
s/#.*//;
next if /^\s*$/;
my @f = split(/\s+/);
if (@f != 2) {
print STDERR "$sevfile:$.: unknown line\n";
next;
}
if ($f[1] !~ /^\d+$/) {
print STDERR "$sevfile:$.: invalid severity $f[1]\n";
next;
}
# simple glob -> regexp conversion
$f[0] =~ s/\*/.*/g;
$f[0] =~ s/\?/./g;
$f[0] =~ s/.*/^$&\$/;
push(@severities, [@f]);
}
close($fh);
}
}
# loads a list of filenames from file
sub load_list {
my ($file) = @_;
my ($fh, @res);
if ($file eq '-') {
open($fh, '<&STDIN');
} else {
open($fh, '<', $file) or die "Error opening $file: $!\n";
}
@res = <$fh>;
chomp(@res);
close($fh);
return @res;
}
# record kabi changes
sub kabi_change {
my $exp = shift;
my $sev;
return if !$opt_check_kabi;
$sev = 8;
for my $rule (@severities) {
if ($exp->{mod} =~ $rule->[0]) {
$sev = $rule->[1];
last;
}
}
if (exists($usedsyms{$exp->{sym}})) {
$sev += 16;
} elsif (exists($commonsyms{$exp->{sym}})) {
$sev += 8;
}
print STDERR "KABI: symbol $exp->{sym}.$exp->{crc} (badness $sev): @_\n";
$kabi_badness = $sev if ($sev > $kabi_badness);
}
# check if all symbols from $old symsetlist are provided by $new symsetlist,
# add compatible symsets to $new
# $pulled_exports is a exportlist of modules, that are pulled as dependencies
# of this package (thus also "provided" by this package).
sub preserve_symsets {
my ($new, $old, $pulled_exports, $fake_exports) = @_;
my (%symcrcs, %pulled_symcrcs, %fake_symcrcs, %symsethashes);
for my $set (@$new) {
my $name = $set->[0];
my $exports = $set->[1];
$symsethashes{$name} = hash(format_exports(@$exports));
for my $exp (@$exports) {
$symcrcs{$exp->{sym}} = $exp->{crc};
}
}
for my $exp (@$pulled_exports) {
$pulled_symcrcs{$exp->{sym}} = $exp->{crc};
}
for my $exp (@$fake_exports) {
$fake_symcrcs{$exp->{sym}} = $exp->{crc};
}
for my $set (@$old) {
my $name = $set->[0];
my $exports = $set->[1];
my $hash = hash(format_exports(@$exports));
if (exists($symsethashes{$name}) && $symsethashes{$name} eq $hash) {
next;
}
my $compatible = 1;
my $fake = 0;
my $oursyms = 0;
for my $exp (@$exports) {
my $crc;
if (exists($symcrcs{$exp->{sym}})) {
$oursyms++;
$crc = $symcrcs{$exp->{sym}};
} elsif (exists($pulled_symcrcs{$exp->{sym}})) {
$crc = $pulled_symcrcs{$exp->{sym}};
}
if ($crc && $crc eq $exp->{crc}) {
next;
}
if (exists($fake_symcrcs{$exp->{sym}}) &&
$fake_symcrcs{$exp->{sym}} eq $exp->{crc}) {
$fake = 1;
next;
}
if (!$crc) {
kabi_change($exp, "missing");
$compatible = 0;
next;
} else {
kabi_change($exp, "crc changed to $crc\n");
$compatible = 0;
}
}
if ($compatible) {
if ($oursyms == 0) {
# this symset is fully provided by a package we require,
# so do not duplicate it in our symsets
next;
}
if ($opt_verbose && $opt_check_kabi) {
print STDERR "KABI: symset $name.$hash preserved";
print STDERR "using fake exports" if $fake;
print STDERR "\n";
}
push(@$new, [$name, $exports, $fake]);
} else {
print STDERR "KABI: symset $name.$hash NOT preserved\n"
if $opt_check_kabi;
}
}
}
main();
# vim: sw=4:et:sts=4