rpm/kernel-source
SHA256
1
0
Fork 0
forked from pool/kernel-source
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=65

Browse Source
This commit is contained in:
OBS User unknown 2009-08-01 09:17:24 +00:00 committed by Git OBS Bridge
parent c0fcf0b3ed
commit 6c317c0df3
48 changed files with 4090 additions and 51691 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS Normal file
View File

@ -0,0 +1 @@

20
arch-symbols
View File

@ -1,5 +1,25 @@
#!/bin/sh #!/bin/sh
#############################################################################
# Copyright (c) 2003-2005,2009 Novell, Inc.
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, contact Novell, Inc.
#
# To contact Novell about this file by physical or electronic mail,
# you may find current contact information at www.novell.com
#############################################################################
# With --list, list all known architectures, otherwise print the generic # With --list, list all known architectures, otherwise print the generic
# name for this architecture (or the one specified on command line). # name for this architecture (or the one specified on command line).

26
config-subst
View File

@ -1,26 +0,0 @@
#!/bin/sh
# Substitute CONFIG_ variables
awk '
function subst(force)
{
if (!done || force) {
if (has_value)
print symbol "=" value
else
print "# " symbol " is not set"
}
done=1
}
BEGIN { symbol = ARGV[1]
if (ARGC == 3) {
has_value=1
value = ARGV[2]
}
split("", ARGV)
}
match($0, "\\<" symbol "\\>") \
{ subst(1) ; next }
{ print }
END { subst(0) }
' "$@"

24
config.conf
View File

@ -1,5 +1,7 @@
# Kernel configuration file selection. # Kernel configuration file selection.
# (See series.conf for a list of symbols defined.) # See the arch-symbols script for a list of symbols defined.
# -syms excludes a flavor from the kernel-syms package (vanilla is excluded
# automatically).
# #
# IMPORTANT: the subdirectory names map to cpuarch # IMPORTANT: the subdirectory names map to cpuarch
@ -10,27 +12,27 @@
+i386 i386/desktop +i386 i386/desktop
+i386 i386/pae +i386 i386/pae
+i386 i386/debug +i386 i386/debug
+i386 i386/xen +i386 - i386/xen
+i386 i386/vanilla +i386 i386/vanilla
+i386 - i386/trace +i386 -syms i386/trace
+ia64 ia64/default +ia64 ia64/default
+ia64 ia64/debug +ia64 -syms ia64/debug
+ia64 ia64/vanilla +ia64 ia64/vanilla
+ia64 ia64/trace +ia64 -syms ia64/trace
+x86_64 x86_64/default +x86_64 x86_64/default
+x86_64 x86_64/desktop +x86_64 x86_64/desktop
+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/trace +x86_64 -syms x86_64/trace
# openSuSE: # openSuSE:
# G3 G4 bPlan # G3 G4 bPlan
+ppc ppc/default +ppc ppc/default
# pSeries # pSeries
+ppc ppc/kdump +ppc -syms ppc/kdump
# G5 PS3 pSeries # G5 PS3 pSeries
+ppc ppc/ppc64 +ppc ppc/ppc64
# PS3 bootloader # PS3 bootloader
@ -45,7 +47,7 @@
# supporting 32bit and 64bit systems. # supporting 32bit and 64bit systems.
+ppc64 ppc64/default +ppc64 ppc64/default
# pSeries # pSeries
+ppc64 ppc64/kdump +ppc64 -syms ppc64/kdump
# G5 pSeries # G5 pSeries
+ppc64 ppc64/ppc64 +ppc64 ppc64/ppc64
+ppc64 ppc64/debug +ppc64 ppc64/debug
@ -53,6 +55,6 @@
+ppc64 ppc64/vanilla +ppc64 ppc64/vanilla
+s390 s390/s390 +s390 s390/s390
+s390x s390/default
+s390 s390/vanilla +s390 s390/vanilla
+s390x s390/vanilla +s390x s390x/default
+s390x s390x/vanilla

4
config.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:81ceb835f0c3cb89f9b6a9ffae08b3d01de027ff597549e2e2fbaad49a1294c3 oid sha256:df76508b19646ac683b1306195509d83707eadf6d87fc8eab2515d3e5a906e8c
size 152846 size 155326

20
guards
View File

@ -1,5 +1,23 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
#############################################################################
# Copyright (c) 2003-2007,2009 Novell, Inc.
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, contact Novell, Inc.
#
# To contact Novell about this file by physical or electronic mail,
# you may find current contact information at www.novell.com
#############################################################################
# #
# Guards: # Guards:
# #

76
kernel-binary.spec.in
View File

@ -17,44 +17,28 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion @SRCVERSION@
%define patchversion @PATCHVERSION@
%define variant @VARIANT@%{nil}
%if %using_buildservice %include %_sourcedir/kernel-spec-macros
# Strip off the build number ("y") from the "x.y" release number
%define source_rel %(release=%release; echo ${release%.*})
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor @FLAVOR@ %define build_flavor @FLAVOR@
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion @SRCVERSION@
%define patchversion @PATCHVERSION@
%define variant @VARIANT@%{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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.)
@ -141,11 +125,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -169,7 +151,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: @ARCHS@ ExclusiveArch: @ARCHS@
@ -207,10 +188,6 @@ Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
@ -233,7 +210,11 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
@ -241,7 +222,7 @@ echo "Symbol(s):" %symbols
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
@ -255,7 +236,7 @@ cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -269,13 +250,15 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
@ -362,6 +345,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -373,6 +357,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -603,7 +588,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -801,4 +786,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-debug.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-debug.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-debug (Version 2.6.30.2) # spec file for package kernel-debug (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor debug %define build_flavor debug
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-debug Name: kernel-debug
Summary: A Debug Version of the Kernel Summary: A Debug Version of the Kernel
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -127,11 +113,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -155,7 +139,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc64 x86_64 ExclusiveArch: %ix86 ia64 ppc64 x86_64
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -190,9 +173,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -213,12 +193,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -229,7 +213,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -240,13 +224,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -317,6 +303,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -328,6 +315,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -533,7 +521,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -738,4 +726,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-default.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-default.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-default (Version 2.6.30.2) # spec file for package kernel-default (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor default %define build_flavor default
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-default Name: kernel-default
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -143,11 +129,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -171,7 +155,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64 ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -206,9 +189,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -228,12 +208,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -244,7 +228,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -255,13 +239,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -332,6 +318,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -343,6 +330,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -548,7 +536,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -751,4 +739,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-desktop.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

83
kernel-desktop.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-desktop (Version 2.6.30.2) # spec file for package kernel-desktop (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor desktop %define build_flavor desktop
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-desktop Name: kernel-desktop
Summary: Kernel optimized for the desktop Summary: Kernel optimized for the desktop
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -127,11 +113,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -155,7 +139,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -190,9 +173,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -206,7 +186,7 @@ This kernel is optimized for the desktop. It is configured for lower latency
and has many of the features that aren't usually used on desktop machines and has many of the features that aren't usually used on desktop machines
disabled. disabled.
This kernel upports up to 64GB of main memory. It requires Physical This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor. processor.
@ -223,12 +203,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -239,7 +223,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -250,13 +234,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -327,6 +313,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -338,6 +325,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -543,7 +531,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -641,7 +629,7 @@ This kernel is optimized for the desktop. It is configured for lower latency
and has many of the features that aren't usually used on desktop machines and has many of the features that aren't usually used on desktop machines
disabled. disabled.
This kernel upports up to 64GB of main memory. It requires Physical This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor. processor.
@ -691,7 +679,7 @@ This kernel is optimized for the desktop. It is configured for lower latency
and has many of the features that aren't usually used on desktop machines and has many of the features that aren't usually used on desktop machines
disabled. disabled.
This kernel upports up to 64GB of main memory. It requires Physical This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor. processor.
@ -768,4 +756,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-kdump.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-kdump.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-kdump (Version 2.6.30.2) # spec file for package kernel-kdump (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor kdump %define build_flavor kdump
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-kdump Name: kernel-kdump
Summary: kernel for kdump Summary: kernel for kdump
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -127,11 +113,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -155,7 +139,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64 ExclusiveArch: ppc ppc64
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -190,9 +173,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -215,12 +195,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -231,7 +215,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -242,13 +226,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -319,6 +305,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -330,6 +317,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -535,7 +523,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -744,4 +732,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-pae.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-pae.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-pae (Version 2.6.30.2) # spec file for package kernel-pae (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor pae %define build_flavor pae
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-pae Name: kernel-pae
Summary: Kernel with PAE Support Summary: Kernel with PAE Support
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -131,11 +117,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -159,7 +143,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ExclusiveArch: %ix86
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -194,9 +177,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -223,12 +203,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -239,7 +223,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -250,13 +234,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -327,6 +313,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -338,6 +325,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -543,7 +531,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -760,4 +748,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-ppc64.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-ppc64.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-ppc64 (Version 2.6.30.2) # spec file for package kernel-ppc64 (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor ppc64 %define build_flavor ppc64
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-ppc64 Name: kernel-ppc64
Summary: Kernel for ppc64 Systems Summary: Kernel for ppc64 Systems
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -131,11 +117,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -159,7 +143,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64 ExclusiveArch: ppc ppc64
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -194,9 +177,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -223,12 +203,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -239,7 +223,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -250,13 +234,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -327,6 +313,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -338,6 +325,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -543,7 +531,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -760,4 +748,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-ps3.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-ps3.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-ps3 (Version 2.6.30.2) # spec file for package kernel-ps3 (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor ps3 %define build_flavor ps3
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-ps3 Name: kernel-ps3
Summary: kernel for ps3 bootloader Summary: kernel for ps3 bootloader
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -127,11 +113,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -155,7 +139,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ExclusiveArch: ppc
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -190,9 +173,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -215,12 +195,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -231,7 +215,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -242,13 +226,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -319,6 +305,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -330,6 +317,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -535,7 +523,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -744,4 +732,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-s390.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-s390.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-s390 (Version 2.6.30.2) # spec file for package kernel-s390 (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor s390 %define build_flavor s390
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-s390 Name: kernel-s390
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -131,11 +117,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -159,7 +143,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390 ExclusiveArch: s390
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -194,9 +177,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -216,12 +196,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -232,7 +216,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -243,13 +227,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -320,6 +306,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -331,6 +318,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -536,7 +524,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -739,4 +727,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-source.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

26
kernel-source.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-source (Version 2.6.30.2) # spec file for package kernel-source (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,21 +18,10 @@
# norootforbuild # norootforbuild
# icecream 0 # icecream 0
%define using_buildservice 0%{?opensuse_bs}
%if %using_buildservice
# Strip off the build number ("y") from the "x.y" release number
%define source_rel %(release=%release; echo ${release%.*})
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
%define srcversion 2.6.30 %define srcversion 2.6.30
%define patchversion 2.6.30.2 %define patchversion 2.6.31-rc4
%define variant %{nil} %define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %include %_sourcedir/kernel-spec-macros
%define kernelrelease %patchversion-%release_major
%define src_install_dir usr/src/linux-%kernelrelease%variant %define src_install_dir usr/src/linux-%kernelrelease%variant
%define obj_install_dir /%src_install_dir-obj %define obj_install_dir /%src_install_dir-obj
%define rpm_install_dir %buildroot%real_install_dir %define rpm_install_dir %buildroot%real_install_dir
@ -40,7 +29,7 @@
Name: kernel-source Name: kernel-source
Summary: The Linux Kernel Sources Summary: The Linux Kernel Sources
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -67,7 +56,6 @@ Source14: series.conf
Source16: guards Source16: guards
Source21: config.conf Source21: config.conf
Source23: supported.conf Source23: supported.conf
Source30: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source37: README.SUSE Source37: README.SUSE
@ -108,11 +96,7 @@ Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
Prefix: /usr/src Prefix: /usr/src
# Build with bash instead of sh as the shell: this turns on bash %(chmod +x %_sourcedir/{guards,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
# extensions like <(...).
%define _buildshell /bin/bash
%define my_builddir %_builddir/%{name}-%{version}
%(chmod +x %_sourcedir/{guards,config-subst,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
%define do_vanilla "%variant" == "" %define do_vanilla "%variant" == ""

27
kernel-source.spec.in
View File

@ -18,25 +18,11 @@
# norootforbuild # norootforbuild
# icecream 0 # icecream 0
%define using_buildservice 0%{?opensuse_bs}
%if %using_buildservice
# Strip off the build number ("y") from the "x.y" release number
%define source_rel %(release=%release; echo ${release%.*})
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
%define srcversion @SRCVERSION@ %define srcversion @SRCVERSION@
%define patchversion @PATCHVERSION@ %define patchversion @PATCHVERSION@
%define variant @VARIANT@%{nil} %define variant @VARIANT@%{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major %include %_sourcedir/kernel-spec-macros
%define src_install_dir usr/src/linux-%kernelrelease%variant %define src_install_dir usr/src/linux-%kernelrelease%variant
%define obj_install_dir /%src_install_dir-obj %define obj_install_dir /%src_install_dir-obj
@ -74,7 +60,6 @@ Source14: series.conf
Source16: guards Source16: guards
Source21: config.conf Source21: config.conf
Source23: supported.conf Source23: supported.conf
Source30: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source37: README.SUSE Source37: README.SUSE
@ -116,13 +101,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
Prefix: /usr/src Prefix: /usr/src
# Build with bash instead of sh as the shell: this turns on bash %(chmod +x %_sourcedir/{guards,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
# extensions like <(...).
%define _buildshell /bin/bash
%define my_builddir %_builddir/%{name}-%{version}
%(chmod +x %_sourcedir/{guards,config-subst,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)

22
kernel-spec-macros Normal file
View File

@ -0,0 +1,22 @@
# This file is included by all the kernel-*.spec files
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
%define using_buildservice 0%{?opensuse_bs}
%define source_rel %release
%if %using_buildservice
# The last digit is a volatile rebuild counter, strip it
%define source_rel %(release=%release; echo ${release%.*})
%endif
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define my_builddir %_builddir/%{name}-%{version}
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source Timestamp: /' %_sourcedir/source-timestamp || :)
# vim: ft=spec

281
kernel-syms.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

26
kernel-syms.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-syms (Version 2.6.30.2) # spec file for package kernel-syms (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,21 +17,12 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs}
%if %using_buildservice
# Strip off the build number ("y") from the "x.y" release number
%define source_rel %(release=%release; echo ${release%.*})
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-syms Name: kernel-syms
Summary: Kernel Symbol Versions (modversions) Summary: Kernel Symbol Versions (modversions)
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -42,7 +33,7 @@ Group: Development/Sources
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: off AutoReqProv: off
BuildRequires: coreutils BuildRequires: coreutils
%ifarch %ix86 ia64 ppc64 x86_64 %ifarch %ix86 ppc64 x86_64
Requires: kernel-debug-devel = %version-%source_rel Requires: kernel-debug-devel = %version-%source_rel
%endif %endif
%ifarch %ix86 ia64 ppc ppc64 s390x x86_64 %ifarch %ix86 ia64 ppc ppc64 s390x x86_64
@ -51,9 +42,6 @@ Requires: kernel-default-devel = %version-%source_rel
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
Requires: kernel-desktop-devel = %version-%source_rel Requires: kernel-desktop-devel = %version-%source_rel
%endif %endif
%ifarch ppc ppc64
Requires: kernel-kdump-devel = %version-%source_rel
%endif
%ifarch %ix86 %ifarch %ix86
Requires: kernel-pae-devel = %version-%source_rel Requires: kernel-pae-devel = %version-%source_rel
%endif %endif
@ -66,12 +54,6 @@ Requires: kernel-ps3-devel = %version-%source_rel
%ifarch s390 %ifarch s390
Requires: kernel-s390-devel = %version-%source_rel Requires: kernel-s390-devel = %version-%source_rel
%endif %endif
%ifarch ia64
Requires: kernel-trace-devel = %version-%source_rel
%endif
%ifarch %ix86 x86_64
Requires: kernel-xen-devel = %version-%source_rel
%endif
Source: README.KSYMS Source: README.KSYMS
Requires: kernel-source%variant = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build

15
kernel-syms.spec.in
View File

@ -17,21 +17,10 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs}
%if %using_buildservice
# Strip off the build number ("y") from the "x.y" release number
%define source_rel %(release=%release; echo ${release%.*})
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
%define variant @VARIANT@%{nil} %define variant @VARIANT@%{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-syms@VARIANT@ Name: kernel-syms@VARIANT@
Summary: Kernel Symbol Versions (modversions) Summary: Kernel Symbol Versions (modversions)
Version: @RPMVERSION@ Version: @RPMVERSION@

281
kernel-trace.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

79
kernel-trace.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-trace (Version 2.6.30.2) # spec file for package kernel-trace (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor trace %define build_flavor trace
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
Name: kernel-trace Name: kernel-trace
Summary: The Realtime Linux Kernel Summary: The Realtime Linux Kernel
Version: 2.6.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -127,11 +113,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -155,9 +139,8 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ia64 ExclusiveArch: %ix86 ia64 x86_64
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
NoSource: 100 NoSource: 100
@ -190,9 +173,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -212,12 +192,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -228,7 +212,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -239,13 +223,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -316,6 +302,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -327,6 +314,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -532,7 +520,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -735,4 +723,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

281
kernel-vanilla.changes
View File

@ -1,3 +1,230 @@
-------------------------------------------------------------------
Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
- Update config files: revert to CONFIG_SND=m and enabled again
CONFIG_SND_DEBUG=y
-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.
-------------------------------------------------------------------
Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
- config.conf: Remove duplicate i386/desktop entry.
-------------------------------------------------------------------
Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
-------------------------------------------------------------------
Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-pcm-*: ALSA PCM fixes
- Fix/enhancement patches backported from ALSA tree
* patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
ALSA: Add new TLV types for dBwith min/max (for usb).
* patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
* patches.drivers/alsa-hda-*: More HD-audio fixes
* patches.drivers/alsa-ice-*: ICE17xx fixes
* patches.drivers/alsa-midi-*: MIDI fixes
* patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
patches.drivers/alsa-ca0106-capture-bufsize-fix,
patches.drivers/alsa-ctxfi
- Update config files.
-------------------------------------------------------------------
Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
subpackage with vmlinux.debug to fix build with new rpm. This
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
-------------------------------------------------------------------
Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
-------------------------------------------------------------------
Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
- config.conf: Re-enabled trace flavor.
-------------------------------------------------------------------
Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
- Update config files: Disabled optimize for size on i386 and x86_64
across all flavors.
-------------------------------------------------------------------
Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc4.
-------------------------------------------------------------------
Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
make %symbols a variable and only use it for selecting patches.
Also drop the RT symbol as there are not rt patches currently.
-------------------------------------------------------------------
Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
- Change the s390(x) config layout so that each arch has its own
subdirectory, as it is done for other archs. s390/vanilla is a
symlink to s390x/vanilla.
-------------------------------------------------------------------
Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
macros to kernel-spec-macros.
-------------------------------------------------------------------
Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
Fix the max capture buffer size (bnc#521890).
-------------------------------------------------------------------
Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
(FATE#306935).
- Update config files.
-------------------------------------------------------------------
Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
These are mainline:
- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
Delete.
- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
Delete.
- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
Delete.
- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
Delete.
- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
Delete.
-------------------------------------------------------------------
Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
These are mainline:
- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
Delete.
- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
-------------------------------------------------------------------
Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
symlink.
-------------------------------------------------------------------
Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
the kernel-syms package. These flavor are often excluded in KMPs,
so excluding them from kernel-syms reduces useless build
dependencies. KMPs can buildrequire kernel-$flavor-devel
explicitely if desired.
-------------------------------------------------------------------
Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
Delete obsolete apparmor patches.
- patches.apparmor/add-path_permission.diff: Delete.
- patches.apparmor/add-security_path_permission: Delete.
- patches.apparmor/apparmor-2.6.25.diff: Delete.
- patches.apparmor/apparmor-audit.diff: Delete.
- patches.apparmor/apparmor-intree.diff: Delete.
- patches.apparmor/apparmor-lsm.diff: Delete.
- patches.apparmor/apparmor-main.diff: Delete.
- patches.apparmor/apparmor-misc.diff: Delete.
- patches.apparmor/apparmor-module_interface.diff: Delete.
- patches.apparmor/apparmor-network.diff: Delete.
- patches.apparmor/apparmor-path_permission: Delete.
- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
- patches.apparmor/apparmor-rlimits.diff: Delete.
- patches.apparmor/d_namespace_path.diff: Delete.
- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
- patches.apparmor/export-security_inode_permission-for-aufs:
Delete.
- patches.apparmor/file-handle-ops.diff: Delete.
- patches.apparmor/fix-complain.diff: Delete.
- patches.apparmor/fix-vfs_rmdir.diff: Delete.
- patches.apparmor/fork-tracking.diff: Delete.
- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
- patches.apparmor/fsetattr.diff: Delete.
- patches.apparmor/remove_suid.diff: Delete.
- patches.apparmor/security-create.diff: Delete.
- patches.apparmor/security-getxattr.diff: Delete.
- patches.apparmor/security-link.diff: Delete.
- patches.apparmor/security-listxattr.diff: Delete.
- patches.apparmor/security-mkdir.diff: Delete.
- patches.apparmor/security-mknod.diff: Delete.
- patches.apparmor/security-readlink.diff: Delete.
- patches.apparmor/security-removexattr.diff: Delete.
- patches.apparmor/security-rename.diff: Delete.
- patches.apparmor/security-rmdir.diff: Delete.
- patches.apparmor/security-setattr.diff: Delete.
- patches.apparmor/security-setxattr.diff: Delete.
- patches.apparmor/security-symlink.diff: Delete.
- patches.apparmor/security-unlink.diff: Delete.
- patches.apparmor/security-xattr-file.diff: Delete.
- patches.apparmor/sysctl-pathname.diff: Delete.
- patches.apparmor/unambiguous-__d_path.diff: Delete.
- patches.apparmor/vfs-getxattr.diff: Delete.
- patches.apparmor/vfs-link.diff: Delete.
- patches.apparmor/vfs-listxattr.diff: Delete.
- patches.apparmor/vfs-mkdir.diff: Delete.
- patches.apparmor/vfs-mknod.diff: Delete.
- patches.apparmor/vfs-notify_change.diff: Delete.
- patches.apparmor/vfs-removexattr.diff: Delete.
- patches.apparmor/vfs-rename.diff: Delete.
- patches.apparmor/vfs-rmdir.diff: Delete.
- patches.apparmor/vfs-setxattr.diff: Delete.
- patches.apparmor/vfs-symlink.diff: Delete.
- patches.apparmor/vfs-unlink.diff: Delete.
-------------------------------------------------------------------
Tue Jul 21 11:18:57 CEST 2009 - npiggin@suse.de
- Update config files for bnc#522686 -- set
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de Mon Jul 20 20:30:41 CEST 2009 - jeffm@suse.de
@ -21,11 +248,25 @@ Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: set LC_COLLATE=C - rpm/split-modules: set LC_COLLATE=C
-------------------------------------------------------------------
Sat Jul 18 03:40:28 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description. - rpm/package-descriptions: Added desktop description.
-------------------------------------------------------------------
Sat Jul 18 03:18:57 CEST 2009 - jeffm@suse.de
- Add -desktop flavors for i386 and x86_64
- Disabled group scheduler and groups
- Disabled optimize for size
- Enabled full preemption
- Set HZ=1000
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
@ -35,6 +276,11 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Enabled full preemption - Enabled full preemption
- Set HZ=1000 - Set HZ=1000
-------------------------------------------------------------------
Fri Jul 17 17:10:19 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: ia64 build fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
@ -57,6 +303,23 @@ Thu Jul 16 22:50:13 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor. - patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 22:44:02 CEST 2009 - jeffm@suse.de
- patches.apparmor/apparmor.diff: AppArmor.
-------------------------------------------------------------------
Thu Jul 16 20:15:59 CEST 2009 - jeffm@suse.de
- patches.rpmify/sgi-hotplug-fixup: hotplug: fix sgi-hotplug
attribute handling.
-------------------------------------------------------------------
Thu Jul 16 16:53:35 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: drop the config-subst script, use
scripts/config instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz Thu Jul 16 13:19:19 CEST 2009 - mmarek@suse.cz
@ -73,6 +336,12 @@ Wed Jul 15 22:40:58 CEST 2009 - mmarek@suse.cz
- rpm/split-modules: fix for module names with underscores or - rpm/split-modules: fix for module names with underscores or
dashes. dashes.
-------------------------------------------------------------------
Wed Jul 15 22:33:07 CEST 2009 - jeffm@suse.de
- Update to 2.6.31-rc3.
- Eliminated 2 patches.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz Wed Jul 15 17:10:29 CEST 2009 - mmarek@suse.cz
@ -124,6 +393,18 @@ Tue Jul 7 12:03:10 CEST 2009 - aj@suse.de
- README.BRANCH: Update, kotd will become 11.2 eventually. - README.BRANCH: Update, kotd will become 11.2 eventually.
-------------------------------------------------------------------
Mon Jul 6 21:36:35 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc2.
-------------------------------------------------------------------
Fri Jul 3 22:32:24 CEST 2009 - jeffm@suse.com
- Update to 2.6.31-rc1-git10.
- Eliminated 28 patches.
- Xen is disabled.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz Fri Jul 3 15:41:08 CEST 2009 - mmarek@suse.cz

77
kernel-vanilla.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-vanilla (Version 2.6.30.2) # spec file for package kernel-vanilla (Version 2.6.31)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,37 +17,23 @@
# norootforbuild # norootforbuild
%define using_buildservice 0%{?opensuse_bs} %define srcversion 2.6.30
%if %using_buildservice %define patchversion 2.6.31-rc4
# Strip off the build number ("y") from the "x.y" release number %define variant %{nil}
%define source_rel %(release=%release; echo ${release%.*}) %include %_sourcedir/kernel-spec-macros
%else
# We don't have build numbers internally
%define source_rel %release
%endif
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor vanilla %define build_flavor vanilla
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen") %define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3") %define build_ps3 (%build_flavor == "ps3")
%define srcversion 2.6.30
%define patchversion 2.6.30.2
%define variant %{nil}
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion %define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant %define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj %define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) %(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define cpu_arch_flavor %cpu_arch/%build_flavor
%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
# 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 CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@ -61,7 +47,7 @@
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.30.2 Version: 2.6.31
Release: 1 Release: 1
%if %using_buildservice %if %using_buildservice
%else %else
@ -135,11 +121,9 @@ Source11: postun.sh
Source12: pre.sh Source12: pre.sh
Source13: post.sh Source13: post.sh
Source20: series.conf Source20: series.conf
Source21: config.conf
Source22: supported.conf Source22: supported.conf
Source30: arch-symbols Source30: arch-symbols
Source31: guards Source31: guards
Source32: config-subst
Source33: check-for-config-changes Source33: check-for-config-changes
Source34: check-supported-list Source34: check-supported-list
Source40: source-timestamp Source40: source-timestamp
@ -163,7 +147,6 @@ Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2 Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2 Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2 Source120: kabi.tar.bz2
%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64 ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@ -198,9 +181,6 @@ Obsoletes: ivtv-kmp
Obsoletes: at76_usb-kmp Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp Obsoletes: btusb-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash" # Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name %define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)? # Will modules not listed in supported.conf abort the kernel build (0/1)?
@ -220,12 +200,16 @@ if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1
fi fi
echo "Symbol(s):" %symbols SYMBOLS=%name
if test -e %_sourcedir/extra-symbols; then
SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
fi
echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches # Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir mkdir -p %kernel_build_dir
supported_conf() { supported_conf() {
%_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u sed 's,.*/,,; s,\.ko$,,' | sort -u
} }
# Generate the list of modules to be marked as supported # Generate the list of modules to be marked as supported
@ -236,7 +220,7 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion cd linux-%srcversion
# Apply patches # Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ %_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla %if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \ egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif %endif
@ -247,13 +231,15 @@ cd %kernel_build_dir
if [ -f %_sourcedir/localversion ] ; then if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion cat %_sourcedir/localversion > localversion
fi fi
cat ../config/%cpu_arch_flavor \ cp ../config/%cpu_arch_flavor .config
| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ %build_src_dir/scripts/config \
| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ --enable CONFIG_DEBUG_INFO
%else
--disable CONFIG_DEBUG_INFO
%endif %endif
> .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS yes '' | make oldconfig $MAKE_ARGS
@ -324,6 +310,7 @@ add_vmlinux()
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux -l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \ objcopy --only-keep-debug \
%buildroot/$vmlinux \ %buildroot/$vmlinux \
%buildroot/$vmlinux_debug || : %buildroot/$vmlinux_debug || :
@ -335,6 +322,7 @@ add_vmlinux()
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else %else
cp vmlinux %buildroot/$vmlinux cp vmlinux %buildroot/$vmlinux
%endif %endif
@ -540,7 +528,7 @@ if [ %CONFIG_MODULES = y ]; then
%rpm_install_dir/%cpu_arch_flavor/Makefile %rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link") target=$(readlink "$link")
target=${target#%build_src_dir} target=${target#%build_src_dir/}
rm "$link" rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi fi
@ -743,4 +731,17 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif %endif
%endif %endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

50239
kernel-xen.changes
View File

File diff suppressed because it is too large Load Diff

747
kernel-xen.spec
View File

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

14
mkspec
View File

@ -17,6 +17,8 @@ GetOptions(
# flavor -> [supported archs] # flavor -> [supported archs]
my %flavor_archs = parse_config_conf(); my %flavor_archs = parse_config_conf();
# subset to include in kernel-syms
my %syms_flavor_archs = parse_config_conf("syms");
# template name -> template body # template name -> template body
my %templates = read_spec_templates(); my %templates = read_spec_templates();
@ -59,7 +61,6 @@ my %macros = (
# binary spec files # binary spec files
for my $flavor (sort keys(%flavor_archs)) { for my $flavor (sort keys(%flavor_archs)) {
$flavor_archs{$flavor} = [sort @{$flavor_archs{$flavor}}];
my ($summary, $description); my ($summary, $description);
if (!exists($binary_descriptions{"kernel-$flavor"})) { if (!exists($binary_descriptions{"kernel-$flavor"})) {
print STDERR "warning: no description for kernel-$flavor found\n"; print STDERR "warning: no description for kernel-$flavor found\n";
@ -84,9 +85,9 @@ do_spec('source', "kernel-source$variant.spec", %macros);
# kernel-syms.spec # kernel-syms.spec
{ {
my $requires = ""; my $requires = "";
for my $flavor (sort keys(%flavor_archs)) { for my $flavor (sort keys(%syms_flavor_archs)) {
next if $flavor eq "vanilla"; next if $flavor eq "vanilla";
my @archs = arch2rpm(@{$flavor_archs{$flavor}}); my @archs = arch2rpm(@{$syms_flavor_archs{$flavor}});
$requires .= "%ifarch @archs\n"; $requires .= "%ifarch @archs\n";
$requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n"; $requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n";
$requires .= "%endif\n"; $requires .= "%endif\n";
@ -101,10 +102,12 @@ exit 0;
sub parse_config_conf { sub parse_config_conf {
my @symbols = @_;
my $symbols = join(' ', @symbols);
my %res; my %res;
for my $arch (split(/\s+/, `$dir/arch-symbols --list`)) { for my $arch (split(/\s+/, `$dir/arch-symbols --list`)) {
my @flavors = `$dir/guards $arch < $dir/config.conf`; my @flavors = `$dir/guards $arch $symbols < $dir/config.conf`;
next if @flavors == 0; next if @flavors == 0;
chomp @flavors; chomp @flavors;
@flavors = map { s/.*\///; $_ } @flavors; @flavors = map { s/.*\///; $_ } @flavors;
@ -113,6 +116,9 @@ sub parse_config_conf {
push(@{$res{$flavor}}, $arch); push(@{$res{$flavor}}, $arch);
} }
} }
for my $flavor (keys(%res)) {
$res{$flavor} = [sort @{$res{$flavor}}];
}
return %res; return %res;
} }

2
package-descriptions
View File

@ -27,7 +27,7 @@ This kernel is optimized for the desktop. It is configured for lower latency
and has many of the features that aren't usually used on desktop machines and has many of the features that aren't usually used on desktop machines
disabled. disabled.
This kernel upports up to 64GB of main memory. It requires Physical This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor. processor.

4
patches.apparmor.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:af0f1964af70db8e9571e7448da8cbb4ac4a291d84e0e4d120c107b49e87837e oid sha256:3122020be5a80aba5699aeae33ff34c2f4dedc1016680bba74988a6a9da044d5
size 37020 size 37049

4
patches.arch.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:0718eba27ccdf1379cbfad2b55bbbfe7ae152f13409d76c54363bb90a0738cfe oid sha256:546281c82bb9c0755ebc7d21b1ecc7157bc208a73dc0c965da227caa5337a073
size 36583 size 34136

4
patches.drivers.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:dc19abf77fb2613dd2b00fc202c862300b556a77de27cfdea26a565fb4c83746 oid sha256:f6c4fc10ad1a69e718a3aea1c2f7f4caa4951e282429b88558f43483307d301d
size 173710 size 215718

4
patches.fixes.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:0aaf40cff1c4c17fdd9cad118ca9ec6fd4c41a676c8ee718b7d82fc8f13f1aac oid sha256:744b503c4b53f9240938ebd69487cec98292c87113536ef9fbc48bc7c9c9c5b2
size 31265 size 28204

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:064acc90d63301a85f18bc24aa10ea34bc3fa983b171e8afe4cae498a0e082f7 oid sha256:d4d4504a165a5dbf0245b1262309700033e8f60ed5e0ef3758ccc005e8efd1cd
size 55272 size 10501477

4
patches.rpmify.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d62e86b860c2c56ceb8fbb281c6d59a99d3a1bbaf237df47a6d2397051a10a8a oid sha256:e502162803b6aaa097b3834e991d0520e6fbfb231ea661e3e218646d17ce5bd0
size 4097 size 5620

4
patches.suse.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7adaa360c51978770a52d802b16b1e7c68defd3aa6694197b31806441096a6fc oid sha256:52d4ea0ee0c40dc16da6ba90500ac2b8322723f545749bed80c8c94eb451be89
size 874216 size 851840

4
patches.trace.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:cacd0551a6c5b296b220ad80d63571e9b25caeb5b0e8bd5a04f7210e7c62b007 oid sha256:c16b8e0798581db091b7905126ab6aca01e8baae4454234c66f3f54794940d32
size 43300 size 43343

306
series.conf
View File

@ -27,7 +27,10 @@
# DO NOT MODIFY THEM! # DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem... # Send separate patches upstream if you find a problem...
######################################################## ########################################################
patches.kernel.org/patch-2.6.30.2 patches.kernel.org/patch-2.6.31-rc1
patches.kernel.org/patch-2.6.31-rc1-rc2
patches.kernel.org/patch-2.6.31-rc2-rc3
patches.kernel.org/patch-2.6.31-rc3-rc4
######################################################## ########################################################
# Build fixes that apply to the vanilla kernel too. # Build fixes that apply to the vanilla kernel too.
@ -44,6 +47,7 @@
patches.rpmify/spin_is_contended-fix patches.rpmify/spin_is_contended-fix
patches.kernel.org/staging-pci-deps patches.kernel.org/staging-pci-deps
patches.rpmify/arm-arch_include_asm-fix.diff patches.rpmify/arm-arch_include_asm-fix.diff
patches.rpmify/sgi-hotplug-fixup
######################################################## ########################################################
# kABI consistency patches # kABI consistency patches
@ -173,7 +177,6 @@
patches.arch/ppc-vmcoreinfo.diff patches.arch/ppc-vmcoreinfo.diff
patches.arch/ppc-select patches.arch/ppc-select
patches.arch/ppc-pseries-bsr-4k.patch
patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch
######################################################## ########################################################
@ -197,7 +200,6 @@
patches.fixes/oom-warning patches.fixes/oom-warning
patches.suse/shmall-bigger patches.suse/shmall-bigger
patches.fixes/grab-swap-token-oops patches.fixes/grab-swap-token-oops
patches.fixes/mm-madvise-fix.patch
patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch
patches.suse/osync-error patches.suse/osync-error
@ -206,8 +208,6 @@
patches.suse/reiser4-set_page_dirty_notag patches.suse/reiser4-set_page_dirty_notag
patches.suse/file-capabilities-disable-by-default.diff patches.suse/file-capabilities-disable-by-default.diff
patches.suse/mnt-want-write-speedup.patch
patches.suse/mnt_clone_write.patch
patches.suse/unlock_page-speedup.patch patches.suse/unlock_page-speedup.patch
######################################################## ########################################################
@ -236,26 +236,20 @@
+needs_update patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch +needs_update patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
patches.arch/acpi_thermal_passive_blacklist.patch patches.arch/acpi_thermal_passive_blacklist.patch
+still_needed? patches.arch/thinkpad_fingers_off_backlight_igd.patch
+still_needed? patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch
patches.arch/acpi-export-hotplug_execute patches.arch/acpi-export-hotplug_execute
patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch
+still_needed? patches.suse/acpi_osi_sle11_ident.patch
# Adjust this patch for every new product (at least Enterprise
# level) to provide OEMs a safety break so that they can add
# for example SLE11 specific BIOS updates (if there is no other
# way to safely solve an ACPI issue).
+trenn patches.suse/acpi_osi_sle11_ident.patch
######################################################## ########################################################
# CPUFREQ # CPUFREQ
######################################################## ########################################################
# To be benchmarked (if time after late feature freeze):
+trenn patches.drivers/cpufreq_add_cpu_number_paramater_1.patch
+trenn patches.drivers/cpufreq_change_load_calculation_2.patch
+trenn patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch
+trenn patches.drivers/cpufreq_parameterize_down_differential_4.patch
+trenn patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch
+trenn patches.drivers/cpufreq_add_idle_microaccounting_6.patch
######################################################## ########################################################
# AGP, graphics related stuff # AGP, graphics related stuff
@ -290,7 +284,7 @@
# ext2/ext3 # ext2/ext3
######################################################## ########################################################
patches.suse/ext3-barrier-default patches.suse/ext3-barrier-default
patches.suse/ext2-fsync-err # patches.suse/ext2-fsync-err
patches.fixes/ext3-mark-super-uptodate patches.fixes/ext3-mark-super-uptodate
######################################################## ########################################################
@ -301,7 +295,6 @@
# Reiserfs Patches # Reiserfs Patches
######################################################## ########################################################
patches.suse/reiserfs-barrier-default patches.suse/reiserfs-barrier-default
patches.fixes/reiserfs-expose-privroot
######################################################## ########################################################
# ocfs2 # ocfs2
@ -368,11 +361,9 @@
patches.drivers/libata-ata_piix-clear-spurious-IRQ patches.drivers/libata-ata_piix-clear-spurious-IRQ
# Block layer fixes # Block layer fixes
patches.fixes/sd-needs-updating
patches.fixes/scsi-inquiry-too-short-ratelimit patches.fixes/scsi-inquiry-too-short-ratelimit
patches.suse/scsi-netlink-ml patches.suse/scsi-netlink-ml
patches.fixes/qla2xxx-disable-automatic-queue-tracking
+needs_update patches.drivers/mpt-fusion-4.16.00.00-update +needs_update patches.drivers/mpt-fusion-4.16.00.00-update
patches.drivers/qla4xxx-sles11-update patches.drivers/qla4xxx-sles11-update
patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update
@ -409,7 +400,6 @@
patches.fixes/tg3-fix-default-wol.patch patches.fixes/tg3-fix-default-wol.patch
patches.drivers/ehea-modinfo.patch patches.drivers/ehea-modinfo.patch
patches.drivers/tg3_libphy_workaround patches.drivers/tg3_libphy_workaround
patches.drivers/r8169-allow-true-forced-mode-setting.patch
######################################################## ########################################################
# Wireless Networking # Wireless Networking
@ -453,11 +443,68 @@
########################################################## ##########################################################
# Sound # Sound
########################################################## ##########################################################
patches.drivers/alsa-ad1984a-hp-quirks patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max
patches.drivers/alsa-pcm-01-Fix-regressions-with-VMware
patches.drivers/alsa-pcm-02-Add-logging-of-hwptr-updates
patches.drivers/alsa-pcm-03-Fix-warnings-in-debug-loggings
patches.drivers/alsa-pcm-04-Fix-hwptr-buffer-size-overlap-bug
patches.drivers/alsa-midi-01-always-log-message-on-output-overrun
patches.drivers/alsa-midi-02-do-not-send-MIDI-reset-when-closing
patches.drivers/alsa-midi-03-disable-active-sensing-on-close-by-def
patches.drivers/alsa-midi-04-oss-remove-magic-numbers
patches.drivers/alsa-hda-01-Don-t-call-snd_hda_codec_configure
patches.drivers/alsa-hda-02-Add-patch-module-option
patches.drivers/alsa-hda-03-Check-beep-hint
patches.drivers/alsa-hda-04-Merge-patch_alc882-and-patch_alc883
patches.drivers/alsa-hda-05-Fix-input-pinctl-for-ALC882-auto-mode
patches.drivers/alsa-hda-06-Allow-FLOAT-PCM-format
patches.drivers/alsa-hda-07-Add-missing-mixer-amp-initialization
patches.drivers/alsa-hda-08-Manually-expand-alc882_init_verbs
patches.drivers/alsa-hda-09-Don-t-override-maxbps-for-FLOAT
patches.drivers/alsa-hda-10-Add-quirks-for-RTL888-RV630-M76
patches.drivers/alsa-hda-11-Fix-the-merge-error
patches.drivers/alsa-hda-12-Check-codec-errors-in-connections
patches.drivers/alsa-hda-13-Add-CX20582-and-OLPC-XO-1.5-support
patches.drivers/alsa-hda-14-Add-support-for-new-AMD-HD-audio-devices
patches.drivers/alsa-hda-15-add-bounds-checking-for-the-codec-cmds
patches.drivers/alsa-hda-16-Fix-the-previous-sanity-check
patches.drivers/alsa-hda-17-Fix-ALC268-parser-for-mono-speaker
patches.drivers/alsa-hda-18-Reduce-click-noise-at-power-saving
patches.drivers/alsa-hda-19-Fix-ALC861-auto-mode-parser
patches.drivers/alsa-hda-20-do-not-read-connections-for-widged
patches.drivers/alsa-hda-21-use-AC_WCAP_CONN_LIST
patches.drivers/alsa-hda-22-Use-snprintf-to-be-safer
patches.drivers/alsa-hda-23-Cleanups-for-widget-connection-list
patches.drivers/alsa-hda-24-Restore-GPIO1-properly-at-resume
patches.drivers/alsa-hda-25-Add-better-Intel-IbexPeak-platform-support
patches.drivers/alsa-hda-26-Fix-mute-control-with-some-ALC262-models
patches.drivers/alsa-hda-27-Introduce-get_wcaps_type-macro
patches.drivers/alsa-hda-28-Add-exception-for-volume-knob
patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555
patches.drivers/alsa-ctxfi-01-Native-timer-support-for-emu20k2
patches.drivers/alsa-ctxfi-02-Fix-uninitialized-error-checks
patches.drivers/alsa-ctxfi-03-Simple-code-clean-up
patches.drivers/alsa-ice-01-Patch-for-suspend-resume-for-Audiotrak
patches.drivers/alsa-ice-02-Fix-section-mismatch
patches.drivers/alsa-usb-01-Use-the-new-TLV_DB_MINMAX-type
patches.drivers/alsa-usb-02-Correct-bogus-volume-dB-information
patches.drivers/alsa-usb-03-Xonar-U1-digital-output-support
patches.drivers/alsa-usb-04-use-multiple-input-URBs
patches.drivers/alsa-usb-05-use-multiple-output-URBs
patches.drivers/alsa-usb-06-add-MIDI-drain-callback
patches.drivers/alsa-usb-07-Volume-control-quirk-for-QuickCam-E-3
patches.drivers/alsa-usb-08-add-support-for-Audio2DJ
######################################################## ########################################################
# Other driver fixes # Other driver fixes
######################################################## ########################################################
patches.rpmify/rtl8192su-build-fix
patches.fixes/ieee1394-sbp2_long_sysfs_ieee1394_id.patch patches.fixes/ieee1394-sbp2_long_sysfs_ieee1394_id.patch
patches.fixes/parport-mutex patches.fixes/parport-mutex
@ -481,18 +528,12 @@
######################################################## ########################################################
patches.suse/dm-emulate-blkrrpart-ioctl patches.suse/dm-emulate-blkrrpart-ioctl
patches.suse/dm-raid45_2.6.27_20081027.patch patches.suse/dm-raid45_2.6.27_20081027.patch
patches.suse/rq-based-multipath
patches.fixes/dm-mpath-reattach-dh patches.fixes/dm-mpath-reattach-dh
patches.suse/dm-mpath-leastpending-path-update patches.suse/dm-mpath-leastpending-path-update
+needs_update patches.suse/dm-mpath-accept-failed-paths +needs_update patches.suse/dm-mpath-accept-failed-paths
+needs_update patches.suse/dm-mpath-requeue-for-stopped-queue +needs_update patches.suse/dm-mpath-requeue-for-stopped-queue
patches.suse/dm-mpath-check-info-before-access
patches.suse/dm-mpath-null-pgs patches.suse/dm-mpath-null-pgs
patches.fixes/dm-table-switch-to-readonly patches.fixes/dm-table-switch-to-readonly
patches.suse/dm-mpath-add-start-io
patches.suse/dm-mpath-queue-length-load-balancing
patches.suse/dm-mpath-tracking-nr-bytes
patches.suse/dm-mpath-service-time-load-balancing
######################################################## ########################################################
# md # md
@ -544,7 +585,6 @@
patches.suse/cgroup-disable-memory.patch patches.suse/cgroup-disable-memory.patch
+29 patches.suse/kdb-sysctl-context +29 patches.suse/kdb-sysctl-context
patches.suse/panic-on-io-nmi.diff
######################################################## ########################################################
# Tracing # Tracing
######################################################## ########################################################
@ -593,18 +633,6 @@
patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch
# devtmpfs # devtmpfs
patches.suse/driver-core-add-nodename-callbacks.patch
patches.suse/driver-core-misc-add-nodename-support-for-misc-devices.patch
patches.suse/driver-core-usb-add-nodename-support-for-usb-drivers.patch
patches.suse/driver-core-block-add-nodename-support-for-block-drivers.patch
patches.suse/driver-core-x86-add-nodename-for-cpuid-and-msr-drivers.patch
patches.suse/driver-core-dvb-add-nodename-for-dvb-drivers.patch
patches.suse/driver-core-input-add-nodename-for-input-drivers.patch
patches.suse/driver-core-sound-add-nodename-for-sound-drivers.patch
patches.suse/driver-core-raw-add-nodename-for-raw-devices.patch
patches.suse/driver-core-drm-add-nodename-for-drm-devices.patch
patches.suse/driver-core-aoe-add-nodename-for-aoe-devices.patch
patches.suse/driver-core-bsg-add-nodename-for-bsg-driver.patch
patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch
######################################################## ########################################################
@ -624,100 +652,100 @@
# on top of them instead. This reduces workload when # on top of them instead. This reduces workload when
# re-basing to a newer xen tree. # re-basing to a newer xen tree.
# #
### both uml framebuffer and xen need this one. +xen_needs_updating ### both uml framebuffer and xen need this one.
patches.xen/add-console-use-vt +xen_needs_updating patches.xen/add-console-use-vt
+xen_needs_updating
# split out patches +xen_needs_updating # split out patches
patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch +xen_needs_updating patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch +xen_needs_updating patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
patches.xen/ipv6-no-autoconf +xen_needs_updating patches.xen/ipv6-no-autoconf
patches.xen/pci-guestdev +xen_needs_updating patches.xen/pci-guestdev
patches.xen/pci-reserve +xen_needs_updating patches.xen/pci-reserve
patches.xen/sfc-driverlink +xen_needs_updating patches.xen/sfc-driverlink
patches.xen/sfc-resource-driver +xen_needs_updating patches.xen/sfc-resource-driver
patches.xen/sfc-driverlink-conditional +xen_needs_updating patches.xen/sfc-driverlink-conditional
patches.xen/sfc-external-sram +xen_needs_updating patches.xen/sfc-external-sram
patches.xen/tmem +xen_needs_updating patches.xen/tmem
+xen_needs_updating
# bulk stuff, new files for xen +xen_needs_updating # bulk stuff, new files for xen
patches.xen/xen3-auto-xen-arch.diff +xen_needs_updating patches.xen/xen3-auto-xen-arch.diff
patches.xen/xen3-auto-xen-drivers.diff +xen_needs_updating patches.xen/xen3-auto-xen-drivers.diff
patches.xen/xen3-auto-include-xen-interface.diff +xen_needs_updating patches.xen/xen3-auto-include-xen-interface.diff
+xen_needs_updating
# kconfig bits for xen +xen_needs_updating # kconfig bits for xen
patches.xen/xen3-auto-xen-kconfig.diff +xen_needs_updating patches.xen/xen3-auto-xen-kconfig.diff
+xen_needs_updating
# common code changes +xen_needs_updating # common code changes
patches.xen/xen3-auto-common.diff +xen_needs_updating patches.xen/xen3-auto-common.diff
patches.xen/xen3-auto-arch-x86.diff +xen_needs_updating patches.xen/xen3-auto-arch-x86.diff
patches.xen/xen3-auto-arch-i386.diff +xen_needs_updating patches.xen/xen3-auto-arch-i386.diff
patches.xen/xen3-auto-arch-x86_64.diff +xen_needs_updating patches.xen/xen3-auto-arch-x86_64.diff
+xen_needs_updating
# fixups due to upstream Xen parts +xen_needs_updating # fixups due to upstream Xen parts
patches.xen/xen3-fixup-xen +xen_needs_updating patches.xen/xen3-fixup-xen
+xen_needs_updating
patches.xen/sfc-sync-headers +xen_needs_updating patches.xen/sfc-sync-headers
patches.xen/sfc-endianness +xen_needs_updating patches.xen/sfc-endianness
+xen_needs_updating
# newer changeset backports +xen_needs_updating # newer changeset backports
+xen_needs_updating
# changes outside arch/{i386,x86_64}/xen +xen_needs_updating # changes outside arch/{i386,x86_64}/xen
patches.xen/xen3-fixup-kconfig +xen_needs_updating patches.xen/xen3-fixup-kconfig
patches.xen/xen3-fixup-common +xen_needs_updating patches.xen/xen3-fixup-common
patches.xen/xen3-fixup-arch-x86 +xen_needs_updating patches.xen/xen3-fixup-arch-x86
+xen_needs_updating
# ports of other patches +xen_needs_updating # ports of other patches
patches.xen/xen3-patch-2.6.18 +xen_needs_updating patches.xen/xen3-patch-2.6.18
patches.xen/xen3-patch-2.6.19 +xen_needs_updating patches.xen/xen3-patch-2.6.19
patches.xen/xen3-patch-2.6.20 +xen_needs_updating patches.xen/xen3-patch-2.6.20
patches.xen/xen3-patch-2.6.21 +xen_needs_updating patches.xen/xen3-patch-2.6.21
patches.xen/xen3-patch-2.6.22 +xen_needs_updating patches.xen/xen3-patch-2.6.22
patches.xen/xen3-patch-2.6.23 +xen_needs_updating patches.xen/xen3-patch-2.6.23
patches.xen/xen3-patch-2.6.24 +xen_needs_updating patches.xen/xen3-patch-2.6.24
patches.xen/xen3-patch-2.6.25 +xen_needs_updating patches.xen/xen3-patch-2.6.25
patches.xen/xen3-patch-2.6.26 +xen_needs_updating patches.xen/xen3-patch-2.6.26
patches.xen/xen3-patch-2.6.27 +xen_needs_updating patches.xen/xen3-patch-2.6.27
patches.xen/xen3-patch-2.6.28 +xen_needs_updating patches.xen/xen3-patch-2.6.28
patches.xen/xen3-patch-2.6.29 +xen_needs_updating patches.xen/xen3-patch-2.6.29
patches.xen/xen3-patch-2.6.30 +xen_needs_updating patches.xen/xen3-patch-2.6.30
patches.xen/xen3-seccomp-disable-tsc-option +xen_needs_updating patches.xen/xen3-seccomp-disable-tsc-option
+needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch +xen_needs_updating+needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch
patches.xen/xen3-driver-core-misc-add-nodename-support-for-misc-devices.patch +xen_needs_updating patches.xen/xen3-driver-core-misc-add-nodename-support-for-misc-devices.patch
patches.xen/xen3-kdb-x86 +xen_needs_updating patches.xen/xen3-kdb-x86
patches.xen/xen3-stack-unwind +xen_needs_updating patches.xen/xen3-stack-unwind
patches.xen/xen3-panic-on-io-nmi.diff +xen_needs_updating patches.xen/xen3-panic-on-io-nmi.diff
patches.xen/xen3-x86_64-unwind-annotations +xen_needs_updating patches.xen/xen3-x86_64-unwind-annotations
+xen_needs_updating
# bugfixes and enhancements +xen_needs_updating # bugfixes and enhancements
patches.xen/xen-balloon-max-target +xen_needs_updating patches.xen/xen-balloon-max-target
patches.xen/xen-modular-blktap +xen_needs_updating patches.xen/xen-modular-blktap
patches.xen/xen-blkback-bimodal-suse +xen_needs_updating patches.xen/xen-blkback-bimodal-suse
patches.xen/xen-blkif-protocol-fallback-hack +xen_needs_updating patches.xen/xen-blkif-protocol-fallback-hack
patches.xen/xen-blkback-cdrom +xen_needs_updating patches.xen/xen-blkback-cdrom
patches.xen/xen-blktap-write-barriers +xen_needs_updating patches.xen/xen-blktap-write-barriers
patches.xen/xen-scsifront-block-timeout-update +xen_needs_updating patches.xen/xen-scsifront-block-timeout-update
patches.xen/xen-op-packet +xen_needs_updating patches.xen/xen-op-packet
patches.xen/xen-blkfront-cdrom +xen_needs_updating patches.xen/xen-blkfront-cdrom
patches.xen/xen-sections +xen_needs_updating patches.xen/xen-sections
patches.xen/xen-swiotlb-heuristics +xen_needs_updating patches.xen/xen-swiotlb-heuristics
patches.xen/xen-kconfig-compat +xen_needs_updating patches.xen/xen-kconfig-compat
patches.xen/xen-cpufreq-report +xen_needs_updating patches.xen/xen-cpufreq-report
patches.xen/xen-staging-build +xen_needs_updating patches.xen/xen-staging-build
patches.xen/xen-sysdev-suspend +xen_needs_updating patches.xen/xen-sysdev-suspend
patches.xen/xen-ipi-per-cpu-irq +xen_needs_updating patches.xen/xen-ipi-per-cpu-irq
patches.xen/xen-virq-per-cpu-irq +xen_needs_updating patches.xen/xen-virq-per-cpu-irq
patches.xen/xen-configurable-guest-devices +xen_needs_updating patches.xen/xen-configurable-guest-devices
patches.xen/xen-netback-nr-irqs +xen_needs_updating patches.xen/xen-netback-nr-irqs
patches.xen/xen-netback-notify-multi +xen_needs_updating patches.xen/xen-netback-notify-multi
patches.xen/xen-x86-panic-no-reboot +xen_needs_updating patches.xen/xen-x86-panic-no-reboot
patches.xen/xen-x86-dcr-fallback +xen_needs_updating patches.xen/xen-x86-dcr-fallback
patches.xen/xen-x86-consistent-nmi +xen_needs_updating patches.xen/xen-x86-consistent-nmi
patches.xen/xen-x86-no-lapic +xen_needs_updating patches.xen/xen-x86-no-lapic
patches.xen/xen-x86-pmd-handling +xen_needs_updating patches.xen/xen-x86-pmd-handling
patches.xen/xen-x86-bigmem +xen_needs_updating patches.xen/xen-x86-bigmem
patches.xen/xen-x86-machphys-prediction +xen_needs_updating patches.xen/xen-x86-machphys-prediction
patches.xen/xen-x86-exit-mmap +xen_needs_updating patches.xen/xen-x86-exit-mmap
patches.xen/xen-x86_64-pgd-pin +xen_needs_updating patches.xen/xen-x86_64-pgd-pin
patches.xen/xen-x86_64-pgd-alloc-order +xen_needs_updating patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-dump-user-pgt +xen_needs_updating patches.xen/xen-x86_64-dump-user-pgt
patches.xen/xen-x86_64-note-init-p2m +xen_needs_updating patches.xen/xen-x86_64-note-init-p2m

4
source-timestamp
View File

@ -1,3 +1,3 @@
2009-07-20 20:31:16 +0200 2009-07-29 16:01:26 +0200
GIT Revision: f92072d365019df63887941412a8ba5893839135 GIT Revision: ddfe58aede98cf3f017c0e8eefbb5189e835d82c
GIT Branch: master GIT Branch: master