Accepting request 18054 from Kernel:HEAD

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

OBS-URL: https://build.opensuse.org/request/show/18054
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=67
This commit is contained in:
OBS User autobuild 2009-08-18 10:35:53 +00:00 committed by Git OBS Bridge
parent f8070c961a
commit 8e63e7d385
41 changed files with 2502 additions and 231 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4e25e1f6ea0c60d61f6c674b5cefcf6eba1f9b3c844ab10cf1cd6f02ba14670
size 154435
oid sha256:e316b14547b91ec559f546f0215b065d350254112356db3876f908fb0ce4a1e4
size 153949

View File

@ -2,7 +2,7 @@
trap 'rm -f "$filelist"' EXIT
filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX)
cat >"$filelist"
grep -v '/kernel/drivers/staging/.*\.ko$' >"$filelist"
shopt -s nullglob
# pretend that /boot/vmlinux-* is in the -base package and not in -devel

View File

@ -69,7 +69,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -313,6 +325,17 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -338,10 +361,17 @@ mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -422,17 +452,10 @@ add_vmlinux()
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -655,7 +678,8 @@ done
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -684,7 +708,6 @@ 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
@ -806,6 +829,8 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor debug
@ -49,7 +49,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -277,6 +289,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -296,10 +319,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -376,17 +405,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -582,7 +604,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -613,7 +636,6 @@ 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
@ -746,6 +768,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor default
@ -49,7 +49,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -292,6 +304,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -311,10 +334,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -391,17 +420,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -597,7 +619,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -628,7 +651,6 @@ 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
@ -759,6 +781,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor desktop
@ -49,7 +49,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -287,6 +299,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -306,10 +329,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -386,17 +415,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -592,7 +614,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -623,7 +646,6 @@ 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
@ -776,6 +798,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor kdump
@ -49,7 +49,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -279,6 +291,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -298,10 +321,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -378,17 +407,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -584,7 +606,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -615,7 +638,6 @@ 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
@ -752,6 +774,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor pae
@ -49,7 +49,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -287,6 +299,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -306,10 +329,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -386,17 +415,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -592,7 +614,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -623,7 +646,6 @@ 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
@ -768,6 +790,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ppc64
@ -49,7 +49,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -287,6 +299,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -306,10 +329,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -386,17 +415,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -592,7 +614,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -623,7 +646,6 @@ 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
@ -768,6 +790,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor ps3
@ -49,7 +49,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -279,6 +291,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -298,10 +321,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -378,17 +407,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -584,7 +606,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -615,7 +638,6 @@ 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
@ -752,6 +774,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor s390
@ -49,7 +49,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -280,6 +292,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -299,10 +322,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -379,17 +408,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -585,7 +607,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -616,7 +639,6 @@ 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
@ -747,6 +769,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define src_install_dir usr/src/linux-%kernelrelease%variant
@ -30,7 +30,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -45,7 +45,7 @@ Provides: linux
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: %name.rpmlintrc
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
Source9: devel-post.sh
Source10: preun.sh

View File

@ -49,7 +49,7 @@ Provides: linux
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: %name.rpmlintrc
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
Source9: devel-post.sh
Source10: preun.sh

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

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

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor trace
@ -49,7 +49,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -276,6 +288,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -295,10 +318,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -375,17 +404,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -581,7 +603,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -612,7 +635,6 @@ 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
@ -743,6 +765,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor vanilla
@ -49,7 +49,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.31
Release: 2
Release: 3
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -284,6 +296,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -303,10 +326,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -383,17 +412,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -589,7 +611,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -620,7 +643,6 @@ 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
@ -751,6 +773,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Mon Aug 17 21:10:55 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: Change the range from
0-255 to 0-7 to make it easier for HAL to handle the device without a
need for custom scripts.
-------------------------------------------------------------------
Mon Aug 17 16:38:38 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc6.
-------------------------------------------------------------------
Mon Aug 17 00:19:20 CEST 2009 - gregkh@suse.de
- patches.drivers/samsung-backlight-driver.patch: added N120 support
and some other devices that were integrated into the driver from
upstream.
-------------------------------------------------------------------
Sun Aug 16 23:22:47 CEST 2009 - coly.li@suse.de
- supported.conf:
set kernel/fs/dlm/dlm as unsupported, since fs/dlm is provided
separately in the ocfs2 KMP package
-------------------------------------------------------------------
Sat Aug 15 12:18:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-47-idt92hd8x-fix: ALSA: hda - Fix /
clean up IDT92HD83xxx codec parser (bnc#531533).
-------------------------------------------------------------------
Sat Aug 15 01:55:23 CEST 2009 - gregkh@suse.de
- Update config files.
- patches.drivers/samsung-backlight-driver.patch: Samsung
backlight driver (bnc#527533, bnc#531297).
-------------------------------------------------------------------
Fri Aug 14 21:47:28 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: add some hints how to set the %jobs
macro (bnc#530535).
-------------------------------------------------------------------
Fri Aug 14 16:11:52 CEST 2009 - mmarek@suse.cz
- rpm/modversions: for overriden functions, keep the keyword in
--pack.
-------------------------------------------------------------------
Thu Aug 13 16:01:51 CEST 2009 - jeffm@suse.com
- Updated to 2.6.31-rc5-git9.
- Eliminated 7 patches.
------------------------------------------------------------------
Thu Aug 13 12:06:50 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-42-hp-more-quirk: ALSA: hda - Add
quirks for some HP laptops (bnc#527284).
- patches.drivers/alsa-hda-4[35]-*: Improve Realtek codec mic
support
- patches.drivers/alsa-hda-46-stac-lo-detect-fix: ALSA: hda -
Enable line-out detection only with speakers (bnc#520975).
-------------------------------------------------------------------
Wed Aug 12 13:34:25 CEST 2009 - mmarek@suse.cz
- rpm/split-modules, rpm/kernel-binary.spec.in: add the base files
also to the main package. That way, kernel-$flavor-base is not
needed in normal setups (fate#307154).
-------------------------------------------------------------------
Wed Aug 12 13:19:08 CEST 2009 - mmarek@suse.cz
- rpm/find-provides: no rpm provides for drivers/staging. It's
higly unlikely that any KMP would require them and they just
take up space in the rpm metadata.
-------------------------------------------------------------------
Tue Aug 11 14:39:42 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-41-msi-white-list: ALSA: hda - Add
a white-list for MSI option (bnc#529971).
-------------------------------------------------------------------
Tue Aug 11 13:05:37 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-39-dont-override-ADC-definitions:
ALSA: hda - Don't override ADC definitions for ALC codecs
(bnc#529467).
- patches.drivers/alsa-hda-40-auto-mic-support-for-realtek:
ALSA: hda - Add auto-mic support for Realtek codecs.
-------------------------------------------------------------------
Tue Aug 11 09:48:34 CEST 2009 - mmarek@suse.cz
- rpm/kernel-source.spec.in: do not rename kernel-source.rpmlintrc
for the -rt variant.
-------------------------------------------------------------------
Mon Aug 10 12:55:56 CEST 2009 - mmarek@suse.cz
- patches.rpmify/staging-rtl8192su-fix-build-error.patch: move to
patches.rpmify to fix vanilla ppc builds.
-------------------------------------------------------------------
Mon Aug 10 12:08:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-38-fix-ALC269-vmaster: ALSA: hda -
Add missing vmaster initialization for ALC269 (bnc#527361).
-------------------------------------------------------------------
Mon Aug 10 08:57:15 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
-------------------------------------------------------------------
Fri Aug 7 17:25:11 CEST 2009 - jeffm@suse.com
- patches.fixes/recordmcount-fixup: recordmcount: Fixup wrong
update_funcs() call.
-------------------------------------------------------------------
Fri Aug 7 16:38:23 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-soc-fsl-build-fixes: ASoC: Add missing
DRV_NAME definitions for fsl/* drivers (to fix PPC builds)
-------------------------------------------------------------------
Fri Aug 7 15:16:21 CEST 2009 - tiwai@suse.de
- patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled:
wmi: Fix kernel panic when stack protection
enabled. (bnc#529177).
- supported.conf: Update HD-audio modules
-------------------------------------------------------------------
Fri Aug 7 10:06:23 CEST 2009 - mmarek@suse.cz
- make config/s390/vanilla a symlink again.
-------------------------------------------------------------------
Fri Aug 7 09:42:58 CEST 2009 - mmarek@suse.de
- rpm/kernel-binary.spec.in: do not manually extract vmlinux
debuginfo on ppc(64), rpm does it itself.
-------------------------------------------------------------------
Thu Aug 6 23:25:39 CEST 2009 - jeffm@suse.de

View File

@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
%define patchversion 2.6.31-rc5-git3
%define patchversion 2.6.31-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
%define build_flavor xen
@ -49,7 +49,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.31
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -61,7 +61,19 @@ BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
Requires: %name-base_%_target_cpu = %version-%release
Provides: kernel-base = %version-%source_rel
# Disabled for now, as the update doesn't work as expected.
#Provides: %name-base = %version-%release
#Obsoletes: %name-base <= %version-%release
# What we want is
# 11.1 -> 11.2
# base,main -> main
# base -> base
# If you know how to solve this via rpm dependencies, I'll buy you a
# chocolate ;).
# For now the base subpackage will be also updated, but it shouldn't cause any
# new problems (the overlaping files are identical). New installs will only
# have the main package.
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@ -279,6 +291,17 @@ source .kernel-binary.spec.buildenv
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# If the %jobs macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
# kernel-$flavor.spec
# You can also set this permanently in ~/.rpmmacros:
# %jobs 0%(grep -c ^processor /proc/cpuinfo)
%if %CONFIG_KMSG_IDS == "y"
chmod +x scripts/kmsg-doc
make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@ -298,10 +321,16 @@ cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
%define extract_vmlinux_debuginfo 0
%if 0%{?__debug_package:1}
%ifnarch ppc ppc64
%define extract_vmlinux_debuginfo 1
%endif
%endif
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
%if 0%{?__debug_package:1}
%if %extract_vmlinux_debuginfo
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp vmlinux %buildroot/$vmlinux
@ -378,17 +407,10 @@ add_vmlinux()
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
if \
%if %split_base
[ "x$sub" = "x-base" ];
%else
[ "x$sub" = "x" ];
%endif
then
base_package=1
else
base_package=0
fi
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
@ -584,7 +606,8 @@ done
fi
} | add_dirs_to_filelist > %my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@ -615,7 +638,6 @@ 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
@ -752,6 +774,9 @@ Debug information for package %name-devel
%source_timestamp
%if %extract_vmlinux_debuginfo
%files devel-debuginfo -f vmlinux.debug.files
%endif
%changelog

View File

@ -89,6 +89,8 @@ sub pack_dump($$) {
}
}
}
} elsif ($override) {
$_ = "$override$_";
}
print "$_\n";
}

View File

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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:380e4c288c3264c41c06b52346b232bb8d77b93b787ae95ac80a2a8806ed0881
size 226539
oid sha256:021fb33477dd09d250a845bc3ac22fc8231f72240f126957d06e83cce14a5970
size 237794

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:858441779d912e40a42dcb2e5a94a60daeb1682f05efe1eb5af8051ed266e1ad
size 10924742
oid sha256:ac1b7e2c9be5491ac03d136b267e906b0d8ab289435e6fd106bc2c3621c188ba
size 11020702

View File

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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c04e89bab9fc6dc8d1ebf4b5894ac57a85d553097ab91643f635a605a77f078e
size 852458
oid sha256:fea563e14e75e7c35bc86659c23c9814e0578f6b1ca8e768387037d255eeb7eb
size 853210

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:534e7d9cb35035b254c2081e02a6e729c4c7919a4c3e85b08c12cfedab0b986d
size 1840102
oid sha256:93aa7217f7ac232de996ac8897228250e0713292353274a3e25b98582c0470ff
size 1840645

View File

@ -32,7 +32,7 @@
patches.kernel.org/patch-2.6.31-rc2-rc3
patches.kernel.org/patch-2.6.31-rc3-rc4
patches.kernel.org/patch-2.6.31-rc4-rc5
patches.kernel.org/patch-2.6.31-rc5-git3
patches.kernel.org/patch-2.6.31-rc5-rc6
########################################################
# Build fixes that apply to the vanilla kernel too.
@ -47,9 +47,7 @@
patches.kernel.org/gdth-section-conflict
patches.kernel.org/arch-include-asm-fixes
patches.rpmify/spin_is_contended-fix
patches.kernel.org/staging-pci-deps
patches.rpmify/arm-arch_include_asm-fix.diff
patches.rpmify/sgi-hotplug-fixup
########################################################
# kABI consistency patches
@ -249,6 +247,7 @@
# way to safely solve an ACPI issue).
+trenn patches.suse/acpi_osi_sle11_ident.patch
patches.arch/wmi-Fix-kernel-panic-when-stack-protection-enabled
########################################################
# CPUFREQ
@ -484,6 +483,14 @@
patches.drivers/alsa-hda-35-add-HP-automute-to-ALC889
patches.drivers/alsa-hda-36-add-CS420x-support
patches.drivers/alsa-hda-37-fix-IbexPeak-HDMI
patches.drivers/alsa-hda-40-auto-mic-support-for-realtek
patches.drivers/alsa-hda-41-msi-white-list
patches.drivers/alsa-hda-42-hp-more-quirk
patches.drivers/alsa-hda-43-realtek-preset-setup
patches.drivers/alsa-hda-44-realtek-preset-cleanup
patches.drivers/alsa-hda-45-alc268-dmic-rec-fix
patches.drivers/alsa-hda-46-stac-lo-detect-fix
patches.drivers/alsa-hda-47-idt92hd8x-fix
patches.drivers/alsa-ctxfi-01-Native-timer-support-for-emu20k2
patches.drivers/alsa-ctxfi-03-Simple-code-clean-up
@ -515,7 +522,6 @@
########################################################
# Other drivers we have added to the tree
########################################################
patches.drivers/staging-rtl8192su-fix-build-error.patch
########################################################
# Suspend/Resume stuff
@ -629,6 +635,7 @@
# some driver patches, should move up in the series...
patches.suse/linux-2.6.29-touchkit.patch
patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch
patches.drivers/samsung-backlight-driver.patch
# devtmpfs
patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch

View File

@ -1,3 +1,3 @@
2009-08-06 23:25:57 +0200
GIT Revision: e9c649be988dfb8127aa75bea96a39065fa2ca14
2009-08-17 21:11:11 +0200
GIT Revision: 958e3f575ed3601898747ff16fd8e044e33a351b
GIT Branch: master

View File

@ -91,8 +91,7 @@ if ! cmp -s "$tmp/supp" "$tmp/supp-all"; then
exit 1
fi
fi
join -v 2 "$tmp/base" "$tmp/supp-all" >"$tmp/supp"
join -j 1 -o 2.2 "$tmp/supp" "$tmp/all" >"$opt_out/main-modules"
join -j 1 -o 2.2 "$tmp/supp-all" "$tmp/all" >"$opt_out/main-modules"
# unsupported
join -j 1 -v 2 -o 2.2 "$tmp/supp-all" "$tmp/all" >"$opt_out/unsupported-modules"

View File

@ -1896,7 +1896,7 @@
- kernel/fs/coda/coda
kernel/fs/configfs/configfs
kernel/fs/cramfs/cramfs
kernel/fs/dlm/dlm
- kernel/fs/dlm/dlm # fs/dlm is provided separately in the ocfs2 KMP package
kernel/fs/dmapi/dmapi
kernel/fs/ecryptfs/ecryptfs
- kernel/fs/efs/efs
@ -2423,6 +2423,7 @@
kernel/sound/pci/ca0106/snd-ca0106 # SBLive! 24bit
kernel/sound/pci/cs46xx/snd-cs46xx # Cirrus Logic Sound Fusion CS46XX
kernel/sound/pci/cs5535audio/snd-cs5535audio # Driver for audio on multifunction CS5535 companion device
kernel/sound/pci/ctxfi/snd-ctxfi # CreativeLabs SB X-Fi (emu20k1/emu20k2)
kernel/sound/pci/echoaudio/snd-darla20 # Echoaudio Darla20
kernel/sound/pci/echoaudio/snd-darla24 # Echoaudio Darla24
kernel/sound/pci/echoaudio/snd-echo3g # Echoaudio Echo 3G
@ -2438,6 +2439,18 @@
kernel/sound/pci/emu10k1/snd-emu10k1 # EMU10K1
kernel/sound/pci/emu10k1/snd-emu10k1-synth # Routines for control of EMU10K1 WaveTable synth
kernel/sound/pci/emu10k1/snd-emu10k1x # EMU10K1X
kernel/sound/pci/hda/snd-hda-codec # HD-audio/modem codec core
kernel/sound/pci/hda/snd-hda-codec-analog # Analog Device HD-audio codecs
kernel/sound/pci/hda/snd-hda-codec-atihdmi # ATI/AMD HD-audio (HDMI) codecs
kernel/sound/pci/hda/snd-hda-codec-ca0110 # CreativeLabs HD-audio codecs
kernel/sound/pci/hda/snd-hda-codec-cmedia # C-Media HD-audio codecs
kernel/sound/pci/hda/snd-hda-codec-conexant # Conexant HD-audio codecs
kernel/sound/pci/hda/snd-hda-codec-idt # IDT/Sigmatel HD-audio codecs
kernel/sound/pci/hda/snd-hda-codec-intelhdmi # Intel HD-audio (HDMI) codecs
kernel/sound/pci/hda/snd-hda-codec-nvidia # Nvidia HD-audio (HDMI) codecs
kernel/sound/pci/hda/snd-hda-codec-realtek # Realtek HD-audio codecs
kernel/sound/pci/hda/snd-hda-codec-si3054 # SI-compatible HD-audio modem codecs
kernel/sound/pci/hda/snd-hda-codec-via # VIA HD-audio codecs
kernel/sound/pci/hda/snd-hda-intel # Intel HD-audio/modem controller
kernel/sound/pci/ice1712/snd-ice1712 # ICEnsemble ICE1712 (Envy24)
kernel/sound/pci/ice1712/snd-ice1724 # ICEnsemble ICE1724 (Envy24HT)