OBS User unknown 2008-11-11 14:45:48 +00:00 committed by Git OBS Bridge
parent a38fea9eae
commit e5cd00440e
52 changed files with 1859 additions and 286900 deletions

View File

@ -1,2 +1,2 @@
2008-11-08 04:59:08 +0100 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d

View File

@ -1,13 +1,18 @@
# Kernel configuration file selection. # Kernel configuration file selection.
# (See series.conf for a list of symbols defined.) # (See series.conf for a list of symbols defined.)
#
# IMPORTANT: the subdirectory names map to cpuarch
# kernel-binary and kernel-source rely on this
#
+IA32 i386/default +IA32 i386/default
+IA32 i386/pae +IA32 i386/pae
+IA32 i386/debug +IA32 i386/debug
+IA32 i386/xen +IA32 i386/xen
+IA32 i386/vanilla +IA32 i386/vanilla
+IA32 i386/rt +IA32 - i386/rt
+IA32 i386/rt_debug +IA32 - i386/rt_debug
+IA32 i386/trace +IA32 i386/trace
+ia64 ia64/default +ia64 ia64/default
@ -19,8 +24,8 @@
+x86_64 x86_64/xen +x86_64 x86_64/xen
+x86_64 x86_64/debug +x86_64 x86_64/debug
+x86_64 x86_64/vanilla +x86_64 x86_64/vanilla
+x86_64 x86_64/rt +x86_64 - x86_64/rt
+x86_64 x86_64/rt_debug +x86_64 - x86_64/rt_debug
+x86_64 - x86_64/rt_timing +x86_64 - x86_64/rt_timing
+x86_64 x86_64/trace +x86_64 x86_64/trace
@ -37,14 +42,15 @@
+ppc ppc/vanilla +ppc ppc/vanilla
# SLES # SLES
# identical to ppc64 flavor, Rudi wants a kernel-default, even if its unused # identical to ppc64 flavor, all KMP packages need a kernel-default
# Up to now, the openSuSE 11.1 ppc media can not have a
# kernel-default.ppc.rpm and a kernel-default.ppc64.rpm to continue
# supporting 32bit and 64bit systems.
+ppc64 ppc64/default +ppc64 ppc64/default
# pSeries # pSeries
+ppc64 ppc64/kdump +ppc64 ppc64/kdump
# G5 pSeries # G5 pSeries
# The -ppc is temporary to work around the collision between "ppc64" the arch +ppc64 ppc64/ppc64
# and "ppc64" the flavor causing build problems with kernel-ppc64 on ppc.
+ppc64 -ppc ppc64/ppc64
# maybe the kernels above were patched to death? # maybe the kernels above were patched to death?
+ppc64 ppc64/vanilla +ppc64 ppc64/vanilla
# ? # ?

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:c6c4dab779ea09febb97affcb9825e2e91fe7d911e6d5f9b73bf7496f3398aff oid sha256:1dc2e6bec125a31afd72d06d7dde51df12fe5f15f3a3c66c1d42416a06c8af04
size 135106 size 135336

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a7300cd8a5b269457e3b098b9858485451d70a1b104ece2a0cf10573d0a67a70 oid sha256:fc5377d8bab1ae9473d0e781c40fef5826072b7b77f194abbabc49b5f291fc76
size 2268 size 2272

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "debug" %define build_flavor "debug"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-debug debug $(case debug in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-debug $(case debug in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/debug$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/debug$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-debug Name: kernel-debug
Summary: A Debug Version of the Kernel Summary: A Debug Version of the Kernel
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-debug_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-debug-base = %version-%release Requires: kernel-debug-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
%ifarch %ix86 %ifarch %ix86
%else %else
%ifarch ia64 %ifarch ia64
@ -218,8 +208,8 @@ Only use this kernel when investigating problems.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -245,22 +235,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -285,28 +259,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-debug'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-debug'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=debug
SUBARCH=$subarch
MAKE_ARGS="ARCH=debug SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-debug KERNELRELEASE=2.6.27.5-$RELEASE-debug
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -397,11 +359,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -437,8 +394,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -461,7 +416,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-debug suffix=-debug
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -487,12 +442,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/debug # Also put the resulting file in $obj_dir/$cpu_arch/debug
# so that kernel-source + kernel-debug is sufficient for building # so that kernel-source + kernel-debug is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-debug}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-debug}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/debug mkdir -p %buildroot/$obj_dir/$cpu_arch/debug
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/debug cp Module.symvers %buildroot/$obj_dir/$cpu_arch/debug
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -504,18 +459,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-debug ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-debug ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-debug \ %my_builddir/kabi/$cpu_arch/symvers-debug \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -524,7 +473,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-debug -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-debug -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -545,7 +494,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-debug} \ ln -s /usr/src/linux-${KERNELRELEASE%%-debug} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/debug \ ln -s /$obj_dir/$cpu_arch/debug \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -632,7 +581,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-debug.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-debug.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -724,6 +673,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-debug-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -740,8 +690,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -762,13 +712,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-debug = %version-%release Provides: kernel-debug-extra_%_target_cpu = %version-%release
Requires: kernel-debug_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-debug) Supplements: packageand(product(SUSE_SLED):kernel-debug_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-debug) Supplements: packageand(product(openSUSE):kernel-debug_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -781,8 +732,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -798,10 +749,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "default" %define build_flavor "default"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-default default $(case default in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-default $(case default in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/default$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/default$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-default Name: kernel-default
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-default_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-default-base = %version-%release Requires: kernel-default-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
%ifarch %ix86 %ifarch %ix86
Provides: k_athlon k_debug k_deflt k_deflt_22 k_deflt_24 k_eide k_laptop k_orig k_pentiu k_pos_ibm k_psmp k_smp k_smp_22 k_smp_24 smp kernel-smp Provides: k_athlon k_debug k_deflt k_deflt_22 k_deflt_24 k_eide k_laptop k_orig k_pentiu k_pos_ibm k_psmp k_smp k_smp_22 k_smp_24 smp kernel-smp
Obsoletes: k_athlon k_debug k_deflt k_deflt_22 k_deflt_24 k_eide k_laptop k_orig k_pentiu k_pos_ibm k_psmp k_smp k_smp_22 k_smp_24 smp kernel-smp Obsoletes: k_athlon k_debug k_deflt k_deflt_22 k_deflt_24 k_eide k_laptop k_orig k_pentiu k_pos_ibm k_psmp k_smp k_smp_22 k_smp_24 smp kernel-smp
@ -236,8 +226,8 @@ The standard kernel for both uniprocessor and multiprocessor systems.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -263,22 +253,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -303,28 +277,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-default'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-default'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=default
SUBARCH=$subarch
MAKE_ARGS="ARCH=default SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-default KERNELRELEASE=2.6.27.5-$RELEASE-default
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -415,11 +377,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -455,8 +412,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -479,7 +434,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-default suffix=-default
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -505,12 +460,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/default # Also put the resulting file in $obj_dir/$cpu_arch/default
# so that kernel-source + kernel-default is sufficient for building # so that kernel-source + kernel-default is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-default}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-default}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/default mkdir -p %buildroot/$obj_dir/$cpu_arch/default
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/default cp Module.symvers %buildroot/$obj_dir/$cpu_arch/default
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -522,18 +477,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-default ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-default ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-default \ %my_builddir/kabi/$cpu_arch/symvers-default \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -542,7 +491,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-default -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-default -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -563,7 +512,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-default} \ ln -s /usr/src/linux-${KERNELRELEASE%%-default} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/default \ ln -s /$obj_dir/$cpu_arch/default \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -650,7 +599,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-default.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-default.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -742,6 +691,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-default-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -757,8 +707,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -779,13 +729,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-default = %version-%release Provides: kernel-default-extra_%_target_cpu = %version-%release
Requires: kernel-default_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-default) Supplements: packageand(product(SUSE_SLED):kernel-default_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-default) Supplements: packageand(product(openSUSE):kernel-default_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -797,8 +748,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -814,10 +765,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -23,7 +23,7 @@ Url: http://www.kernel.org/
Name: kernel-dummy Name: kernel-dummy
Summary: Internal dummy package for synchronizing release numbers Summary: Internal dummy package for synchronizing release numbers
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
AutoReqProv: off AutoReqProv: off
@ -36,8 +36,8 @@ Authors:
-------- --------
Andreas Gruenbacher <agruen@suse.de> Andreas Gruenbacher <agruen@suse.de>
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%install %install
rm -rf %buildroot rm -rf %buildroot
@ -49,10 +49,47 @@ echo dummy > %buildroot/etc/dummy
/etc/dummy /etc/dummy
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "kdump" %define build_flavor "kdump"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-kdump kdump $(case kdump in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-kdump $(case kdump in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/kdump$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/kdump$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-kdump Name: kernel-kdump
Summary: kernel for kdump Summary: kernel for kdump
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-kdump_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-kdump-base = %version-%release Requires: kernel-kdump-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
%ifarch ppc %ifarch ppc
%else %else
%ifarch ppc64 %ifarch ppc64
@ -217,8 +207,8 @@ crashed kernel.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -244,22 +234,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -284,28 +258,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-kdump'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-kdump'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=kdump
SUBARCH=$subarch
MAKE_ARGS="ARCH=kdump SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-kdump KERNELRELEASE=2.6.27.5-$RELEASE-kdump
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -396,11 +358,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -436,8 +393,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -460,7 +415,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-kdump suffix=-kdump
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -486,12 +441,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/kdump # Also put the resulting file in $obj_dir/$cpu_arch/kdump
# so that kernel-source + kernel-kdump is sufficient for building # so that kernel-source + kernel-kdump is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-kdump}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-kdump}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/kdump mkdir -p %buildroot/$obj_dir/$cpu_arch/kdump
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/kdump cp Module.symvers %buildroot/$obj_dir/$cpu_arch/kdump
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -503,18 +458,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-kdump ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-kdump ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-kdump \ %my_builddir/kabi/$cpu_arch/symvers-kdump \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -523,7 +472,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-kdump -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-kdump -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -544,7 +493,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-kdump} \ ln -s /usr/src/linux-${KERNELRELEASE%%-kdump} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/kdump \ ln -s /$obj_dir/$cpu_arch/kdump \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -631,7 +580,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-kdump.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-kdump.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -723,6 +672,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-kdump-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -741,8 +691,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -763,13 +713,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-kdump = %version-%release Provides: kernel-kdump-extra_%_target_cpu = %version-%release
Requires: kernel-kdump_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-kdump) Supplements: packageand(product(SUSE_SLED):kernel-kdump_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-kdump) Supplements: packageand(product(openSUSE):kernel-kdump_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -784,8 +735,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -801,10 +752,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "pae" %define build_flavor "pae"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-pae pae $(case pae in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-pae $(case pae in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/pae$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/pae$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-pae Name: kernel-pae
Summary: Kernel with PAE Support Summary: Kernel with PAE Support
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-pae_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-pae-base = %version-%release Requires: kernel-pae-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
Provides: k_smp4G kernel-bigsmp Provides: k_smp4G kernel-bigsmp
Obsoletes: k_smp4G kernel-bigsmp Obsoletes: k_smp4G kernel-bigsmp
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
@ -218,8 +208,8 @@ that support it, regardless of the amount of main memory.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -245,22 +235,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -285,28 +259,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-pae'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-pae'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=pae
SUBARCH=$subarch
MAKE_ARGS="ARCH=pae SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-pae KERNELRELEASE=2.6.27.5-$RELEASE-pae
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -397,11 +359,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -437,8 +394,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -461,7 +416,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-pae suffix=-pae
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -487,12 +442,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/pae # Also put the resulting file in $obj_dir/$cpu_arch/pae
# so that kernel-source + kernel-pae is sufficient for building # so that kernel-source + kernel-pae is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-pae}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-pae}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/pae mkdir -p %buildroot/$obj_dir/$cpu_arch/pae
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/pae cp Module.symvers %buildroot/$obj_dir/$cpu_arch/pae
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -504,18 +459,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-pae ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-pae ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-pae \ %my_builddir/kabi/$cpu_arch/symvers-pae \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -524,7 +473,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-pae -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-pae -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -545,7 +494,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-pae} \ ln -s /usr/src/linux-${KERNELRELEASE%%-pae} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/pae \ ln -s /$obj_dir/$cpu_arch/pae \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -632,7 +581,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-pae.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-pae.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -724,6 +673,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-pae-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -746,8 +696,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -768,13 +718,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-pae = %version-%release Provides: kernel-pae-extra_%_target_cpu = %version-%release
Requires: kernel-pae_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-pae) Supplements: packageand(product(SUSE_SLED):kernel-pae_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-pae) Supplements: packageand(product(openSUSE):kernel-pae_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -793,8 +744,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -810,10 +761,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "ppc64" %define build_flavor "ppc64"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-ppc64 ppc64 $(case ppc64 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-ppc64 $(case ppc64 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ppc64$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ppc64$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-ppc64 Name: kernel-ppc64
Summary: Kernel for ppc64 Systems Summary: Kernel for ppc64 Systems
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-ppc64_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-ppc64-base = %version-%release Requires: kernel-ppc64-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
%ifarch ppc %ifarch ppc
Provides: kernel-pmac64 kernel-pseries64 kernel-iseries64 Provides: kernel-pmac64 kernel-pseries64 kernel-iseries64
Obsoletes: kernel-pmac64 kernel-pseries64 kernel-iseries64 Obsoletes: kernel-pmac64 kernel-pseries64 kernel-iseries64
@ -230,8 +220,8 @@ Authors:
Tom Gall <tom_gall@vnet.ibm.com> Tom Gall <tom_gall@vnet.ibm.com>
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -257,22 +247,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -297,28 +271,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-ppc64'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-ppc64'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=ppc64
SUBARCH=$subarch
MAKE_ARGS="ARCH=ppc64 SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-ppc64 KERNELRELEASE=2.6.27.5-$RELEASE-ppc64
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -409,11 +371,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -449,8 +406,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -473,7 +428,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-ppc64 suffix=-ppc64
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -499,12 +454,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/ppc64 # Also put the resulting file in $obj_dir/$cpu_arch/ppc64
# so that kernel-source + kernel-ppc64 is sufficient for building # so that kernel-source + kernel-ppc64 is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-ppc64}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-ppc64}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/ppc64 mkdir -p %buildroot/$obj_dir/$cpu_arch/ppc64
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/ppc64 cp Module.symvers %buildroot/$obj_dir/$cpu_arch/ppc64
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -516,18 +471,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-ppc64 ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-ppc64 ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-ppc64 \ %my_builddir/kabi/$cpu_arch/symvers-ppc64 \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -536,7 +485,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-ppc64 -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-ppc64 -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -557,7 +506,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-ppc64} \ ln -s /usr/src/linux-${KERNELRELEASE%%-ppc64} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/ppc64 \ ln -s /$obj_dir/$cpu_arch/ppc64 \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -644,7 +593,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ppc64.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-ppc64.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -736,6 +685,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-ppc64-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -765,8 +715,8 @@ Authors:
Tom Gall <tom_gall@vnet.ibm.com> Tom Gall <tom_gall@vnet.ibm.com>
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -787,13 +737,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-ppc64 = %version-%release Provides: kernel-ppc64-extra_%_target_cpu = %version-%release
Requires: kernel-ppc64_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-ppc64) Supplements: packageand(product(SUSE_SLED):kernel-ppc64_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-ppc64) Supplements: packageand(product(openSUSE):kernel-ppc64_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -819,8 +770,8 @@ Authors:
Tom Gall <tom_gall@vnet.ibm.com> Tom Gall <tom_gall@vnet.ibm.com>
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -836,10 +787,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "ps3" %define build_flavor "ps3"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-ps3 ps3 $(case ps3 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-ps3 $(case ps3 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ps3$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ps3$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-ps3 Name: kernel-ps3
Summary: kernel for ps3 bootloader Summary: kernel for ps3 bootloader
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-ps3_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-ps3-base = %version-%release Requires: kernel-ps3-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
@ -212,8 +202,8 @@ final system.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -239,22 +229,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -279,28 +253,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-ps3'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-ps3'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=ps3
SUBARCH=$subarch
MAKE_ARGS="ARCH=ps3 SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-ps3 KERNELRELEASE=2.6.27.5-$RELEASE-ps3
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -391,11 +353,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -431,8 +388,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -455,7 +410,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-ps3 suffix=-ps3
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -481,12 +436,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/ps3 # Also put the resulting file in $obj_dir/$cpu_arch/ps3
# so that kernel-source + kernel-ps3 is sufficient for building # so that kernel-source + kernel-ps3 is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-ps3}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-ps3}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/ps3 mkdir -p %buildroot/$obj_dir/$cpu_arch/ps3
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/ps3 cp Module.symvers %buildroot/$obj_dir/$cpu_arch/ps3
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -498,18 +453,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-ps3 ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-ps3 ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-ps3 \ %my_builddir/kabi/$cpu_arch/symvers-ps3 \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -518,7 +467,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-ps3 -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-ps3 -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -539,7 +488,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-ps3} \ ln -s /usr/src/linux-${KERNELRELEASE%%-ps3} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/ps3 \ ln -s /$obj_dir/$cpu_arch/ps3 \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -626,7 +575,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ps3.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-ps3.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -718,6 +667,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-ps3-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -733,8 +683,8 @@ needs to be as small as possible.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -755,13 +705,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-ps3 = %version-%release Provides: kernel-ps3-extra_%_target_cpu = %version-%release
Requires: kernel-ps3_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-ps3) Supplements: packageand(product(SUSE_SLED):kernel-ps3_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-ps3) Supplements: packageand(product(openSUSE):kernel-ps3_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -773,8 +724,8 @@ needs to be as small as possible.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -790,10 +741,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "s390" %define build_flavor "s390"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-s390 s390 $(case s390 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-s390 $(case s390 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/s390$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/s390$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-s390 Name: kernel-s390
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-s390_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-s390-base = %version-%release Requires: kernel-s390-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
Provides: kernel-32bit k_deflt Provides: kernel-32bit k_deflt
Obsoletes: kernel-32bit k_deflt Obsoletes: kernel-32bit k_deflt
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
@ -211,8 +201,8 @@ The standard kernel.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -238,22 +228,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -278,28 +252,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-s390'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-s390'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=s390
SUBARCH=$subarch
MAKE_ARGS="ARCH=s390 SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-s390 KERNELRELEASE=2.6.27.5-$RELEASE-s390
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -390,11 +352,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -430,8 +387,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -454,7 +409,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-s390 suffix=-s390
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -480,12 +435,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/s390 # Also put the resulting file in $obj_dir/$cpu_arch/s390
# so that kernel-source + kernel-s390 is sufficient for building # so that kernel-source + kernel-s390 is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-s390}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-s390}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/s390 mkdir -p %buildroot/$obj_dir/$cpu_arch/s390
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/s390 cp Module.symvers %buildroot/$obj_dir/$cpu_arch/s390
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -497,18 +452,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-s390 ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-s390 ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-s390 \ %my_builddir/kabi/$cpu_arch/symvers-s390 \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -517,7 +466,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-s390 -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-s390 -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -538,7 +487,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-s390} \ ln -s /usr/src/linux-${KERNELRELEASE%%-s390} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/s390 \ ln -s /$obj_dir/$cpu_arch/s390 \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -625,7 +574,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-s390.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-s390.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -717,6 +666,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-s390-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -732,8 +682,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -754,13 +704,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-s390 = %version-%release Provides: kernel-s390-extra_%_target_cpu = %version-%release
Requires: kernel-s390_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-s390) Supplements: packageand(product(SUSE_SLED):kernel-s390_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-s390) Supplements: packageand(product(openSUSE):kernel-s390_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -772,8 +723,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -789,10 +740,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +0,0 @@
# These zero-length files are correct:
addFilter("zero-length /usr/src/linux-2\.6\..*obj/.*include/config.*h")

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -30,7 +30,7 @@ Url: http://www.kernel.org/
Name: kernel-source Name: kernel-source
Summary: The Linux Kernel Sources Summary: The Linux Kernel Sources
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: Development/Sources Group: Development/Sources
AutoReqProv: off AutoReqProv: off
@ -81,12 +81,10 @@ Source53: kernel-kdump.spec
Source54: kernel-pae.spec Source54: kernel-pae.spec
Source55: kernel-ppc64.spec Source55: kernel-ppc64.spec
Source56: kernel-ps3.spec Source56: kernel-ps3.spec
Source57: kernel-rt.spec Source57: kernel-s390.spec
Source58: kernel-rt_debug.spec Source58: kernel-trace.spec
Source59: kernel-s390.spec Source59: kernel-vanilla.spec
Source60: kernel-trace.spec Source60: kernel-xen.spec
Source61: kernel-vanilla.spec
Source62: kernel-xen.spec
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: patches.arch.tar.bz2 Source101: patches.arch.tar.bz2
Source102: patches.drivers.tar.bz2 Source102: patches.drivers.tar.bz2
@ -121,8 +119,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -186,11 +184,7 @@ cat > %my_builddir/kernel-source.files <<EOF
/lib/modules/* /lib/modules/*
EOF EOF
for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep -v vanilla); do for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep -v vanilla); do
arch=${config%/*} cpu_arch=${config%/*}
# build a 32bit and 64bit vanilla kernel
case "$arch" in
ppc|ppc64) arch=powerpc ;;
esac
flavor=${config#*/} flavor=${config#*/}
config=%_builddir/%buildsubdir/config/$config config=%_builddir/%buildsubdir/config/$config
case "$flavor" in case "$flavor" in
@ -209,18 +203,13 @@ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep -v
<(%_sourcedir/guards $* %symbols < %_sourcedir/series.conf) \ <(%_sourcedir/guards $* %symbols < %_sourcedir/series.conf) \
|| continue || continue
# source_tree=linux-$KERNELRELEASE$variant # source_tree=linux-$KERNELRELEASE$variant
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant-obj/$arch/$flavor o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant-obj/$cpu_arch/$flavor
mkdir -p $o mkdir -p $o
cat $config \ cat $config \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-$flavor'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-$flavor'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
> $o/.config > $o/.config
case $flavor in MAKE_ARGS="O=$o"
um)
MAKE_ARGS="ARCH=$flavor SUBARCH=$arch O=$o" ;;
*)
MAKE_ARGS="ARCH=$arch O=$o" ;;
esac
# Works around a "fix" in mainline that ends up causing the makefile # Works around a "fix" in mainline that ends up causing the makefile
# to not be regenerated. # to not be regenerated.
echo "Automatically" > $o/Makefile echo "Automatically" > $o/Makefile
@ -254,10 +243,6 @@ rm -f linux-$KERNELRELEASE$variant/.patches
cd $RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant-obj cd $RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant-obj
set -- * set -- *
[ -e %_target_cpu ] || ln -s $1 %_target_cpu [ -e %_target_cpu ] || ln -s $1 %_target_cpu
%ifarch ppc ppc64
[ -e ppc ] || ln -s $1 ppc
[ -e ppc64 ] || ln -s $1 ppc64
%endif
cd $RPM_BUILD_ROOT/usr/src cd $RPM_BUILD_ROOT/usr/src
rm -f `find linux-$KERNELRELEASE$variant -name ".gitignore"` rm -f `find linux-$KERNELRELEASE$variant -name ".gitignore"`
# Remove $RPM_BUILD_ROOT prefix from symlinks. # Remove $RPM_BUILD_ROOT prefix from symlinks.
@ -291,10 +276,47 @@ sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
%files -f kernel-source.files %files -f kernel-source.files
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -29,7 +29,7 @@ Url: http://www.kernel.org/
Name: kernel-syms Name: kernel-syms
Summary: Kernel Symbol Versions (modversions) Summary: Kernel Symbol Versions (modversions)
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: Development/Sources Group: Development/Sources
AutoReqProv: off AutoReqProv: off
@ -94,8 +94,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
echo "Architecture symbol(s):" %symbols echo "Architecture symbol(s):" %symbols
@ -152,10 +152,47 @@ done
/lib/modules/*/build /lib/modules/*/build
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "trace" %define build_flavor "trace"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-trace trace $(case trace in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-trace $(case trace in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/trace$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/trace$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-trace Name: kernel-trace
Summary: The Realtime Linux Kernel Summary: The Realtime Linux Kernel
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-trace_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-trace-base = %version-%release Requires: kernel-trace-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
%ifarch %ix86 %ifarch %ix86
%else %else
%ifarch ia64 %ifarch ia64
@ -223,8 +213,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -250,22 +240,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -290,28 +264,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-trace'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-trace'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=trace
SUBARCH=$subarch
MAKE_ARGS="ARCH=trace SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-trace KERNELRELEASE=2.6.27.5-$RELEASE-trace
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -402,11 +364,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -442,8 +399,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -466,7 +421,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-trace suffix=-trace
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -492,12 +447,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/trace # Also put the resulting file in $obj_dir/$cpu_arch/trace
# so that kernel-source + kernel-trace is sufficient for building # so that kernel-source + kernel-trace is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-trace}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-trace}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/trace mkdir -p %buildroot/$obj_dir/$cpu_arch/trace
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/trace cp Module.symvers %buildroot/$obj_dir/$cpu_arch/trace
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -509,18 +464,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-trace ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-trace ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-trace \ %my_builddir/kabi/$cpu_arch/symvers-trace \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -529,7 +478,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-trace -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-trace -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -550,7 +499,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-trace} \ ln -s /usr/src/linux-${KERNELRELEASE%%-trace} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/trace \ ln -s /$obj_dir/$cpu_arch/trace \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -637,7 +586,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-trace.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-trace.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -729,6 +678,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-trace-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -748,8 +698,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -770,13 +720,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-trace = %version-%release Provides: kernel-trace-extra_%_target_cpu = %version-%release
Requires: kernel-trace_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-trace) Supplements: packageand(product(SUSE_SLED):kernel-trace_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-trace) Supplements: packageand(product(openSUSE):kernel-trace_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -792,8 +743,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -809,10 +760,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "vanilla" %define build_flavor "vanilla"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-vanilla vanilla $(case vanilla in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-vanilla $(case vanilla in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/vanilla$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/vanilla$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-vanilla Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-vanilla_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-vanilla-base = %version-%release Requires: kernel-vanilla-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
%ifarch %ix86 %ifarch %ix86
%else %else
%ifarch ia64 %ifarch ia64
@ -233,8 +223,8 @@ The standard kernel - without any SUSE patches
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -260,22 +250,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -300,28 +274,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-vanilla'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-vanilla'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=vanilla
SUBARCH=$subarch
MAKE_ARGS="ARCH=vanilla SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-vanilla KERNELRELEASE=2.6.27.5-$RELEASE-vanilla
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -412,11 +374,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -452,8 +409,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -476,7 +431,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-vanilla suffix=-vanilla
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -502,12 +457,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/vanilla # Also put the resulting file in $obj_dir/$cpu_arch/vanilla
# so that kernel-source + kernel-vanilla is sufficient for building # so that kernel-source + kernel-vanilla is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-vanilla}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-vanilla}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/vanilla mkdir -p %buildroot/$obj_dir/$cpu_arch/vanilla
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/vanilla cp Module.symvers %buildroot/$obj_dir/$cpu_arch/vanilla
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -519,18 +474,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-vanilla ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-vanilla ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-vanilla \ %my_builddir/kabi/$cpu_arch/symvers-vanilla \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -539,7 +488,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-vanilla -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-vanilla -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -560,7 +509,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-vanilla} \ ln -s /usr/src/linux-${KERNELRELEASE%%-vanilla} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/vanilla \ ln -s /$obj_dir/$cpu_arch/vanilla \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -647,7 +596,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-vanilla.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-vanilla.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -739,6 +688,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-vanilla-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -752,8 +702,8 @@ The standard kernel - without any SUSE patches
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -774,13 +724,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-vanilla = %version-%release Provides: kernel-vanilla-extra_%_target_cpu = %version-%release
Requires: kernel-vanilla_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-vanilla) Supplements: packageand(product(SUSE_SLED):kernel-vanilla_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-vanilla) Supplements: packageand(product(openSUSE):kernel-vanilla_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -790,8 +741,8 @@ The standard kernel - without any SUSE patches
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -807,10 +758,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Tue Nov 11 15:15:03 CET 2008 - jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
-------------------------------------------------------------------
Tue Nov 11 13:07:51 CET 2008 - schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
-------------------------------------------------------------------
Tue Nov 11 12:21:50 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
-------------------------------------------------------------------
Tue Nov 11 11:24:33 CET 2008 - teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
-------------------------------------------------------------------
Tue Nov 11 11:24:04 CET 2008 - teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
-------------------------------------------------------------------
Mon Nov 10 22:15:05 CET 2008 - schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
-------------------------------------------------------------------
Mon Nov 10 20:34:50 CET 2008 - olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
-------------------------------------------------------------------
Mon Nov 10 15:34:45 CET 2008 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
-------------------------------------------------------------------
Mon Nov 10 14:42:44 CET 2008 - olh@suse.de
- handle arch differences for cpu and kbuild correctly
-------------------------------------------------------------------
Mon Nov 10 14:06:03 CET 2008 - schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
-------------------------------------------------------------------
Mon Nov 10 11:48:42 CET 2008 - mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
-------------------------------------------------------------------
Mon Nov 10 10:08:10 CET 2008 - sdietrich@suse.de
- config.conf: Suppress RT configurations.
-------------------------------------------------------------------
Sun Nov 9 16:11:43 CET 2008 - jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %symbols.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
@ -6,7 +82,7 @@ Sat Nov 8 04:58:08 CET 2008 - jeffm@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de Sat Nov 8 00:56:12 CET 2008 - gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.

View File

@ -28,7 +28,6 @@
%define build_flavor "xen" %define build_flavor "xen"
%define build_kdump 0 %define build_kdump 0
%define build_xen 0 %define build_xen 0
%define build_um 0
%define build_vanilla 0 %define build_vanilla 0
%if %{build_flavor} == "kdump" %if %{build_flavor} == "kdump"
%define build_kdump 1 %define build_kdump 1
@ -36,19 +35,16 @@
%if %{build_flavor} == "xen" %if %{build_flavor} == "xen"
%define build_xen 1 %define build_xen 1
%endif %endif
%if %{build_flavor} == "um"
%define build_um 1
%endif
%if %{build_flavor} == "vanilla" %if %{build_flavor} == "vanilla"
%define build_vanilla 1 %define build_vanilla 1
%endif %endif
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks})
%define symbols %(set -- kernel-xen xen $(case xen in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- kernel-xen $(case xen in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/xen$') %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/xen$')
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES %define config_vars CONFIG_MODULES
%{expand:%(eval "$(test -n "%subarch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%subarch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{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)}
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
%else %else
@ -63,15 +59,16 @@
Name: kernel-xen Name: kernel-xen
Summary: The Xen Kernel Summary: The Xen Kernel
Version: 2.6.27.5 Version: 2.6.27.5
Release: 1 Release: 2
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: kernel-xen_%_target_cpu = %version-%release
%if %split_packages %if %split_packages
Requires: kernel-xen-base = %version-%release Requires: kernel-xen-base_%_target_cpu = %version-%release
%endif %endif
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
@ -89,9 +86,6 @@ Recommends: kerneloops
%if ! 0%{?opensuse_bs} %if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy BuildRequires: kernel-dummy
%endif %endif
%if %build_um
BuildRequires: libpcap xorg-x11-devel
%endif
%ifarch ia64 %ifarch ia64
# arch/ia64/scripts/unwcheck.py # arch/ia64/scripts/unwcheck.py
BuildRequires: python BuildRequires: python
@ -121,11 +115,7 @@ Conflicts: lvm2 < 2.02.33
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
%if %build_um
#Conflicts: kernel
%else
Provides: kernel = 2.6.27.5-%source_rel Provides: kernel = 2.6.27.5-%source_rel
%endif
%ifarch %ix86 %ifarch %ix86
%else %else
%ifarch x86_64 %ifarch x86_64
@ -217,8 +207,8 @@ unprivileged ("xenU") kernel.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@ -244,22 +234,6 @@ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.27 cd linux-2.6.27
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
# On architectures with a bi-arch or cross compiler, we can compile for
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- %subarch_flavor
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
exit 1
fi
subarch=${1%/*}
# build a 32bit and 64bit vanilla kernel
case "$subarch" in
ppc|ppc64) subarch=powerpc ;;
esac
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -284,28 +258,16 @@ done
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%subarch_flavor \ cat ../config/%cpu_arch_flavor \
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-xen'"' \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-xen'"' \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
%endif %endif
> .config > .config
# We compile for this sub-architecture (i.e., machine architecture): cpu_arch_flavor="%cpu_arch_flavor"
%if %build_um
cat > ../.rpm-defs <<EOF
ARCH=xen
SUBARCH=$subarch
MAKE_ARGS="ARCH=xen SUBARCH=$subarch"
EOF
%else
cat > ../.rpm-defs <<EOF
ARCH=$subarch
SUBARCH=$subarch
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.27.5-$RELEASE-xen KERNELRELEASE=2.6.27.5-$RELEASE-xen
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
@ -396,11 +358,6 @@ add_vmlinux()
chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE
image=vmlinux image=vmlinux
%else %else
%if %build_um
add_vmlinux
chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
# architecture specifics # architecture specifics
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
add_vmlinux --compressed add_vmlinux --compressed
@ -436,8 +393,6 @@ add_vmlinux()
if [ -e init/kerntypes.o ]; then if [ -e init/kerntypes.o ]; then
cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE
fi fi
# end of build_um
%endif
# end of build_kdump # end of build_kdump
%endif %endif
for sub in '-base' '' '-extra'; do for sub in '-base' '' '-extra'; do
@ -460,7 +415,7 @@ for sub in '-base' '' '-extra'; do
%_sourcedir/$script.sh > ../$script$sub.sh %_sourcedir/$script.sh > ../$script$sub.sh
done done
done done
%if %build_kdump || %build_um || %build_xen || %build_vanilla %if %build_kdump || %build_xen || %build_vanilla
suffix=-xen suffix=-xen
%endif %endif
ln -s $image$suffix %buildroot/boot/$image$suffix ln -s $image$suffix %buildroot/boot/$image$suffix
@ -486,12 +441,12 @@ if [ $CONFIG_MODULES = y ]; then
%endif %endif
echo "Consistency check error: please update supported.conf." echo "Consistency check error: please update supported.conf."
fi fi
# Also put the resulting file in $obj_dir/$SUBARCH/xen # Also put the resulting file in $obj_dir/$cpu_arch/xen
# so that kernel-source + kernel-xen is sufficient for building # so that kernel-source + kernel-xen is sufficient for building
# modules that have modversions as well. # modules that have modversions as well.
obj_dir=usr/src/linux-${KERNELRELEASE%%-xen}-obj obj_dir=usr/src/linux-${KERNELRELEASE%%-xen}-obj
mkdir -p %buildroot/$obj_dir/$SUBARCH/xen mkdir -p %buildroot/$obj_dir/$cpu_arch/xen
cp Module.symvers %buildroot/$obj_dir/$SUBARCH/xen cp Module.symvers %buildroot/$obj_dir/$cpu_arch/xen
# Table of types used in exported symbols (for modversion debugging). # Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-$KERNELRELEASE
if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then if [ -s %buildroot/boot/symtypes-$KERNELRELEASE ]; then
@ -503,18 +458,12 @@ if [ $CONFIG_MODULES = y ]; then
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $SUBARCH %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
%ifarch ppc ppc64
[ -e %buildroot/$obj_dir/ppc ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc
[ -e %buildroot/$obj_dir/ppc64 ] \
|| ln -s $SUBARCH %buildroot/$obj_dir/ppc64
%endif
# Check for kABI changes # Check for kABI changes
KABI=0 KABI=0
if [ -e %my_builddir/kabi/$SUBARCH/symvers-xen ]; then if [ -e %my_builddir/kabi/$cpu_arch/symvers-xen ]; then
%_sourcedir/kabi-checks \ %_sourcedir/kabi-checks \
%my_builddir/kabi/$SUBARCH/symvers-xen \ %my_builddir/kabi/$cpu_arch/symvers-xen \
Module.symvers \ Module.symvers \
%my_builddir/kabi/commonsyms \ %my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \ %my_builddir/kabi/usedsyms \
@ -523,7 +472,7 @@ if [ $CONFIG_MODULES = y ]; then
if [ $KABI -gt %tolerate_kabi_changes ]; then if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes." "of %tolerate_kabi_changes. Please try to avoid the kABI changes."
if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-xen -a \ if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-xen -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \ "directory to build this kernel even though its badness is" \
@ -544,7 +493,7 @@ if [ $CONFIG_MODULES = y ]; then
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-xen} \ ln -s /usr/src/linux-${KERNELRELEASE%%-xen} \
%buildroot/lib/modules/$KERNELRELEASE/source %buildroot/lib/modules/$KERNELRELEASE/source
ln -s /$obj_dir/$SUBARCH/xen \ ln -s /$obj_dir/$cpu_arch/xen \
%buildroot/lib/modules/$KERNELRELEASE/build %buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols # Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \ msg="$(/sbin/depmod -F %buildroot/boot/System.map-$KERNELRELEASE \
@ -631,7 +580,7 @@ if [ $CONFIG_MODULES = y ]; then
# - We recompute the symsets in find-provides. Take care to keep the # - We recompute the symsets in find-provides. Take care to keep the
# algorithm the same in both places. # algorithm the same in both places.
## Preserve exports from previous kernels when possible. ## Preserve exports from previous kernels when possible.
#old_symsets=%my_builddir/kabi/$SUBARCH/symsets-xen.tar.gz #old_symsets=%my_builddir/kabi/$cpu_arch/symsets-xen.tar.gz
#[ -e $old_symsets ] || old_symsets= #[ -e $old_symsets ] || old_symsets=
# FIXME: implement # FIXME: implement
symsets=%my_builddir/symsets-$KERNELRELEASE symsets=%my_builddir/symsets-$KERNELRELEASE
@ -723,6 +672,7 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Provides: kernel-xen-base_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
@ -741,8 +691,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -763,13 +713,14 @@ License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on AutoReqProv: on
Requires: kernel-xen = %version-%release Provides: kernel-xen-extra_%_target_cpu = %version-%release
Requires: kernel-xen_%_target_cpu = %version-%release
Requires(pre): coreutils awk Requires(pre): coreutils awk
Requires(post): module-init-tools Requires(post): module-init-tools
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
Requires(post): mkinitrd Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):kernel-xen) Supplements: packageand(product(SUSE_SLED):kernel-xen_%_target_cpu)
Supplements: packageand(product(openSUSE):kernel-xen) Supplements: packageand(product(openSUSE):kernel-xen_%_target_cpu)
%ifarch %ix86 %ifarch %ix86
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
@ -784,8 +735,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2008-11-08 04:59:08 +0100 Source Timestamp: 2008-11-11 15:15:33 +0100
GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49 GIT Revision: 0c4dbead78646d62135106f6712fdcc07ceea24d
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -801,10 +752,47 @@ GIT Revision: 5bd1bbbb0ffe18b03585f7f644eee6b8fa7c9f49
%endif %endif
%changelog %changelog
* Tue Nov 11 2008 jblunck@suse.de
- Update config files: Set NR_CPUS on x86_64 to 128 again.
* Tue Nov 11 2008 schwab@suse.de
- patches.arch/ppc-select: Fix wrong error code from ppc32 select.
* Tue Nov 11 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: also encode the architecture into the
packageand supplements.
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-fix-ata_tf_read_block-overflow: libata:
Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
(bnc#443661).
- patches.drivers/libata-fix-ata_tf_to_lba48-overflow: libata:
Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
(bnc#443661).
* Tue Nov 11 2008 teheo@suse.de
- patches.drivers/libata-pata_sch-slave-poss: pata_sch: slave
devices (bnc#443657).
* Mon Nov 10 2008 schwab@suse.de
- config/ppc/ppc64: Disable 64k pages to work around X server bug.
* Mon Nov 10 2008 olh@suse.de
- rpm/kernel-binary.spec.in: fix variable assignment in last change
* Mon Nov 10 2008 mmarek@suse.cz
- rpm/kernel-binary.spec.in: encode the architecture into
subpackage dependencies (bnc#440961)
* Mon Nov 10 2008 olh@suse.de
- handle arch differences for cpu and kbuild correctly
* Mon Nov 10 2008 schwab@suse.de
- patches.arch/ia64-page-migration. patches.arch/mm-avoid-bad-page-on-lru:
migrade pages off of pages with correctable errors.
* Mon Nov 10 2008 mmarek@suse.cz
- scripts/tar-up.sh: do not generate kernel-source-rt.spec and
kernel-syms-rt.spec if RT is not enabled.
* Mon Nov 10 2008 sdietrich@suse.de
- config.conf: Suppress RT configurations.
* Sun Nov 09 2008 jeffm@suse.de
- config.conf: Removed previous workaround.
- rpm/kernel-binary.spec.in: Remove @FLAVOR@ from %%symbols.
* Sat Nov 08 2008 jeffm@suse.de * Sat Nov 08 2008 jeffm@suse.de
- config.conf: Workaround for kernel-ppc64 on head-ppc. - config.conf: Workaround for kernel-ppc64 on head-ppc.
* Sat Nov 08 2008 gregkh@suse.de * Sat Nov 08 2008 gregkh@suse.de
- Update to the "real" 2.6.25.5. No code changes from what we had - Update to the "real" 2.6.27.5. No code changes from what we had
in our tree previously, with the exception for the version number in our tree previously, with the exception for the version number
change. change.
* Fri Nov 07 2008 bwalle@suse.de * Fri Nov 07 2008 bwalle@suse.de

View File

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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:c35af79c39fd882d4cd229cab75336ea1d7402343c51e43bd0752c64b59948c5 oid sha256:adaf8e5363f186d8ad51ea77b2b2e4a128f857d4a7393b3c3a2212275209985b
size 59333 size 59233

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:5f85a15c6821cb7c730b6be80f185bdeee29f0fc09f9e030eebc5325aa4c56d9 oid sha256:d82bcc7241b85ea7c2ad20abc308e6552008c30816ee93120f534c4da8f06812
size 229848 size 234791

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f2debbefa780de5bdc1697c41379a4f96bb0294f0382b23e60fbbfe848c5184c oid sha256:ba5692f02a2aaf08dd0ca6e83469d09016a1138f4c9f773cd09390a377bca8f2
size 2547524 size 2548427

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:56b60a7c361e51d48e4a14e5500f6b76b2f83b86d55e403399662fb359208a08 oid sha256:e7380a3096f3255c6336f9619becc8857ddd74eda728853390e0571c8494df18
size 111183 size 110974

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:1b620b598c62d1d9d3c237e1b9f6ff7726dba6d0720478abb5c0bba65e9b345c oid sha256:49e1e6812d9ca90ed68ffc7a394677da17fb854410c3afb2a3ef684507a010d4
size 49635 size 49627

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2bfaed04cf73eaebf61d666212d80107bed7bfca2fda1ad4040287e12dec5fc4 oid sha256:08bb4095b510a3e56dbb00e104f7ec1d174107aaa46d174f07263af64b8ff83e
size 1609 size 1606

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:82ea61d96205d7fd0b78a43bc7e0b7d902fedf29c24b2e4acce87a4c718bd9dc oid sha256:3e00e5c7300b473fbae08877f06ed3aa12003c18acba0362aafd08c6a3feb3b7
size 364088 size 364006

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:703a976aeae2f22bff575ec8e893a139b8529a133549c10f802e7763bce06a27 oid sha256:aea44f2e3022347b28260ac4a37ce258bf8500fbb7b8bf25c4fb4280bcb5f722
size 1438445 size 1438283

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:6312bdb433d5ee7de816b631dbb87e33c149a80482d334c0a19004c68ab4d073 oid sha256:494c68094bbd1822394d03f3688914df49f789cad9f07db9a48147821ead9094
size 57856 size 57801

View File

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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:76a7d1ab237f245fdb62db941b5419721221b39d2e76a1e89a5b86af23698817 oid sha256:7bfd2725b44c6351be23ec08f3e9491461636f8bedbf981208411c857bb48db1
size 1485332 size 1485816

View File

@ -110,6 +110,8 @@
patches.fixes/ia64-sparse-fixes.diff patches.fixes/ia64-sparse-fixes.diff
-RT patches.arch/ia64-rwlocks-enable-interrupts -RT patches.arch/ia64-rwlocks-enable-interrupts
patches.fixes/nr-irqs-file patches.fixes/nr-irqs-file
patches.arch/mm-avoid-bad-page-on-lru
patches.arch/ia64-page-migration
######################################################## ########################################################
# i386 # i386
@ -238,6 +240,7 @@
patches.arch/ppc-oprofile-spu-mutex-locking.patch patches.arch/ppc-oprofile-spu-mutex-locking.patch
patches.arch/ppc-clock_gettime-nanoseconds.patch patches.arch/ppc-clock_gettime-nanoseconds.patch
patches.arch/compat-sys-swapcontext patches.arch/compat-sys-swapcontext
patches.arch/ppc-select
######################################################## ########################################################
# PS3 # PS3
@ -726,6 +729,9 @@
patches.drivers/libata-ata_piix-blacklist-double-spin-off patches.drivers/libata-ata_piix-blacklist-double-spin-off
patches.drivers/libata-whitelist-good-bridges patches.drivers/libata-whitelist-good-bridges
patches.drivers/libata-add-and-use-HORKAGE_ATAPI_MOD16_DMA patches.drivers/libata-add-and-use-HORKAGE_ATAPI_MOD16_DMA
patches.drivers/libata-pata_sch-slave-poss
patches.drivers/libata-fix-ata_tf_read_block-overflow
patches.drivers/libata-fix-ata_tf_to_lba48-overflow
# Block layer fixes # Block layer fixes
patches.fixes/block-use-bio_has_data patches.fixes/block-use-bio_has_data