Accepting request 30627 from Kernel:HEAD

Copy from Kernel:HEAD/kernel-source based on submit request 30627 from user jeff_mahoney

OBS-URL: https://build.opensuse.org/request/show/30627
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=83
This commit is contained in:
OBS User autobuild 2010-01-29 13:27:16 +00:00 committed by Git OBS Bridge
parent 3dcdbea9a1
commit 038f7eb26e
48 changed files with 29993 additions and 1805 deletions

View File

@ -11,9 +11,10 @@
+i386 i386/default
+i386 i386/desktop
+i386 i386/pae
+i386 -syms i386/vmi
+i386 -syms i386/debug
+i386 i386/xen
+i386 -syms i386/ec2
#+i386 i386/xen
#+i386 -syms i386/ec2
+i386 i386/vanilla
+i386 -syms i386/trace
@ -24,8 +25,8 @@
+x86_64 x86_64/default
+x86_64 x86_64/desktop
+x86_64 x86_64/xen
+x86_64 -syms x86_64/ec2
#+x86_64 x86_64/xen
#+x86_64 -syms x86_64/ec2
+x86_64 -syms x86_64/debug
+x86_64 x86_64/vanilla
+x86_64 -syms x86_64/trace
@ -48,11 +49,14 @@
+ppc64 ppc64/default
# G5 pSeries
+ppc64 ppc64/ppc64
+ppc64 -syms ppc64/trace
+ppc64 -syms ppc64/debug
# maybe the kernels above were patched to death?
+ppc64 ppc64/vanilla
+s390 s390/s390
+s390 -syms s390/trace
+s390 s390/vanilla
+s390x s390x/default
+s390x -syms s390x/trace
+s390x s390x/vanilla

View File

@ -2,3 +2,6 @@
SRCVERSION=2.6.32
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
OBS_PROJECT=openSUSE:Factory
IBS_PROJECT=SUSE:Factory:Head

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37516ed486636f700047c0fc1bf6881ecbcbd0abe4adf35814914207499aceb3
size 157027
oid sha256:2df2119a8d5095308e9ab3c3d810826e25a10abb0a1572783b78bd0c71a54ea1
size 161745

View File

@ -5,11 +5,17 @@ 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"
if test -e "$builddir/$(basename "$f").provides"; then
cat "$_"
fi
done
else
perl -ni -e 'next if /\/boot\/vmlinux/ && !/\.debug$/; print' "$filelist"

View File

@ -92,8 +92,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -204,7 +206,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
@ -358,39 +360,44 @@ mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
@ -398,7 +405,6 @@ add_vmlinux()
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
@ -420,7 +426,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -433,7 +438,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -441,9 +448,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
@ -506,8 +510,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -596,11 +602,6 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
@ -608,13 +609,13 @@ add_dirs_to_filelist() {
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -631,19 +632,21 @@ done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -652,7 +655,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -813,8 +816,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-debug (Version 2.6.32)
# spec file for package kernel-debug (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor debug
@ -48,8 +48,8 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -193,7 +195,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -321,45 +323,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -380,7 +386,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -393,7 +398,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -401,9 +408,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -454,8 +458,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -535,24 +541,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -567,17 +568,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -586,7 +589,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -759,9 +762,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-default (Version 2.6.32)
# spec file for package kernel-default (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor default
@ -48,8 +48,8 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -209,7 +211,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -336,45 +338,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -395,7 +401,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -408,7 +413,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -416,9 +423,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -469,8 +473,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -550,24 +556,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -582,17 +583,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -601,7 +604,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -772,9 +775,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-desktop (Version 2.6.32)
# spec file for package kernel-desktop (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor desktop
@ -48,8 +48,8 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -189,7 +191,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -327,45 +329,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -386,7 +392,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -399,7 +404,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -407,9 +414,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -460,8 +464,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -541,24 +547,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -573,17 +574,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -592,7 +595,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -783,9 +786,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

94
kernel-docs.spec Normal file
View File

@ -0,0 +1,94 @@
#
# spec file for package kernel-docs (Version 2.6.33)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source = 2.6.33
Url: http://www.kernel.org/
License: GPLv2+
Group: Documentation/Man
AutoReqProv: on
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
Summary: Kernel Documentation
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: kernel-spec-macros
%description
These are the PDF documents and man pages (section 9) built from
thecurrent kernel sources.
%prep
cp -av /etc/texmf/web2c/texmf.cnf .
cat << EOF >> texmf.cnf
main_memory.pdfjadetex = 2500000
hash_extra.pdfjadetex = 70000
max_strings.pdfjadetex = 120000
save_size.pdfjadetex = 10000
EOF
%setup -T -c
%build
# use texmf.cnf from local source
export TEXMFCNF=$RPM_BUILD_DIR
export LANG=en_US
make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i mandocs %{?jobs:-j%jobs}
make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i pdfdocs %{?jobs:-j%jobs}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{_mandir}/man9
# filter out obscure device drivers - they clutter up the rpm and don't add any real value
find Documentation/DocBook/ -name '*.9.gz' |
egrep -v 'man/(sis[69]|rio|fsl|struct_rio|RIO|mpc85|set_rx_mode|mdio_(read|write)|mii_ioctl|mca_|z8530|nand|sppp|piix|(read|write)_zs)' |
while read i ; do
cp $i $RPM_BUILD_ROOT/%{_mandir}/man9
done
install -d $RPM_BUILD_ROOT/usr/share/doc/kernel
cp -a Documentation/DocBook/*.pdf $RPM_BUILD_ROOT/usr/share/doc/kernel || true
if [ -d Documentation/kdb ] ; then
for i in Documentation/kdb/*.m* ; do
k=`basename $i`
k=${k/man/9}
k=${k/mm/9}
cp $i $RPM_BUILD_ROOT/%{_mandir}/man9/$k
done
fi
ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz
cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} .
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS
%{_mandir}/man9/*
%docdir /usr/share/doc/kernel
/usr/share/doc/kernel
%changelog

97
kernel-docs.spec.in Normal file
View File

@ -0,0 +1,97 @@
#
# spec file for package kernel-docs@VARIANT@ (Version @RPMVERSION@)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source = @RPMVERSION@
Url: http://www.kernel.org/
License: GPL v2 or later
Group: Documentation/Man
AutoReqProv: on
Version: @RPMVERSION@
%if %using_buildservice
Release: @RELEASE_PREFIX@<RELEASE>
%else
Release: @RELEASE_PREFIX@0
%endif
Summary: Kernel Documentation
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: kernel-spec-macros
%description
These are the PDF documents and man pages (section 9) built from
thecurrent kernel sources.
%prep
cp -av /etc/texmf/web2c/texmf.cnf .
cat << EOF >> texmf.cnf
main_memory.pdfjadetex = 2500000
hash_extra.pdfjadetex = 70000
max_strings.pdfjadetex = 120000
save_size.pdfjadetex = 10000
EOF
%setup -T -c
%build
# use texmf.cnf from local source
export TEXMFCNF=$RPM_BUILD_DIR
export LANG=en_US
make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i mandocs %{?jobs:-j%jobs}
make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i pdfdocs %{?jobs:-j%jobs}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{_mandir}/man9
# filter out obscure device drivers - they clutter up the rpm and don't add any real value
find Documentation/DocBook/ -name '*.9.gz' |
egrep -v 'man/(sis[69]|rio|fsl|struct_rio|RIO|mpc85|set_rx_mode|mdio_(read|write)|mii_ioctl|mca_|z8530|nand|sppp|piix|(read|write)_zs)' |
while read i ; do
cp $i $RPM_BUILD_ROOT/%{_mandir}/man9
done
install -d $RPM_BUILD_ROOT/usr/share/doc/kernel
cp -a Documentation/DocBook/*.pdf $RPM_BUILD_ROOT/usr/share/doc/kernel || true
if [ -d Documentation/kdb ] ; then
for i in Documentation/kdb/*.m* ; do
k=`basename $i`
k=${k/man/9}
k=${k/mm/9}
cp $i $RPM_BUILD_ROOT/%{_mandir}/man9/$k
done
fi
ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz
cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} .
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS
%{_mandir}/man9/*
%docdir /usr/share/doc/kernel
/usr/share/doc/kernel
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-pae (Version 2.6.32)
# spec file for package kernel-pae (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor pae
@ -48,8 +48,8 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -193,7 +195,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -327,45 +329,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -386,7 +392,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -399,7 +404,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -407,9 +414,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -460,8 +464,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -541,24 +547,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -573,17 +574,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -592,7 +595,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -777,9 +780,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-ppc64 (Version 2.6.32)
# spec file for package kernel-ppc64 (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ppc64
@ -48,8 +48,8 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -197,7 +199,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -331,45 +333,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -390,7 +396,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -403,7 +408,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -411,9 +418,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -464,8 +468,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -545,24 +551,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -577,17 +578,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -596,7 +599,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -781,9 +784,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-ps3 (Version 2.6.32)
# spec file for package kernel-ps3 (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ps3
@ -48,8 +48,8 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -189,7 +191,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -319,45 +321,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -378,7 +384,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -391,7 +396,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -399,9 +406,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -452,8 +456,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -533,24 +539,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -565,17 +566,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -584,7 +587,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -761,9 +764,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-s390 (Version 2.6.32)
# spec file for package kernel-s390 (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor s390
@ -48,8 +48,8 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -193,7 +195,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -320,45 +322,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -379,7 +385,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -392,7 +397,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -400,9 +407,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -453,8 +457,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -534,24 +540,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -566,17 +567,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -585,7 +588,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -756,9 +759,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-source (Version 2.6.32)
# spec file for package kernel-source (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define src_install_dir usr/src/linux-%kernelrelease%variant
@ -28,8 +28,8 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -73,12 +73,13 @@ Source52: kernel-source%variant.changes
Source53: kernel-source.spec.in
Source54: kernel-binary.spec.in
Source55: kernel-syms.spec.in
Source56: config.sh
Source57: compute-PATCHVERSION.sh
Source58: old-packages.conf
Source59: arch-symbols
Source60: package-descriptions
Source61: kernel-spec-macros
Source56: kernel-docs.spec.in
Source60: config.sh
Source61: compute-PATCHVERSION.sh
Source62: old-packages.conf
Source63: arch-symbols
Source64: package-descriptions
Source65: kernel-spec-macros
Source100: config.tar.bz2
Source101: patches.arch.tar.bz2
Source102: patches.drivers.tar.bz2

View File

@ -76,12 +76,13 @@ Source52: kernel-source%variant.changes
Source53: kernel-source.spec.in
Source54: kernel-binary.spec.in
Source55: kernel-syms.spec.in
Source56: config.sh
Source57: compute-PATCHVERSION.sh
Source58: old-packages.conf
Source59: arch-symbols
Source60: package-descriptions
Source61: kernel-spec-macros
Source56: kernel-docs.spec.in
Source60: config.sh
Source61: compute-PATCHVERSION.sh
Source62: old-packages.conf
Source63: arch-symbols
Source64: package-descriptions
Source65: kernel-spec-macros
Source100: config.tar.bz2
Source101: patches.arch.tar.bz2
Source102: patches.drivers.tar.bz2

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-syms (Version 2.6.32)
# spec file for package kernel-syms (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,8 +22,8 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
@ -48,9 +48,6 @@ Requires: kernel-ppc64-devel = %version-%source_rel
%ifarch s390
Requires: kernel-s390-devel = %version-%source_rel
%endif
%ifarch %ix86 x86_64
Requires: kernel-xen-devel = %version-%source_rel
%endif
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-source%variant = %version-%source_rel

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-trace (Version 2.6.32)
# spec file for package kernel-trace (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor trace
@ -48,8 +48,8 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -113,6 +115,18 @@ Conflicts: lvm2 < 2.02.33
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
%ifarch ppc64
Provides: kernel-kdump
Obsoletes: kernel-kdump
%endif
%ifarch s390
Provides: kernel-32bit
Obsoletes: kernel-32bit
%endif
%ifarch s390x
Provides: kernel-64bit
Obsoletes: kernel-64bit
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@ -145,7 +159,7 @@ Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64
ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@ -189,7 +203,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -316,45 +330,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -375,7 +393,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -388,7 +405,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -396,9 +415,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -449,8 +465,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -530,24 +548,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -562,17 +575,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -581,7 +596,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -752,9 +767,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-vanilla (Version 2.6.32)
# spec file for package kernel-vanilla (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor vanilla
@ -48,8 +48,8 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.32
Release: 3
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -197,7 +199,7 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
@ -324,45 +326,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -383,7 +389,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -396,7 +401,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -404,9 +411,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -457,8 +461,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -538,24 +544,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -570,17 +571,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -589,7 +592,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -760,9 +763,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-ec2 (Version 2.6.32)
# spec file for package kernel-vmi (Version 2.6.33)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,10 +18,10 @@
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define patchversion 2.6.33-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ec2
%define build_flavor vmi
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@ -46,10 +46,10 @@
%define install_vdso 0
%endif
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 2.6.32
Release: 3
Name: kernel-vmi
Summary: VMI-enabled kernel
Version: 2.6.33
Release: 1
%if %using_buildservice
%else
%endif
@ -83,8 +83,10 @@ Requires(post): mkinitrd
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla
BuildRequires: dwarfextract
%endif
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
@ -145,7 +147,7 @@ Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
ExclusiveArch: %ix86
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@ -189,15 +191,13 @@ Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
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
%description
The Linux kernel for Xen paravirtualization.
This kernel can only be used both as an unprivileged ("xenU")
kernel (for Amazon EC2).
The Linux Kernel designed to run on top of a virtual machine
interface layer (VMI).
%source_timestamp
@ -319,45 +319,49 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
# exctact the provided symbols before they are stripped away
echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
%my_builddir/$(basename $vmlinux).provides
fi
%endif
if [ "$1" = --compressed ]; then
if $compressed; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
@ -378,7 +382,6 @@ add_vmlinux()
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
@ -391,7 +394,9 @@ add_vmlinux()
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
@ -399,9 +404,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
@ -452,8 +454,10 @@ if [ %CONFIG_MODULES = y ]; then
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
@ -533,24 +537,19 @@ 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
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
@ -565,17 +564,19 @@ for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
@ -584,7 +585,7 @@ done
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
@ -618,7 +619,7 @@ rm %my_builddir/tmp
%defattr(-, root, root)
%package base
Summary: The Amazon EC2 Xen Kernel - base modules
Summary: VMI-enabled kernel - base modules
License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
@ -634,10 +635,8 @@ Conflicts: libc.so.6()(64bit)
%endif
%description base
The Linux kernel for Xen paravirtualization.
This kernel can only be used both as an unprivileged ("xenU")
kernel (for Amazon EC2).
The Linux Kernel designed to run on top of a virtual machine
interface layer (VMI).
This package contains only the base modules, required in all installs.
@ -657,7 +656,7 @@ This package contains only the base modules, required in all installs.
%endif
%package extra
Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules
Summary: VMI-enabled kernel - Unsupported kernel modules
License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
@ -676,10 +675,8 @@ Conflicts: libc.so.6()(64bit)
%endif
%description extra
The Linux kernel for Xen paravirtualization.
This kernel can only be used both as an unprivileged ("xenU")
kernel (for Amazon EC2).
The Linux Kernel designed to run on top of a virtual machine
interface layer (VMI).
This package contains additional modules not supported by Novell.
@ -761,9 +758,6 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,769 +0,0 @@
#
# spec file for package kernel-xen (Version 2.6.32)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%define srcversion 2.6.32
%define patchversion 2.6.32
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor xen
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
%else
%define install_vdso 0
%endif
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.32
Release: 3
%if %using_buildservice
%else
%endif
License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
Obsoletes: %name-base <= 2.6.31
%endif
Requires(pre): coreutils awk
# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2
Requires(post): module-init-tools >= 3.4
# This Requires is wrong, because the post/postun scripts have a
# test -x update-bootloader, having perl-Bootloader is not a hard requirement.
# But, there is no way to tell rpm or yast to schedule the installation
# of perl-Bootloader before kernel-binary.rpm if both are in the list of
# 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
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
BuildRequires: dwarfextract
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
Provides: kernel-xenpae = %version
Obsoletes: kernel-xenpae <= %version
%endif
%endif
#!BuildIgnore: xen
%endif
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
# force bzip2 instead of lzma compression to allow install on older dist versions
%define _binary_payload w9.bzdio
%endif
# dead network if installed on SLES10, otherwise it will work (mostly)
Conflicts: sysfsutils < 2.0
%if ! %build_vanilla
Conflicts: apparmor-profiles <= 2.1
Conflicts: apparmor-parser < 2.3
# root-lvm only works with newer udevs
Conflicts: udev < 118
Conflicts: lvm2 < 2.02.33
%endif
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
Source20: series.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
Source44: find-provides
Source46: modversions
Source47: kabi.pl
Source48: split-modules
Source49: kernel-spec-macros
Source100: config.tar.bz2
Source101: patches.arch.tar.bz2
Source102: patches.drivers.tar.bz2
Source103: patches.fixes.tar.bz2
Source104: patches.rpmify.tar.bz2
Source105: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
NoSource: 101
NoSource: 102
NoSource: 103
NoSource: 104
NoSource: 105
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
NoSource: 120
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 10.3
Obsoletes: adm8211-kmp-%build_flavor
Obsoletes: rt2x00-kmp-%build_flavor
Obsoletes: rfswitch-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
Obsoletes: btusb-kmp-%build_flavor
# sle11-ga
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
%description
The Linux kernel for Xen paravirtualization.
This kernel can be used both as the domain0 ("xen0") and as an
unprivileged ("xenU") kernel.
%source_timestamp
%prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
echo "The %name-%version.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
>>../apply-patches.sh
bash -ex ../apply-patches.sh
cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
cp .config .config.orig
make silentoldconfig $MAKE_ARGS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
cat > .kernel-binary.spec.buildenv <<EOF
# Override the timestamp 'uname -v' reports with the build
# timestamp.
export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
# The following branch/timestamp will end up in Oopses.
export OOPS_TIMESTAMP="$(
echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
%_sourcedir/source-timestamp)
head -n 1 %_sourcedir/source-timestamp \
| tr -dc 0-9)"
export KBUILD_VERBOSE=0
export KBUILD_SYMTYPES=1
export KBUILD_OVERRIDE=1
EOF
%build
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
# create *.symref files in the tree
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
%else
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif
%install
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
# kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
if [ "$1" = --compressed ]; then
gzip -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%else
# architecture specifics
%ifarch %ix86 x86_64
add_vmlinux --compressed
%if %build_xen
image=vmlinuz
%else
image=bzImage
%endif
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64
add_vmlinux
chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
image=image
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
fi
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:%build_flavor:g" \
-e "s:@SUBPACKAGE@:%name$sub:g" \
-e "s:@BASE_PACKAGE@:$base_package:g" \
-e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
done
done
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if [ -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
"higher than allowed for an official kernel."
exit 1
fi
fi
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
case "$(file -b "$f")" in
ELF\ *\ executable*)
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%%%[a-z]+(\([^)]+\))? ?::g
# add %%%%dir prefix
s:^:%%%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
}
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%%%%%ghost /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
-type d -o \
-printf '/%%p\n'
if [ -e .%_docdir/%name ]; then
echo "%%%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
%preun -f preun.sh
%postun -f postun.sh
%pre -f pre.sh
%post -f post.sh
%if %split_base
%files -f kernel-main.files
%else
%files -f kernel-base.files
%endif
%defattr(-, root, root)
%package base
Summary: The Xen Kernel - base modules
License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description base
The Linux kernel for Xen paravirtualization.
This kernel can be used both as the domain0 ("xen0") and as an
unprivileged ("xenU") kernel.
This package contains only the base modules, required in all installs.
%source_timestamp
%preun base -f preun-base.sh
%postun base -f postun-base.sh
%pre base -f pre-base.sh
%post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files
%defattr(-, root, root)
%endif
%package extra
Summary: The Xen Kernel - Unsupported kernel modules
License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description extra
The Linux kernel for Xen paravirtualization.
This kernel can be used both as the domain0 ("xen0") and as an
unprivileged ("xenU") kernel.
This package contains additional modules not supported by Novell.
%source_timestamp
%preun extra -f preun-extra.sh
%postun extra -f postun-extra.sh
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%package man
Summary: The collection of man pages generated by the kmsg script.
License: GPLv2
Group: System/Kernel
%description man
This package includes the man pages that have been generated from the
kmsg message documentation comments.
%source_timestamp
%files man
%defattr(-,root,root)
/usr/share/man/man9/*
%endif
%package devel
Summary: Development files necessary for building kernel modules
License: GPLv2
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-source%variant = %version-%source_rel
AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and
kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%pre devel -f devel-pre.sh
%post devel -f devel-post.sh
%files devel -f kernel-devel.files
%defattr(-,root,root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu
/usr/src/linux-obj/%_target_cpu
%endif
%endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPLv2
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

5
mkspec
View File

@ -82,6 +82,9 @@ for my $flavor (sort keys(%flavor_archs)) {
# kernel-source.spec
do_spec('source', "kernel-source$variant.spec", %macros);
# kernel-docs.spec
do_spec('docs', "kernel-docs$variant.spec", %macros);
# kernel-syms.spec
{
my $requires = "";
@ -128,7 +131,7 @@ sub parse_config_conf {
sub read_spec_templates {
my %res;
for my $template qw(binary source syms) {
for my $template qw(binary source syms docs) {
xopen(my $fh, '<', "$dir/kernel-$template.spec.in");
my @lines = <$fh>;
$res{$template} = join("", @lines);

View File

@ -109,3 +109,8 @@ The Linux kernel for Xen paravirtualization.
This kernel can only be used both as an unprivileged ("xenU")
kernel (for Amazon EC2).
=== kernel-vmi ===
VMI-enabled kernel
The Linux Kernel designed to run on top of a virtual machine
interface layer (VMI).

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:907f560381997ee337da14cab62c839021d54860b5b8c912f3b1a644778efae1
size 37380
oid sha256:7257079b49ddb8fc7646dff3594b2b74892b5853c85402da1923476347333118
size 48781

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:323a85cfe94d707b96999ada3c2de7d4e1b36bd8814adb3226033cb247d29535
size 109052
oid sha256:82c1962b481cc6b8acd84205609bba3e7ea1eba57742f22dd5c50fbbe0681e87
size 98397

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eaee60e4cb9e6eebcc06bf5aaa351cd3e39de0fd1ec72d5c2315f4515f108eba
size 185918
oid sha256:07fb0573e5c37211121b407203590dadec59186da4b6d408889f41ef40e0b783
size 154102

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c6c722577f06ed4845b1f8c59c4cb3e2b9e7054857d2b90c9b4e4efb12cdf60
size 56550
oid sha256:62d55b0c75bb847c54893d61c49a8c0771f80d138d8307eb449ada97e97210be
size 38989

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dde5510f9ad1aef9c1f1d3b2a8099a006fe55fdab5ebcf2c141624b999d057e
size 136
oid sha256:f7c8978008044b92120e40e4e9b840b38c8b32ed54b36db3aaf748363ba59faf
size 10522777

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0557a514bd746d55210a6b3ed03e17f320449e28767b405b635f493f3ec6a316
size 7144
oid sha256:d191871079b5790dc31ec9996b864f0c8bc68cadc55970fd4d3d5b030395af14
size 7763

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a64fb8715a4facc1ef7ef3a1aa60215bc0155d32e849fcc1a12eeda931fb0c1f
size 1174632
oid sha256:c454e2f82b14ec761dfae05c3e966473e2c03b742d7d250d8c7a066a9077c044
size 1075084

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3cba097dfa4134f9ff373805a8c8069b53a2a67fb7efa9e0a0d15c3aff71630
size 44563
oid sha256:91896949fbb848a2969d20a14d390ed65a83b461756faebc7370dd5a3c06736e
size 44494

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8cc518fb6dacd899475bb0f88020b72acf2157505e771cc391871f38c5653719
size 1882770
oid sha256:4bd03fde297c3b4b748ce8a976e6d3644d35850eea77b3861e2f0b4458335db1
size 1900316

View File

@ -27,23 +27,32 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
patches.kernel.org/patch-2.6.33-rc3
patches.kernel.org/patch-2.6.33-rc3-rc4
patches.kernel.org/patch-2.6.33-rc4-rc5
########################################################
# Build fixes that apply to the vanilla kernel too.
# They must be placed in patches.kernel.org to be
# picked up for the -vanilla flavor. This is cheating,
# since they're not actually upstream, but if the
# packages don't build, that's pretty useless too.
# Patches in patches.rpmify are applied to both -vanilla
# and patched flavors.
########################################################
patches.rpmify/psmouse-section-conflict.diff
patches.rpmify/ipmi-section-conflict.diff
patches.rpmify/md-section-conflict
patches.rpmify/gdth-section-conflict
patches.rpmify/arch-include-asm-fixes
patches.rpmify/arm-arch_include_asm-fix.diff
patches.rpmify/tsi148-dependency
patches.rpmify/staging-missing-sched.h
patches.rpmify/ia64-sn-fix-percpu-warnings
patches.rpmify/rtl8192u-dont-use-mhard-float
patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings
patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning
patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings
patches.rpmify/rt2860-use-skb_tail_pointer
patches.rpmify/rtl8192e-use-skb_tail_pointer
patches.rpmify/smsc47m1-fix-section-mismatch
patches.rpmify/hugetlbfs-fix-section-mismatches
patches.rpmify/rtl8192e-fix-section-mismatches
patches.rpmify/dmar-fix-section-mismatch
patches.rpmify/hpsa-fix-section-mismatch
patches.rpmify/rt2860-fix-section-mismatches
patches.rpmify/ppc-crashdump-typefix
########################################################
# kABI consistency patches
@ -59,7 +68,6 @@
# will be included in the vanilla package.
########################################################
patches.rpmify/firmware-path
patches.rpmify/no-include-asm
patches.rpmify/rpm-kernel-config
patches.rpmify/split-package
@ -74,8 +82,6 @@
patches.suse/supported-flag-enterprise
patches.fixes/kbuild-fix-generating-of-.symtypes-files
patches.suse/genksyms-add-override-flag.diff
patches.suse/kbuild-generate-modules.builtin
patches.suse/kbuild-rebuild-fix-for-Makefile.modbuiltin
patches.suse/kconfig-automate-kernel-desktop
########################################################
@ -85,59 +91,42 @@
patches.suse/kvm-as-kmp
patches.suse/export-release_open_intent
patches.suse/export-security_inode_permission
patches.suse/export-sync_page_range
+still_needed-33? patches.suse/export-sync_page_range
########################################################
# Bug workarounds for binutils
########################################################
patches.suse/s390-System.map.diff
patches.arch/s390-message-catalog.diff
patches.arch/s390-01-qeth-isolation.patch
patches.arch/s390-02-01-cex3-init-msg.patch
patches.arch/s390-02-02-cex3-special-command.patch
patches.arch/s390-02-03-cex3-device.patch
patches.arch/s390-02-04-cex3-use-def.patch
patches.arch/s390-02-05-zcrypt-speed-cex2c.patch
patches.arch/s390-02-06-zcrypt-speed-cex3.patch
########################################################
# Scheduler / Core
########################################################
+needs_update-32 patches.suse/smtnice-disable
patches.suse/setuid-dumpable-wrongdir
patches.fixes/seccomp-disable-tsc-option
patches.suse/hung_task_timeout-configurable-default
+needs_update-33 patches.suse/sched-revert-latency-defaults
# writable limits
patches.suse/rlim-0001-SECURITY-selinux-fix-update_rlimit_cpu-parameter.patch
patches.suse/rlim-0002-SECURITY-add-task_struct-to-setrlimit.patch
patches.suse/rlim-0003-core-add-task_struct-to-update_rlimit_cpu.patch
patches.suse/rlim-0004-sys_setrlimit-make-sure-rlim_max-never-grows.patch
patches.suse/rlim-0005-core-split-sys_setrlimit.patch
patches.suse/rlim-0006-core-allow-setrlimit-to-non-current-tasks.patch
patches.suse/rlim-0007-core-optimize-setrlimit-for-current-task.patch
patches.suse/rlim-0008-FS-proc-make-limits-writable.patch
patches.suse/rlim-0009-core-posix-cpu-timers-cleanup-rlimits-usage.patch
patches.suse/rlim-0010-core-do-security-check-under-task_lock.patch
patches.suse/rlim-0011-resource-add-helpers-for-fetching-rlimits.patch
patches.suse/rlim-0012-IA64-use-helpers-for-rlimits.patch
patches.suse/rlim-0013-PPC-use-helpers-for-rlimits.patch
patches.suse/rlim-0014-S390-use-helpers-for-rlimits.patch
patches.suse/rlim-0015-SPARC-use-helpers-for-rlimits.patch
patches.suse/rlim-0016-X86-use-helpers-for-rlimits.patch
patches.suse/rlim-0017-FS-use-helpers-for-rlimits.patch
patches.suse/rlim-0018-MM-use-helpers-for-rlimits.patch
patches.suse/rlim-0019-core-use-helpers-for-rlimits.patch
patches.suse/rlim-0020-misc-use-helpers-for-rlimits.patch
patches.suse/rlim-0021-core-rename-setrlimit-to-do_setrlimit.patch
patches.suse/rlim-0022-core-implement-getprlimit-and-setprlimit-syscalls.patch
patches.suse/rlim-0023-unistd-add-__NR_-get-set-prlimit-syscall-numbers.patch
patches.suse/rlim-0024-COMPAT-add-get-put_compat_rlimit.patch
patches.suse/rlim-0025-x86-add-ia32-compat-prlimit-syscalls.patch
patches.suse/rlim-0005-core-posix-cpu-timers-cleanup-rlimits-usage.patch
patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch
patches.suse/rlim-0009-X86-use-helpers-for-rlimits.patch
patches.suse/rlim-0010-FS-use-helpers-for-rlimits.patch
patches.suse/rlim-0011-MM-use-helpers-for-rlimits.patch
patches.suse/rlim-0012-core-use-helpers-for-rlimits.patch
patches.suse/rlim-0013-infiniband-use-helpers-for-rlimits.patch
patches.suse/rlim-0014-ipc-use-helpers-for-rlimits.patch
patches.suse/rlim-0015-SECURITY-add-task_struct-to-setrlimit.patch
patches.suse/rlim-0016-core-add-task_struct-to-update_rlimit_cpu.patch
patches.suse/rlim-0017-sys_setrlimit-make-sure-rlim_max-never-grows.patch
patches.suse/rlim-0018-core-split-sys_setrlimit.patch
patches.suse/rlim-0019-core-allow-setrlimit-to-non-current-tasks.patch
patches.suse/rlim-0020-core-optimize-setrlimit-for-current-task.patch
patches.suse/rlim-0021-FS-proc-switch-limits-reading-to-fops.patch
patches.suse/rlim-0022-FS-proc-make-limits-writable.patch
patches.suse/rlim-0023-core-do-security-check-under-task_lock.patch
patches.fixes/make-note_interrupt-fast.diff
patches.fixes/twl6030-fix-note_interrupt-call
########################################################
# Architecture-specific patches. These used to be all
@ -150,7 +139,6 @@
# ia64
########################################################
patches.fixes/ia64-sparse-fixes.diff
patches.fixes/nr-irqs-file
patches.arch/mm-avoid-bad-page-on-lru
patches.arch/ia64-page-migration
patches.arch/ia64-page-migration.fix
@ -165,20 +153,16 @@
# 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T'
# x64
# Intel 64
# "the architecture with too many names"
# "the architecture with too many names"
# TAWTMN
########################################################
# x86_64/i386 biarch
########################################################
patches.arch/x86-hpet-pre-read
patches.arch/x86_64-hpet-64bit-timer.patch
+needs_update-33 patches.arch/x86_64-hpet-64bit-timer.patch
patches.arch/add_support_for_hpet_msi_intr_remap.patch
patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch
patches.arch/x86-crypto-pclmulqdq-accelerated-implementation.patch
patches.arch/x86-crypto-add-ghash-algorithm-test.patch
patches.arch/x86-fix-nodac
patches.fixes/crypto-testmgr-fix-complain-about-lacking-test.patch
patches.arch/x86-mcp51-no-dac
patches.arch/kvm-split-paravirt-ops-by-functionality
@ -186,15 +170,36 @@
patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature
patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic
patches.arch/x86-64-preserve-large-page-mapping-for-1st-2mb-kernel-txt-with-config_debug_rodata
patches.arch/x86-64-align-rodata-kernel-section-to-2mb-with-config_debug_rodata
patches.arch/x86-64-add-comment-for-rodata-large-page-retainment
patches.suse/x86-mark_rodata_rw.patch
patches.fixes/dmar-fix-oops-with-no-dmar-table
########################################################
# x86 MCE/MCA (Machine Check Error/Architecture) extensions
########################################################
# Needed on Boxboro/Westmere-EX to correctly decode the physical
# address of correctable errors
patches.arch/x86_mce_intel_decode_physical_address.patch
patches.arch/x86_mce_intel_decode_physical_address_rename_fix.patch
patches.arch/x86_mce_intel_decode_physical_address_compile_fix.patch
########################################################
# x86_64/4096CPUS - from SGI
########################################################
patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch
########################################################
# x86 UV patches from SGI
########################################################
patches.arch/bug-561939_uv_bios_call_hwperf_updated.patch
# bug 566745
patches.arch/UV-Expose-irq_desc-node-in-proc.patch
########################################################
# x86_64/i386 depending on the UV patchset
########################################################
########################################################
# powerpc/generic
########################################################
@ -225,17 +230,6 @@
patches.fixes/ptrace-getsiginfo
patches.arch/ppc-ipic-suspend-without-83xx-fix
patches.arch/ppc-vmcoreinfo.diff
patches.arch/ppc-select
patches.arch/ppc-extended_h_cede-kernel-dlpar
patches.arch/ppc-extended_h_cede-mv_of_drconf_cell
patches.arch/ppc-extended_h_cede-Export_memory_sysdev_class
patches.arch/ppc-extended_h_cede-memory-dlpar
patches.arch/ppc-extended_h_cede-cpu-dlpar
patches.arch/ppc-extended_h_cede-new_cede_processor
patches.arch/ppc-extended_h_cede-add_offline_states
patches.arch/ppc-extended_h_cede-node_offline_online_cpus
patches.arch/ppc-extended_h_cede-add_driver_lock
########################################################
# PS3
@ -246,8 +240,18 @@
########################################################
patches.arch/s390-add-FREE_PTE_NR
+needs_update-32 patches.arch/s390-08-02-zfcp-gpn-align-fix.diff
patches.suse/s390-System.map.diff
patches.arch/s390-message-catalog.diff
patches.arch/kmsg-fix-parameter-limitations
patches.arch/s390-03-qeth-hs-traffic-analyzer.patch
patches.suse/s390-Kerntypes.diff
patches.arch/s390-05-13-qeth-blkt-defaults.patch
patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch
+needs_update-33 patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch
########################################################
# VM/FS patches
@ -261,14 +265,21 @@
+needs_update-32 patches.suse/osync-error
patches.fixes/remount-no-shrink-dcache
+needs_update-32 patches.suse/reiser4-sync_inodes
patches.suse/reiser4-set_page_dirty_notag
patches.suse/file-capabilities-disable-by-default.diff
patches.suse/unlock_page-speedup.patch
patches.suse/files-slab-rcu.patch
patches.suse/mm-tune-dirty-limits.patch
patches.suse/mm-devzero-optimisation.patch
patches.fixes/aggressive-zone-reclaim.patch
patches.suse/readahead-request-tunables.patch
########################################################
# IPC patches
########################################################
########################################################
# nfsacl protocol (agruen)
########################################################
@ -293,8 +304,9 @@
patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch
+trenn patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
patches.suse/init-move-populate_rootfs-back-to-start_kernel
patches.suse/acpi-generic-initramfs-table-override-support
+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.arch/acpi_thermal_passive_blacklist.patch
patches.arch/acpi-export-hotplug_execute
@ -309,7 +321,7 @@
patches.arch/acpi_srat-pxm-rev-store.patch
patches.arch/acpi_srat-pxm-rev-ia64.patch
patches.arch/acpi_srat-pxm-rev-x86-64.patch
patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch
########################################################
# CPUFREQ
@ -327,6 +339,10 @@
# patches.suse/cpuidle-documentation
patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch
# PCC -> HP's cpufreq driver
patches.drivers/cpufreq_ondemand_limit_fix.patch
patches.drivers/cpufreq_processor_clocking_control_pcc_driver.patch
########################################################
# AGP, graphics related stuff
########################################################
@ -338,7 +354,7 @@
# TIOCGDEV - suse special
patches.fixes/tiocgdev
+still_needed? patches.suse/mm-increase-dirty-limits.patch
patches.suse/panic-on-io-nmi-SLE11-user-space-api.patch
+needs_to_die-33 patches.suse/panic-on-io-nmi-SLE11-user-space-api.patch
########################################################
# Networking, IPv6
@ -348,14 +364,12 @@
########################################################
# NFS
########################################################
patches.fixes/nfsd-acl.patch
patches.fixes/nfs-slot-table-alloc
patches.fixes/nfs-honour-server-preferred-io-size
patches.fixes/nfsd-05-sunrpc-cache-allow-thread-to-block-while-waiting-for.patch
patches.fixes/nfsd-06-sunrpc-cache-retry-cache-lookups-that-return-ETIMEDO.patch
patches.fixes/nfsd-07-nfsd-idmap-drop-special-request-deferal-in-favour-of.patch
patches.fixes/nfsd-09-fix-kabi
########################################################
# lockd + statd
########################################################
@ -385,10 +399,12 @@
# dlm
########################################################
patches.fixes/dlm-enable-debug.patch
patches.suse/64bytes_lvb_len.diff
########################################################
# ocfs2
########################################################
patches.suse/ocfs2-allocation-resrvations.patch
########################################################
@ -402,6 +418,7 @@
patches.suse/xfs-dmapi-src
patches.suse/xfs-dmapi-enable
patches.suse/xfs-dmapi-xfs-enable
patches.suse/xfs-dmapi-re-add-flags-for-xfs_free_eofblocks
patches.suse/xfs-nfsd-dmapi-aware
patches.fixes/xfs-dmapi-fixes
patches.fixes/xfs-redirty-ENOSPC.patch
@ -411,20 +428,19 @@
# novfs
########################################################
patches.suse/novfs-client-module
patches.suse/novfs-fix-debug-message.patch
########################################################
# other filesystem stuff
########################################################
patches.suse/parser-match_string.diff
patches.suse/fs-may_iops.diff
patches.suse/fs-knows-MAY_APPEND.diff
patches.suse/nfs4acl-common.diff
patches.suse/nfs4acl-ext3.diff
patches.suse/nfs4acl-ai.diff
patches.fixes/zisofs-large-pagesize-read.patch
########################################################
# Swap-over-NFS
########################################################
@ -459,6 +475,8 @@
patches.suse/SoN-29-fix-swap_sync_page-race
patches.suse/SoN-30-fix-uninitialized-var.patch
# don't want to rediff SoN until this gets more testing
patches.suse/slab-handle-memoryless-nodes-v2a.patch
########################################################
# Netfilter
@ -492,37 +510,29 @@
patches.drivers/libata-ata_piix-clear-spurious-IRQ
patches.drivers/libata-ahci-aspire-3810t-noncq
patches.drivers/libata-missing-_SDD-is-not-an-error
# Block layer fixes
patches.fixes/scsi-inquiry-too-short-ratelimit
patches.suse/scsi-netlink-ml
# from scsi-misc
patches.fixes/scsi-fc-class-failfast-bsg-requests
patches.fixes/scsi-add-scsi-target-reset-support-to-ioctl
patches.fixes/scsi-devinfo-update-hitachi-entries
patches.suse/modify-change_queue_depth-to-take-in-reason-why-it-is-being-called.patch
patches.suse/scsi-error-have-scsi-ml-call-change_queue_depth-to-handle-queue_full.patch
patches.suse/add-queue_depth-ramp-up-code.patch
patches.drivers/mpt-fusion-4.22.00.00-update
patches.drivers/hpsa
patches.fixes/scsi-fix-bug-with-dma-maps-on-nested-scsi-objects
patches.fixes/scsi-introduce-helper-function-for-blocking-eh
patches.fixes/scsi-dh-queuedata-accessors
patches.fixes/scsi-dh-alua-retry-UA
patches.fixes/scsi-add-tgps-setting
patches.fixes/scsi-dh-alua-send-stpg
patches.fixes/scsi_dh-change-activate-interface
patches.fixes/scsi_dh-make-rdac-handler-asynchronous
patches.fixes/scsi_dh-make-hp_sw-handler-asynchronous
patches.fixes/scsi_dh-make-alua-handler-asynchronous
patches.fixes/scsi_dh-always-attach-sysfs
patches.fixes/scsi-dh-emc-mode-select-10-size
patches.fixes/scsi-dh-emc-rw-mismatch
patches.fixes/scsi-dh-rdac-add-stk
patches.fixes/scsi-retry-alua-transition-in-progress
patches.suse/fc-transport-allow-dev_loss_tmo-disable
patches.fixes/scsi-check-host-lookup-failure
patches.drivers/aacraid-24701-update
patches.drivers/megaraid-04.12-update
patches.drivers/lpfc-add-raywire-id
patches.drivers/megaraid-mbox-fix-SG_IO
patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
patches.fixes/aic79xx-null-scb-in-nonpkt-busfree
patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout
# Remaining SCSI patches (garloff)
patches.suse/scsi-error-test-unit-ready-timeout
@ -535,7 +545,7 @@
patches.fixes/sd_liberal_28_sense_invalid.diff
patches.fixes/scsi-ibmvscsi-module_alias.patch
patches.fixes/megaraid_sas-fix-permissions-on-poll_mode_io
patches.fixes/scsi_debug-scale-virtual_gb-with-sector_size-properly
########################################################
# DRM/Video
@ -548,7 +558,7 @@
patches.suse/nameif-track-rename.patch
patches.fixes/tg3-fix-default-wol.patch
patches.drivers/ehea-modinfo.patch
patches.drivers/igb-add-support-for-82576NS-SerDes-adapter.patch
patches.fixes/tehuti-firmware-name
# entropy FATE##307517
patches.drivers/bnx2-entropy-source.patch
@ -558,87 +568,15 @@
patches.drivers/ixgbe-entropy-source.patch
patches.drivers/tg3-entropy-source.patch
patches.drivers/phy-broadcom-bug-fixes-for-sp1.patch
patches.drivers/tg3-update-version-to-3.104.patch
patches.drivers/sky2-add-register-definitions
patches.drivers/sky2-88E8059-support
patches.drivers/sky2-optima-tcp-offload-fix
patches.drivers/sky2-optima-fix-pci-cfg
#FCOE update (fate#306857, fate#306859, bnc#551175)
patches.suse/libfc-fix-typo-in-retry-check-on-received-prli.patch
patches.suse/libfc-fix-ddp-in-fc_fcp-for-0-xid.patch
patches.suse/fcoe-remove-redundant-checking-of-netdev-netdev_ops.patch
patches.suse/libfc-fcoe-don-t-export_symbols-unnecessarily.patch
patches.suse/libfc-remove-unused-fc_lport-pointer-from-fc_fcp_pkt_abort.patch
patches.suse/libfc-fix-wrong-scsi-return-status-under-fc_data_undrun.patch
patches.suse/libfc-lport-fix-minor-documentation-errors.patch
patches.suse/libfc-don-t-warn_on-in-lport_timeout-for-reset-state.patch
patches.suse/libfc-removes-initializing-fc_cpu_order-and-fc_cpu_mask-per-lport.patch
patches.suse/libfc-adds-missing-exch-release-for-accepted-rrq.patch
patches.suse/libfc-removes-unused-disc_work-and-ex_list.patch
patches.suse/fcoe-initialize-return-value-in-fcoe_destroy.patch
patches.suse/fcoe-use-netif_f_fcoe_mtu-flag-to-set-up-max-frame-size-lport-mfs.patch
patches.suse/libfc-fix-frags-in-frame-exceeding-skb_max_frags-in-fc_fcp_send_data.patch
patches.suse/fcoe-call-ndo_fcoe_enable-disable-to-turn-fcoe-feature-on-off-in-lld.patch
patches.suse/libfc-fix-memory-corruption-caused-by-double-frees-and-bad-error-handling.patch
patches.suse/libfc-fix-free-of-fc_rport_priv-with-timer-pending.patch
patches.suse/libfc-convert-to-scsi_track_queue_full.patch
patches.suse/fcoe-libfc-fix-an-libfc-issue-with-queue-ramp-down-in-libfc.patch
patches.suse/libfc-add-queue_depth-ramp-up.patch
patches.suse/fcoe-increase-fcoe_max_lun-to-0xffff-65535.patch
patches.suse/libfc-move-non-common-routines-and-prototypes-out-of-libfc-h.patch
patches.suse/libfc-remove-fc_fcp_complete.patch
patches.suse/libfc-add-libfc-fc_libfc-ch-for-libfc-internal-routines.patch
patches.suse/libfc-move-libfc_init-and-libfc_exit-to-fc_libfc-c.patch
patches.suse/libfc-changes-to-libfc_host_alloc-to-consolidate-initialization-with-allocation.patch
patches.suse/libfc-add-some-generic-npiv-support-routines-to-libfc.patch
patches.suse/libfc-vport-link-handling-and-fc_vport-state-managment.patch
patches.suse/libfc-libfcoe-fdisc-els-for-npiv.patch
patches.suse/libfcoe-fcoe-libfcoe-npiv-support.patch
patches.suse/fcoe-add-a-separate-scsi-transport-template-for-npiv-vports.patch
patches.suse/fcoe-npiv-vport-create-destroy.patch
patches.suse/libfc-rpn_id-is-obsolete-and-unnecessary.patch
patches.suse/libfc-rnn_id-may-be-required-before-rsnn_nn-with-some-switches.patch
patches.suse/libfc-register-symbolic-node-name-rsnn_nn.patch
patches.suse/libfc-register-symbolic-port-name-rspn_id.patch
patches.suse/libfc-combine-name-server-registration-response-handlers.patch
patches.suse/libfc-combine-name-server-registration-request-functions.patch
patches.suse/fcoe-vport-symbolic-name-support.patch
patches.suse/libfc-export-fc-headers.patch
patches.suse/libfc-add-routine-to-copy-data-from-a-buffer-to-a-sg-list.patch
patches.suse/libfc-fcoe-add-fc-passthrough-support.patch
patches.suse/libfc-formatting-cleanups-across-libfc.patch
patches.suse/libfcoe-formatting-and-comment-cleanups.patch
patches.suse/fcoe-formatting-cleanups-and-commenting.patch
patches.suse/fcoe-libfc-use-single-frame-allocation-api.patch
patches.suse/libfc-reduce-can_queue-for-all-fcp-frame-allocation-failures.patch
patches.suse/libfc-adds-can_queue-ramp-up.patch
patches.suse/libfcoe-allow-fip-to-be-disabled-by-the-driver.patch
patches.suse/libfcoe-fip-use-scsi-host-number-to-identify-debug-messages.patch
patches.suse/libfcoe-fip-allow-fip-receive-to-be-called-from-irq.patch
patches.suse/libfcoe-fip-should-report-link-to-libfc-whether-selected-or-not.patch
patches.suse/libfcoe-don-t-send-els-in-fip-mode-if-no-fcf-selected.patch
patches.suse/fcoe-remove-extra-function-decalrations.patch
patches.suse/fcoe-add-check-to-fail-gracefully-in-bonding-mode.patch
patches.suse/libfc-fix-rnn_id-smashing-skb-payload.patch
patches.suse/libfc-fix-symbolic-name-registrations-smashing-skb-data.patch
patches.suse/libfc-fix-fc_els_resp_type-to-correct-display-of-ct-responses.patch
patches.suse/libfc-add-set_fid-function-to-libfc-template.patch
patches.suse/libfc-add-host-number-to-lport-link-up-down-messages.patch
patches.suse/libfcoe-fcoe-simplify-receive-flogi-response.patch
patches.suse/libfc-register-fc4-features-with-the-fc-switch.patch
patches.suse/fcoe-fix-checking-san-mac-address.patch
patches.suse/fcoe-fix-getting-san-mac-for-vlan-interface.patch
patches.suse/fcoe-fix-setting-lport-s-wwnn-wwpn-to-use-san-mac-address.patch
patches.suse/libfc-do-not-use-did_no_connect-for-pkt-alloc-failures.patch
patches.suse/fcoe-fix-using-vlan-id-in-creating-lport-s-wwwn-wwpn.patch
patches.suse/libfc-fcoe-fixes-for-highmem-skb-linearize-panics.patch
patches.suse/libfc-fix-an-issue-of-pending-exch-es-after-i-f-destroyed-or-rmmod-fcoe.patch
patches.suse/libfcoe-do-not-pad-fip-keep-alive-to-full-frame-size.patch
patches.suse/libfc-fcoe-increase-els-and-ct-timeouts.patch
# qlge patches from 2.6.33 bnc#560420, fate#307130
# These patches are not in 2.6.33 as of -rc3.
patches.drivers/qlge-0025-Add-performance-change-for-non-split-headers.patch
patches.drivers/qlge-0026-Add-firmware-core-dump.patch
patches.drivers/e1000-enhance-frame-fragment-detection.patch
patches.drivers/e1000e-enhance-frame-fragment-detection.patch
########################################################
# Wireless Networking
@ -648,12 +586,6 @@
########################################################
# iSCSI
########################################################
patches.fixes/bnx2i-use-common-iscsi-suspend-queue
patches.fixes/libiscsi-fix-login-text-checks-in-pdu-inject
patches.fixes/libiscsi-check-tmf-state-before-sending-pdu
patches.fixes/libiscsi-add-warm-target-reset-tmf-support
patches.fixes/iscsi-class-modify-handling-of-replacement-time
patches.fixes/iser-set-tgt-and-lu-reset-timeout
########################################################
# PCI and PCI hotplug
@ -677,34 +609,19 @@
########################################################
patches.suse/bootsplash
patches.suse/Cleanup-and-make-boot-splash-work-with-KMS.patch
patches.suse/bootsplash-keep-multiple-data
patches.suse/bootsplash-scaler
patches.drivers/elousb.patch
patches.fixes/input-add-acer-aspire-5710-to-nomux.patch
patches.fixes/hid-fixup-ncr-quirk.patch
patches.drivers/synaptics-hp-clickpad
##########################################################
# Sound
##########################################################
patches.drivers/alsa-sp1-hda-01-select-ibexpeak-handler
patches.drivers/alsa-sp1-hda-02-vectorize-get_empty_pcm_device
patches.drivers/alsa-sp1-hda-03-allow-up-to-4-HDMI
patches.drivers/alsa-sp1-hda-04-convert-intelhdmi-global-references
patches.drivers/alsa-sp1-hda-05-remove-intelhdmi-dependency-on-multiout
patches.drivers/alsa-sp1-hda-06-use-pcm-prepare-callbacks-for-intelhdmi
patches.drivers/alsa-sp1-hda-07-reorder-intelhemi-prepare-callbacks
patches.drivers/alsa-sp1-hda-08-vectorize-intelhdmi
patches.drivers/alsa-sp1-hda-09-get-intelhtemi-max-channels
patches.drivers/alsa-sp1-hda-10-auto-parse-intelhdmi-cvt-pin
patches.drivers/alsa-sp1-hda-11-remove-static-intelhdmi-config
patches.drivers/alsa-sp1-hda-12-reset-pins-idt-codec-free
patches.drivers/alsa-sp1-hda-13-add-reboot-notifier
patches.drivers/alsa-sp1-hda-14-add-missing-export
patches.drivers/alsa-sp1-hda-15-fix-build-warning
patches.drivers/alsa-sp1-hda-16-stac-dual-headphones-fix
patches.drivers/alsa-sp1-hda-17-fix-mute-LED-sync-idt92h383xxx
patches.drivers/alsa-sp1-hda-18-msi-wind-u115-fix
patches.drivers/alsa-sp1-hda-19-cx5047-test-mode-fix
patches.drivers/alsa-sp1-hda-20-fsc-amilo-pi1505-fix
patches.drivers/alsa-sp1-hda-21-hp-dv3-position-fix-quirk
patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix
patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix
patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk
patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix
########################################################
# Other driver fixes
@ -718,8 +635,7 @@
# Allow setting maximum number of raw devices
patches.suse/raw_device_max_minors_param.diff
patches.suse/no-partition-scan
patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array
patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch
########################################################
# Other drivers we have added to the tree
@ -734,6 +650,7 @@
########################################################
patches.suse/dm-emulate-blkrrpart-ioctl
patches.suse/dm-raid45_2.6.27_20081027.patch
patches.suse/dmraid45-dm_dirty_log_create-api-fix
patches.fixes/dm-mpath-reattach-dh
patches.suse/dm-mpath-leastpending-path-update
patches.suse/dm-mpath-accept-failed-paths
@ -742,25 +659,65 @@
patches.fixes/dm-table-switch-to-readonly
patches.suse/dm-mpath-evaluate-request-result-and-sense
patches.fixes/dm-release-map_lock-before-set_disk_ro
patches.suse/dm-mpath-no-activate-for-offlined-paths
patches.suse/dm-mpath-no-partitions-feature
########################################################
# md
########################################################
patches.drivers/8250_pnp-wacom-add
##########################################################
#
# Security stuff
#
##########################################################
##########################################################
# Audit
##########################################################
##########################################################
# AppArmor
##########################################################
patches.apparmor/apparmor.diff
patches.apparmor/apparmor-security-module
patches.apparmor/apparmor-default-lsm
patches.apparmor/apparmor-correct-mapping-of-file-permissions
patches.apparmor/apparmor-turn-auditing-of-ptrace-on
patches.apparmor/apparmor-fix-operator-precidence-issue-in-as_path_link
patches.apparmor/apparmor-explicitly-include-header-files-to-allow-apparmor-to-build-on-powerpc
patches.apparmor/apparmor-ensure-apparmor-enabled-parmater-is-off-if-apparmor-fails-to-initialize
patches.apparmor/apparmor-fix-auditing-of-domain-transitions-to-include-target-profile-information
patches.apparmor/apparmor-fix-c99-violation
patches.apparmor/apparmor-fix-build-failure-on-ia64
patches.apparmor/apparmor-revert-reporting-of-create-to-write-permission
patches.apparmor/apparmor-fix-null-pointer-dereference-oops-in-profile-attachment
patches.apparmor/apparmor-fix-argument-size-missmatch-on-64-bit-builds
patches.apparmor/apparmor-fix-change_profile-failing-lpn401931
patches.apparmor/apparmor-fix-determination-of-forced-audit-messages
patches.apparmor/apparmor-fix-oops-in-auditing-of-the-policy-interface-offset
patches.apparmor/apparmor-fix-profile-attachment-for-regexp-based-profile-names
patches.apparmor/apparmor-return-the-correct-error-codes-on-profile-addition-removal
patches.apparmor/apparmor-fix-oops-in-profile-listing-and-display-full-list
patches.apparmor/apparmor-fix-mapping-of-pux-to-new-internal-permission-format
patches.apparmor/apparmor-fix-change_profile-failure
patches.apparmor/apparmor-fix-profile-namespace-removal
patches.apparmor/apparmor-fix-oops-when-auditing-the-addition-of-profile-namespace
patches.apparmor/apparmor-fix-mediation-of-created-paths-that-look-like-deleted-paths
patches.apparmor/apparmor-fix-file-auditing-when-quiet-is-used
patches.apparmor/apparmor-policy-load-and-replacement-can-fail-to-alloc-mem
patches.apparmor/apparmor-fix-failure-to-audit-change_hat-correctly
patches.apparmor/apparmor-allow-truncation-of-deleted-files
patches.apparmor/apparmor-fix-oops-after-profile-removal
patches.apparmor/apparmor-fix-oops-when-in-apparmor_bprm_set_creds
patches.apparmor/apparmor-fix-cap-audit_caching-preemption-disabling
patches.apparmor/apparmor-fix-refcounting-bug-causing-leak-of-creds-and-oops
patches.apparmor/apparmor-fix-leak-when-profile-transition-table-fails-unpack
patches.apparmor/apparmor-fully-close-race-condition-for-deleted-paths
patches.apparmor/apparmor-missing-unlock
patches.apparmor/ptrace_may_access-fix
patches.apparmor/security-default-lsm
patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use
########################################################
# Address space layout randomization
@ -775,7 +732,10 @@
patches.suse/kdb-ia64
patches.suse/kdb-build-fixes
patches.suse/kdb-x86-build-fixes
patches.suse/kdb_x86_fix_hang.patch
patches.suse/kdb-usb-rework
patches.suse/kdb_fix_ia64_build.patch
patches.suse/kdb_dont_touch_i8042_early.patch
patches.suse/kdb-fix-assignment-from-incompatible-pointer-warnings
########################################################
# Other patches for debugging
@ -788,26 +748,32 @@
########################################################
# Kdump
########################################################
patches.suse/kdump-dump_after_notifier.patch
+needs_update-33 patches.suse/kdump-dump_after_notifier.patch
########################################################
# cgroups
########################################################
patches.suse/cgroup-disable-memory.patch
########################################################
# audit subsystem
########################################################
patches.suse/audit-export-logging.patch
########################################################
# Performance Monitoring, Tracing etc
########################################################
patches.suse/perfmon2.patch
patches.suse/perfmon2_ioctl.patch
patches.suse/perfmon2-remove_syscalls.patch
patches.suse/perfmon2-remove_get_base_syscall_attr.patch
patches.suse/perfmon2_noutrace.patch
+needs_update-33 patches.suse/perfmon2.patch
+needs_update-33 patches.suse/perfmon2_ioctl.patch
+needs_update-33 patches.suse/perfmon2-remove_syscalls.patch
+needs_update-33 patches.suse/perfmon2-remove_get_base_syscall_attr.patch
+needs_update-33 patches.suse/perfmon2_noutrace.patch
patches.fixes/oprofile_bios_ctr.patch
patches.trace/lttng-instrumentation-irq.patch
patches.trace/powerpc-rename-irq-tracing
patches.trace/lttng-instrumentation-softirq.patch
patches.trace/lttng-instrumentation-kernel.patch
patches.trace/lttng-instrumentation-filemap.patch
@ -823,8 +789,6 @@
patches.trace/lttng-instrumentation-fs.patch
patches.trace/lttng-instrumentation-ipc.patch
patches.trace/ftrace-framepointer.diff
patches.trace/utrace-core
+needs_update-32 patches.fixes/nfs-write.c-bug-removal.patch
@ -876,102 +840,115 @@
# re-basing to a newer xen tree.
#
### both uml framebuffer and xen need this one.
patches.xen/add-console-use-vt
+xen_needs_update patches.xen/add-console-use-vt
# split out patches
patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
patches.xen/ipv6-no-autoconf
patches.xen/pci-guestdev
patches.xen/pci-reserve
patches.xen/sfc-driverlink
patches.xen/sfc-resource-driver
patches.xen/sfc-driverlink-conditional
patches.xen/sfc-external-sram
patches.xen/tmem
+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
+xen_needs_update patches.xen/ipv6-no-autoconf
+xen_needs_update patches.xen/pci-guestdev
+xen_needs_update patches.xen/pci-reserve
+xen_needs_update patches.xen/sfc-driverlink
+xen_needs_update patches.xen/sfc-resource-driver
+xen_needs_update patches.xen/sfc-driverlink-conditional
+xen_needs_update patches.xen/sfc-external-sram
+xen_needs_update patches.xen/tmem
# bulk stuff, new files for xen
patches.xen/xen3-auto-xen-arch.diff
patches.xen/xen3-auto-xen-drivers.diff
patches.xen/xen3-auto-include-xen-interface.diff
+xen_needs_update patches.xen/xen3-auto-xen-arch.diff
+xen_needs_update patches.xen/xen3-auto-xen-drivers.diff
+xen_needs_update patches.xen/xen3-auto-include-xen-interface.diff
# kconfig bits for xen
patches.xen/xen3-auto-xen-kconfig.diff
+xen_needs_update patches.xen/xen3-auto-xen-kconfig.diff
# common code changes
patches.xen/xen3-auto-common.diff
patches.xen/xen3-auto-arch-x86.diff
patches.xen/xen3-auto-arch-i386.diff
patches.xen/xen3-auto-arch-x86_64.diff
+xen_needs_update patches.xen/xen3-auto-common.diff
+xen_needs_update patches.xen/xen3-auto-arch-x86.diff
+xen_needs_update patches.xen/xen3-auto-arch-i386.diff
+xen_needs_update patches.xen/xen3-auto-arch-x86_64.diff
# fixups due to upstream Xen parts
patches.xen/xen3-fixup-xen
+xen_needs_update patches.xen/xen3-fixup-xen
patches.xen/sfc-sync-headers
patches.xen/sfc-endianness
+xen_needs_update patches.xen/sfc-set-arch
+xen_needs_update patches.xen/sfc-endianness
# newer changeset backports
# changes outside arch/{i386,x86_64}/xen
patches.xen/xen3-fixup-kconfig
patches.xen/xen3-fixup-common
patches.xen/xen3-fixup-arch-x86
+xen_needs_update patches.xen/xen3-fixup-kconfig
+xen_needs_update patches.xen/xen3-fixup-common
+xen_needs_update patches.xen/xen3-fixup-arch-x86
# ports of other patches
patches.xen/xen3-patch-2.6.18
patches.xen/xen3-patch-2.6.19
patches.xen/xen3-patch-2.6.20
patches.xen/xen3-patch-2.6.21
patches.xen/xen3-patch-2.6.22
patches.xen/xen3-patch-2.6.23
patches.xen/xen3-patch-2.6.24
patches.xen/xen3-patch-2.6.25
patches.xen/xen3-patch-2.6.26
patches.xen/xen3-patch-2.6.27
patches.xen/xen3-patch-2.6.28
patches.xen/xen3-patch-2.6.29
patches.xen/xen3-patch-2.6.30
patches.xen/xen3-patch-2.6.31
patches.xen/xen3-patch-2.6.32-rc4
patches.xen/xen3-patch-2.6.32-rc4-rc5
patches.xen/xen3-patch-2.6.32-rc5-rc6
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-kdb-x86
patches.xen/xen3-stack-unwind
patches.xen/xen3-x86_64-unwind-annotations
+xen_needs_update patches.xen/xen3-patch-2.6.18
+xen_needs_update patches.xen/xen3-patch-2.6.19
+xen_needs_update patches.xen/xen3-patch-2.6.20
+xen_needs_update patches.xen/xen3-patch-2.6.21
+xen_needs_update patches.xen/xen3-patch-2.6.22
+xen_needs_update patches.xen/xen3-patch-2.6.23
+xen_needs_update patches.xen/xen3-patch-2.6.24
+xen_needs_update patches.xen/xen3-patch-2.6.25
+xen_needs_update patches.xen/xen3-patch-2.6.26
+xen_needs_update patches.xen/xen3-patch-2.6.27
+xen_needs_update patches.xen/xen3-patch-2.6.28
+xen_needs_update patches.xen/xen3-patch-2.6.29
+xen_needs_update patches.xen/xen3-patch-2.6.30
+xen_needs_update patches.xen/xen3-patch-2.6.31
+xen_needs_update patches.xen/xen3-patch-2.6.32
+xen_needs_update patches.xen/xen3-patch-2.6.32.1-2
+xen_needs_update patches.xen/xen3-patch-2.6.32.2-3
+xen_needs_update patches.xen/xen3-patch-2.6.32.3-4
+xen_needs_update patches.xen/xen3-seccomp-disable-tsc-option
+xen_needs_update patches.xen/xen3-x86-mcp51-no-dac
+xen_needs_update patches.xen/xen3-x86-64-preserve-large-page-mapping-for-1st-2mb-kernel-txt-with-config_debug_rodata
+xen_needs_update patches.xen/xen3-x86-64-align-rodata-kernel-section-to-2mb-with-config_debug_rodata
+xen_needs_update patches.xen/xen3-x86-mark_rodata_rw.patch
+xen_needs_update patches.xen/xen3-x86-Remove-CPU-cache-size-output-for-non-Intel-too.patch
+xen_needs_update patches.xen/xen3-x86-cpu-mv-display_cacheinfo-cpu_detect_cache_sizes.patch
+xen_needs_update patches.xen/xen3-x86-Limit-the-number-of-processor-bootup-messages.patch
+xen_needs_update patches.xen/xen3-vmw_pvscsi-scsi-driver-for-vmware-s-virtual-hba.patch
+xen_needs_update patches.xen/xen3-kdb-x86
+xen_needs_update patches.xen/xen3-stack-unwind
+xen_needs_update patches.xen/xen3-x86_64-unwind-annotations
# bugfixes and enhancements
patches.xen/xen-balloon-max-target
patches.xen/xen-modular-blktap
patches.xen/xen-blkback-bimodal-suse
patches.xen/xen-blkif-protocol-fallback-hack
patches.xen/xen-blkback-cdrom
patches.xen/xen-blktap-write-barriers
patches.xen/xen-scsifront-block-timeout-update
patches.xen/xen-op-packet
patches.xen/xen-blkfront-cdrom
patches.xen/xen-sections
patches.xen/xen-swiotlb-heuristics
patches.xen/xen-kconfig-compat
patches.xen/xen-cpufreq-report
patches.xen/xen-staging-build
patches.xen/xen-sysdev-suspend
patches.xen/xen-ipi-per-cpu-irq
patches.xen/xen-virq-per-cpu-irq
patches.xen/xen-configurable-guest-devices
patches.xen/xen-netback-nr-irqs
patches.xen/xen-netback-notify-multi
patches.xen/xen-unpriv-build
patches.xen/xen-x86-panic-no-reboot
patches.xen/xen-x86-dcr-fallback
patches.xen/xen-x86-consistent-nmi
patches.xen/xen-x86-no-lapic
patches.xen/xen-x86-pmd-handling
patches.xen/xen-x86-bigmem
patches.xen/xen-x86-machphys-prediction
patches.xen/xen-x86-exit-mmap
patches.xen/xen-x86-per-cpu-vcpu-info
patches.xen/xen-x86_64-pgd-pin
patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-dump-user-pgt
patches.xen/xen-x86_64-note-init-p2m
+xen_needs_update patches.xen/xen-balloon-max-target
+xen_needs_update patches.xen/xen-modular-blktap
+xen_needs_update patches.xen/xen-blkback-bimodal-suse
+xen_needs_update patches.xen/xen-blkif-protocol-fallback-hack
+xen_needs_update patches.xen/xen-blkback-cdrom
+xen_needs_update patches.xen/xen-blktap-write-barriers
+xen_needs_update patches.xen/xen-op-packet
+xen_needs_update patches.xen/xen-blkfront-cdrom
+xen_needs_update patches.xen/xen-sections
+xen_needs_update patches.xen/xen-swiotlb-heuristics
+xen_needs_update patches.xen/xen-kconfig-compat
+xen_needs_update patches.xen/xen-cpufreq-report
+xen_needs_update patches.xen/xen-staging-build
+xen_needs_update patches.xen/xen-sysdev-suspend
+xen_needs_update patches.xen/xen-ipi-per-cpu-irq
+xen_needs_update patches.xen/xen-virq-per-cpu-irq
+xen_needs_update patches.xen/xen-spinlock-poll-early
+xen_needs_update patches.xen/xen-configurable-guest-devices
+xen_needs_update patches.xen/xen-netback-nr-irqs
+xen_needs_update patches.xen/xen-netback-notify-multi
+xen_needs_update patches.xen/xen-pciback-sriov
+xen_needs_update patches.xen/xen-unpriv-build
+xen_needs_update patches.xen/xen-vmalloc_32
+xen_needs_update patches.xen/xen-dcdbas
+xen_needs_update patches.xen/xen-privcmd-mmap-batch-clear
+xen_needs_update patches.xen/xen-x86-panic-no-reboot
+xen_needs_update patches.xen/xen-x86-dcr-fallback
+xen_needs_update patches.xen/xen-x86-consistent-nmi
+xen_needs_update patches.xen/xen-x86-no-lapic
+xen_needs_update patches.xen/xen-x86-pmd-handling
+xen_needs_update patches.xen/xen-x86-bigmem
+xen_needs_update patches.xen/xen-x86-machphys-prediction
+xen_needs_update patches.xen/xen-x86-exit-mmap
+xen_needs_update patches.xen/xen-x86-per-cpu-vcpu-info
+xen_needs_update patches.xen/xen-x86_64-pgd-pin
+xen_needs_update patches.xen/xen-x86_64-pgd-alloc-order
+xen_needs_update patches.xen/xen-x86_64-dump-user-pgt
+xen_needs_update patches.xen/xen-x86_64-note-init-p2m

View File

@ -1,3 +1,3 @@
2009-12-04 00:41:46 +0100
GIT Revision: 4070eecb55553914dd7cf49aeb8a589df281e7d9
2010-01-27 14:55:38 +0100
GIT Revision: 2b3dccc0787e3003e55784678dcf8aa5c6503f95
GIT Branch: master

View File

@ -43,6 +43,8 @@
kernel/arch/s390/kvm/kvm
kernel/arch/x86/crypto/aes-i586 # Rijndael (AES) Cipher Algorithm (optimized for i586)
kernel/arch/x86/crypto/aes-x86_64
kernel/arch/x86/crypto/aesni-intel
kernel/arch/x86/crypto/ghash-clmulni-intel external # fate #306883
kernel/arch/x86/crypto/salsa20-i586
kernel/arch/x86/crypto/salsa20-x86_64
kernel/arch/x86/crypto/twofish-i586
@ -58,6 +60,7 @@
- kernel/arch/x86/kernel/cpu/cpufreq/powernow-k6
- kernel/arch/x86/kernel/cpu/cpufreq/powernow-k7
kernel/arch/x86/kernel/cpu/cpufreq/powernow-k8 # AMD Athlon 64 and Opteron processor frequency driver.
kernel/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq # HP's PCC cpufreq driver -> fate#306746
kernel/arch/x86/kernel/cpu/cpufreq/speedstep-centrino
- kernel/arch/x86/kernel/cpu/cpufreq/speedstep-ich
kernel/arch/x86/kernel/cpu/cpufreq/speedstep-lib
@ -69,8 +72,9 @@
kernel/arch/x86/kvm/kvm
kernel/arch/x86/kvm/kvm-amd
kernel/arch/x86/kvm/kvm-intel
kernel/arch/x86/oprofile/oprofile
kernel/arch/x86/oprofile/oprofile # OProfile system profiler
kernel/arch/x86/kernel/cpu/mcheck/mce-inject # Needed for Intel MCE/RAS testing
mm/hwpoison-inject # Needed for Intel MCE/RAS testing
kernel/crypto/aead
kernel/crypto/aes_generic
kernel/crypto/anubis
@ -143,6 +147,7 @@
+base kernel/drivers/acpi/dock # Be careful: libata depends on it
kernel/drivers/acpi/fan # ACPI Fan Driver
kernel/drivers/acpi/pci_slot
kernel/drivers/acpi/power_meter # ACPI Power Meter Driver
kernel/drivers/acpi/processor # ACPI Processor Driver
kernel/drivers/acpi/sbs
kernel/drivers/acpi/sbshc
@ -688,6 +693,7 @@
kernel/drivers/input/keyboard/sunkbd # Sun keyboard driver
kernel/drivers/input/keyboard/twl4030_keypad
kernel/drivers/input/keyboard/xtkbd # XT keyboard driver
kernel/drivers/input/sparse-keymap
kernel/drivers/input/misc/apanel
kernel/drivers/input/misc/ati_remote
kernel/drivers/input/misc/ati_remote2
@ -811,6 +817,7 @@
- kernel/drivers/macintosh/mol/sheep
kernel/drivers/md/dm-crypt # device-mapper target for transparent encryption / decryption
kernel/drivers/md/dm-delay
kernel/drivers/md/dm-log-userspace
kernel/drivers/md/dm-log
kernel/drivers/md/dm-memcache
kernel/drivers/md/dm-message
@ -819,7 +826,7 @@
kernel/drivers/md/dm-multipath # device-mapper multipath target
kernel/drivers/md/dm-raid45
kernel/drivers/md/dm-regions
kernel/drivers/md/dm-region_hash
kernel/drivers/md/dm-region-hash
kernel/drivers/md/dm-round-robin # Round-robin path selector
kernel/drivers/md/dm-least-pending
kernel/drivers/md/dm-queue-length # Queue-lenght oriented dynamic load balancer
@ -943,6 +950,7 @@
- kernel/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget # TTUSB DVB Driver
- kernel/drivers/media/dvb/ttusb-dec/ttusbdecfe
- kernel/drivers/media/dvb/ttusb-dec/ttusb_dec # TechnoTrend/Hauppauge DEC USB
kernel/drivers/media/IR/ir-core
kernel/drivers/media/radio/dsbr100
+isa kernel/drivers/media/radio/radio-aimslab
+isa kernel/drivers/media/radio/radio-aztech
@ -1022,6 +1030,7 @@
kernel/drivers/media/video/m52790
kernel/drivers/media/video/meye
kernel/drivers/media/video/msp3400 # device driver for msp34xx TV sound processor
kernel/drivers/media/video/soc_mediabus
kernel/drivers/media/video/mt9m001
kernel/drivers/media/video/mt9v022
kernel/drivers/media/video/mxb # video4linux-2 driver for the Siemens-Nixdorf 'Multimedia eXtension board'
@ -1343,6 +1352,7 @@
kernel/drivers/net/macvlan
kernel/drivers/net/mii # MII hardware support library
kernel/drivers/net/mlx4/mlx4_core
kernel/drivers/net/mlx4/mlx4_en
kernel/drivers/net/mv643xx_eth # gigabit Pegasos2, all chips share the same MAC
kernel/drivers/net/myri10ge/myri10ge
kernel/drivers/net/natsemi # National Semiconductor DP8381x series PCI Ethernet driver
@ -1458,6 +1468,7 @@
kernel/drivers/net/via-velocity # VIA Networking Velocity Family Gigabit Ethernet Adapter Driver
kernel/drivers/net/virtio_net
+isa kernel/drivers/net/wan/c101
- kernel/drivers/net/wan/cosa
- kernel/drivers/net/wan/dlci
- kernel/drivers/net/wan/dscc4
- kernel/drivers/net/wan/farsync
@ -1483,25 +1494,16 @@
+isa kernel/drivers/net/wan/z85230
+isa kernel/drivers/net/wd
kernel/drivers/net/wireless/adm8211
- kernel/drivers/net/wireless/airo_cs # Support for Cisco/Aironet 802.11 wireless ethernet cards. This is the module that links the PCMCIA card with the airo module.
- kernel/drivers/net/wireless/airo # Support for Cisco/Aironet 802.11 wireless ethernet cards. Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs.
kernel/drivers/net/wireless/airport
kernel/drivers/net/wireless/ath/ath
kernel/drivers/net/wireless/ath5k/ath5k
kernel/drivers/net/wireless/ath9k/ath9k
kernel/drivers/net/wireless/ath9k/ath9k_hw
kernel/drivers/net/wireless/ath9k/ath9k_common
kernel/drivers/net/wireless/atmel # Support for Atmel at76c50x 802.11 wireless ethernet cards.
kernel/drivers/net/wireless/atmel_cs # Support for Atmel at76c50x 802.11 wireless ethernet cards.
kernel/drivers/net/wireless/atmel_pci # Support for Atmel at76c50x 802.11 wireless ethernet cards.
kernel/drivers/net/wireless/atmel # Support for Atmel at76c50x 802.11 wireless ethernet cards.
- kernel/drivers/net/wireless/b43/b43
- kernel/drivers/net/wireless/b43legacy/b43legacy
kernel/drivers/net/wireless/hermes # Low-level driver helper for Lucent Hermes chipset and Prism II HFA384x wireless MAC controller
- kernel/drivers/net/wireless/hostap/hostap_cs
- kernel/drivers/net/wireless/hostap/hostap # Host AP common routines
- kernel/drivers/net/wireless/hostap/hostap_pci # Support for Intersil Prism2.5-based 802.11 wireless LAN PCI cards.
- kernel/drivers/net/wireless/hostap/hostap_plx # Support for Intersil Prism2-based 802.11 wireless LAN cards (PLX).
+external kernel/drivers/net/wireless/ipw2x00/ipw2100
+external kernel/drivers/net/wireless/ipw2x00/ipw2200
+external kernel/drivers/net/wireless/ipw2x00/libipw
kernel/drivers/net/wireless/iwlwifi/iwl3945
kernel/drivers/net/wireless/iwlwifi/iwlagn
kernel/drivers/net/wireless/iwlwifi/iwlcore
@ -1511,8 +1513,8 @@
kernel/drivers/net/wireless/libertas/usb8xxx
kernel/drivers/net/wireless/mac80211_hwsim
kernel/drivers/net/wireless/netwave_cs
kernel/drivers/net/wireless/orinoco_cs # Driver for PCMCIA Lucent Orinoco, Prism II based and similar wireless cards
kernel/drivers/net/wireless/orinoco # Driver for Lucent Orinoco, Prism II based and similar wireless cards
kernel/drivers/net/wireless/orinoco_cs # Driver for PCMCIA Lucent Orinoco, Prism II based and similar wireless cards
kernel/drivers/net/wireless/orinoco_nortel # Nortel specific Orinoco driver
kernel/drivers/net/wireless/orinoco_pci # Driver for wireless LAN cards using direct PCI interface
kernel/drivers/net/wireless/orinoco_plx # Driver for wireless LAN cards using the PLX9052 PCI bridge
@ -1521,25 +1523,49 @@
kernel/drivers/net/wireless/p54/p54pci
kernel/drivers/net/wireless/p54/p54usb
kernel/drivers/net/wireless/prism54/prism54 # The Prism54 802.11 Wireless LAN adapter
- kernel/drivers/net/wireless/ray_cs # Raylink/WebGear wireless LAN driver
kernel/drivers/net/wireless/rndis_wlan
kernel/drivers/net/wireless/rtl8180
kernel/drivers/net/wireless/rtl8187
kernel/drivers/net/wireless/strip # Starmode Radio IP (STRIP) Device Driver
kernel/drivers/net/wireless/zd1201
kernel/drivers/net/wireless/zd1211rw/zd1211rw
+external kernel/drivers/net/wireless/ipw2x00/ipw2100
+external kernel/drivers/net/wireless/ipw2x00/ipw2200
+external kernel/drivers/net/wireless/ipw2x00/libipw
+isa kernel/drivers/net/wireless/wavelan
+review kernel/drivers/net/wireless/spectrum_cs # Driver for 802.11b cards using RAM-loadable Symbol firmwar
- kernel/drivers/net/wireless/airo # Support for Cisco/Aironet 802.11 wireless ethernet cards. Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs.
- kernel/drivers/net/wireless/airo_cs # Support for Cisco/Aironet 802.11 wireless ethernet cards. This is the module that links the PCMCIA card with the airo module.
- kernel/drivers/net/wireless/arlan
- kernel/drivers/net/wireless/at76c50x-usb
- kernel/drivers/net/wireless/b43/b43
- kernel/drivers/net/wireless/b43legacy/b43legacy
- kernel/drivers/net/wireless/hostap/hostap # Host AP common routines
- kernel/drivers/net/wireless/hostap/hostap_cs
- kernel/drivers/net/wireless/hostap/hostap_pci # Support for Intersil Prism2.5-based 802.11 wireless LAN PCI cards.
- kernel/drivers/net/wireless/hostap/hostap_plx # Support for Intersil Prism2-based 802.11 wireless LAN cards (PLX).
- kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi
- kernel/drivers/net/wireless/libertas/libertas_spi
- kernel/drivers/net/wireless/libertas_tf/libertas_tf
- kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb
- kernel/drivers/net/wireless/mwl8k
- kernel/drivers/net/wireless/p54/p54spi
- kernel/drivers/net/wireless/ray_cs # Raylink/WebGear wireless LAN driver
- kernel/drivers/net/wireless/rt2x00/rt2400pci
- kernel/drivers/net/wireless/rt2x00/rt2500pci
- kernel/drivers/net/wireless/rt2x00/rt2500usb
- kernel/drivers/net/wireless/rt2x00/rt2800usb
- kernel/drivers/net/wireless/rt2x00/rt2x00lib
- kernel/drivers/net/wireless/rt2x00/rt2x00pci
- kernel/drivers/net/wireless/rt2x00/rt2x00usb
- kernel/drivers/net/wireless/rt2x00/rt61pci
- kernel/drivers/net/wireless/rt2x00/rt73usb
kernel/drivers/net/wireless/rtl8180
kernel/drivers/net/wireless/rtl8187
+review kernel/drivers/net/wireless/spectrum_cs # Driver for 802.11b cards using RAM-loadable Symbol firmwar
kernel/drivers/net/wireless/strip # Starmode Radio IP (STRIP) Device Driver
+isa kernel/drivers/net/wireless/wavelan
- kernel/drivers/net/wireless/wavelan_cs
- kernel/drivers/net/wireless/wl12xx/wl1251
- kernel/drivers/net/wireless/wl12xx/wl1251_sdio
- kernel/drivers/net/wireless/wl12xx/wl1251_spi
- kernel/drivers/net/wireless/wl12xx/wl1271
- kernel/drivers/net/wireless/wl3501_cs # Planet wl3501 wireless driver
kernel/drivers/net/wireless/zd1201
kernel/drivers/net/wireless/zd1211rw/zd1211rw
kernel/drivers/net/yellowfin # Packet Engines Yellowfin G-NIC Gigabit Ethernet driver
+isa kernel/drivers/net/znet
kernel/drivers/parport/parport
@ -1558,6 +1584,7 @@
kernel/drivers/pci/hotplug/pci_hotplug # PCI Hot Plug PCI Core
kernel/drivers/pci/hotplug/sgi_hotplug # SGI's PCI Hotplug controller Driver
kernel/drivers/pci/hotplug/shpchp # Standard Hot Plug PCI Controller Driver
kernel/drivers/pci/pcie/aer/aer_inject # fate #306815
kernel/drivers/pcmcia/i82092
+isa kernel/drivers/pcmcia/i82365
kernel/drivers/pcmcia/pcmcia
@ -2462,8 +2489,12 @@
kernel/net/sunrpc/xprtrdma/svcrdma
kernel/net/sunrpc/xprtrdma/xprtrdma
- kernel/net/wanrouter/wanrouter
- kernel/net/wimax/wimax
kernel/net/wireless/cfg80211
kernel/net/wireless/lib80211
kernel/net/wireless/lib80211_crypt_ccmp
kernel/net/wireless/lib80211_crypt_tkip
kernel/net/wireless/lib80211_crypt_wep
- kernel/net/x25/x25 # The X.25 Packet Layer network layer protocol
kernel/net/xfrm/xfrm_ipcomp
kernel/net/xfrm/xfrm_user
@ -2505,6 +2536,7 @@
kernel/sound/drivers/snd-serial-u16550 # MIDI serial u16550
kernel/sound/drivers/snd-virmidi # Dummy soundcard for virtual rawmidi devices
kernel/sound/drivers/vx/snd-vx-lib # Common routines for Digigram VX drivers
kernel/sound/i2c/other/snd-ak4113
kernel/sound/i2c/other/snd-ak4114
+isa kernel/sound/i2c/other/snd-ak4117
kernel/sound/i2c/other/snd-ak4xxx-adda # Routines for control of AK452x / AK43xx AD/DA converters