Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Wed Aug 26 22:30:47 CEST 2009.
--------
--- kernel-source/kernel-debug.changes 2009-08-17 22:50:17.000000000 +0200
+++ kernel-source/kernel-debug.changes 2009-08-25 04:06:54.000000000 +0200
@@ -1,0 +2,76 @@
+Mon Aug 24 16:47:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: obsolete %name-base <= 2.6.30-1
+ (bnc#530752).
+
+-------------------------------------------------------------------
+Mon Aug 24 16:35:01 CEST 2009 - jeffm@suse.com
+
+- Update to 2.6.31-rc7.
+ - Eliminated 3 patches.
+
+-------------------------------------------------------------------
+Mon Aug 24 16:16:04 CEST 2009 - jeffm@suse.com
+
+- Update config files: Enable CONFIG_PROC_EVENTS.
+
+-------------------------------------------------------------------
+Fri Aug 21 16:05:42 CEST 2009 - mmarek@suse.cz
+
+- rpm/post.sh: Do not call /sbin/module_upgrade, the rename
+ happened before SLES10.
+
+-------------------------------------------------------------------
+Fri Aug 21 16:00:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/module-renames: Delete, we don't need to care about modules
+ renamed before SLES10. Also, current mkinitrd gets the list of
+ storage drivers based on pci ids.
+
+-------------------------------------------------------------------
+Fri Aug 21 15:50:51 CEST 2009 - mmarek@suse.cz
+
+- rpm/post.sh, rpm/postun.sh: drop support for SLE10, the package
+ can't be installed on SLE10 as is, so why not make it more
+ adventurous.
+
+-------------------------------------------------------------------
+Fri Aug 21 15:48:15 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: remove product(openSUSE) supplements
+ from the -extra subpackage which doesn't exist on openSUSE
+ anymore.
+
+-------------------------------------------------------------------
+Thu Aug 20 17:52:08 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-fix-0*: Backport from 2.6.31-rc fixes
+ (to be merged)
+- patches.drivers/alsa-hda-32-Reword-auto-probe-messages: Refresh.
+- patches.drivers/alsa-hda-33-IDT-codec-updates: Refresh.
+
+-------------------------------------------------------------------
+Thu Aug 20 11:40:58 CEST 2009 - jbeulich@novell.com
+
+- Update config files (modularize crypto again).
+- supported.conf: Add resulting modules as supported.
+
+-------------------------------------------------------------------
+Wed Aug 19 09:22:46 CEST 2009 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.31-rc6 and c/s 928.
+
+-------------------------------------------------------------------
+Wed Aug 19 00:33:54 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-48-alc268-oops-fix: ALSA: hda -
+ Fix invalid capture mixers with some ALC268 models.
+
+-------------------------------------------------------------------
+Tue Aug 18 20:16:36 CEST 2009 - gregkh@suse.de
+
+- patches.drivers/usb-storage-increase-the-bcd-range-in-sony-s-bad-device-table.patch:
+ USB: storage: increase the bcd range in Sony's bad device
+ table. (bnc#466554).
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
Old:
----
module-renames
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -134,7 +124,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -531,10 +520,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -593,7 +578,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -680,7 +664,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -150,7 +140,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -546,10 +535,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -608,7 +593,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -694,7 +678,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -134,7 +124,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -541,10 +530,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -603,7 +588,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -700,7 +684,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -134,7 +124,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -533,10 +522,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -595,7 +580,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -684,7 +668,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -138,7 +128,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -541,10 +530,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -603,7 +588,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -696,7 +680,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -138,7 +128,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -541,10 +530,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -603,7 +588,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -696,7 +680,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -134,7 +124,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -533,10 +522,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -595,7 +580,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -684,7 +668,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -138,7 +128,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -534,10 +523,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -596,7 +581,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -682,7 +666,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:13.000000000 +0200
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -63,7 +63,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: extract-modaliases
Source48: macros.kernel-source
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:14.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:14.000000000 +0200
@@ -23,7 +23,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.31
-Release: 3
+Release: 4
%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)
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:14.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:14.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -134,7 +124,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -530,10 +519,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -592,7 +577,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -678,7 +662,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:14.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:14.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -142,7 +132,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -538,10 +527,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -600,7 +585,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -686,7 +670,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:14.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:14.000000000 +0200
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.30
-%define patchversion 2.6.31-rc6
+%define patchversion 2.6.31-rc7
%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: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -62,18 +62,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -134,7 +124,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -533,10 +522,6 @@
exit 1
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -595,7 +580,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -684,7 +668,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ config.tar.bz2 ++++++
++++ 1838 lines of diff (skipped)
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:15.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:15.000000000 +0200
@@ -70,18 +70,8 @@
Provides: %{name}_%_target_cpu = %version-%release
%if %split_base
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.
+# 2.6.30-1 was the last package with split -base
+Obsoletes: %name-base <= 2.6.30-1
%endif
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -146,7 +136,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: symsets.pl
Source48: split-modules
@@ -598,11 +587,6 @@
fi
fi
- # Set up some module aliases
- install -d -m 755 %buildroot/etc/modprobe.d/
- install -m 644 %_sourcedir/module-renames \
- %buildroot/etc/modprobe.d/50-module-renames.conf
-
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -666,7 +650,6 @@
! -path '*/modules.builtin' \) -printf '%%%%%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
cat %my_builddir/base-modules
- echo '%%%%config /etc/modprobe.d/50-module-renames.conf'
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
@@ -748,7 +731,6 @@
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
-Supplements: packageand(product(openSUSE):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:16.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:16.000000000 +0200
@@ -67,7 +67,6 @@
Source40: source-timestamp
Source41: built-in-where
Source44: find-provides
-Source45: module-renames
Source46: modversions
Source47: extract-modaliases
Source48: macros.kernel-source
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:18.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:18.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.t30h00/_old 2009-08-26 22:25:18.000000000 +0200
+++ /var/tmp/diff_new_pack.t30h00/_new 2009-08-26 22:25:18.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.apparmor.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor.diff new/patches.apparmor/apparmor.diff
--- old/patches.apparmor/apparmor.diff 2009-07-17 17:10:26.000000000 +0200
+++ new/patches.apparmor/apparmor.diff 2009-08-24 16:35:30.000000000 +0200
@@ -94,7 +94,7 @@
+subdir-$(CONFIG_SECURITY_APPARMOR) += apparmor
# always enable default capabilities
- obj-y += commoncap.o
+ obj-y += commoncap.o min_addr.o
@@ -20,6 +21,7 @@ ifeq ($(CONFIG_AUDIT),y)
obj-$(CONFIG_SECURITY_SMACK) += lsm_audit.o
endif
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-32-Reword-auto-probe-messages new/patches.drivers/alsa-hda-32-Reword-auto-probe-messages
--- old/patches.drivers/alsa-hda-32-Reword-auto-probe-messages 2009-08-17 21:11:11.000000000 +0200
+++ new/patches.drivers/alsa-hda-32-Reword-auto-probe-messages 2009-08-20 17:53:12.000000000 +0200
@@ -103,8 +103,8 @@
board_config = ALC262_AUTO;
}
-@@ -12479,8 +12477,8 @@
- alc268_cfg_tbl);
+@@ -12490,8 +12488,8 @@
+ ALC882_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);
if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {
- printk(KERN_INFO "hda_codec: Unknown model for %s, "
@@ -114,7 +114,7 @@
board_config = ALC268_AUTO;
}
-@@ -13297,8 +13295,8 @@
+@@ -13308,8 +13306,8 @@
alc269_cfg_tbl);
if (board_config < 0) {
@@ -125,7 +125,7 @@
board_config = ALC269_AUTO;
}
-@@ -14448,8 +14446,8 @@
+@@ -14461,8 +14459,8 @@
alc861_cfg_tbl);
if (board_config < 0) {
@@ -136,7 +136,7 @@
board_config = ALC861_AUTO;
}
-@@ -15372,8 +15370,8 @@
+@@ -15385,8 +15383,8 @@
alc861vd_cfg_tbl);
if (board_config < 0 || board_config >= ALC861VD_MODEL_LAST) {
@@ -147,7 +147,7 @@
board_config = ALC861VD_AUTO;
}
-@@ -17296,8 +17294,8 @@
+@@ -17312,8 +17310,8 @@
alc662_models,
alc662_cfg_tbl);
if (board_config < 0) {
@@ -160,7 +160,7 @@
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -4796,7 +4796,8 @@
+@@ -4802,7 +4802,8 @@
stac9200_models,
stac9200_cfg_tbl);
if (spec->board_config < 0)
@@ -170,7 +170,7 @@
else
stac92xx_set_config_regs(codec,
stac9200_brd_tbl[spec->board_config]);
-@@ -4868,8 +4869,8 @@
+@@ -4874,8 +4875,8 @@
stac925x_cfg_tbl);
again:
if (spec->board_config < 0)
@@ -181,7 +181,7 @@
else
stac92xx_set_config_regs(codec,
stac925x_brd_tbl[spec->board_config]);
-@@ -4951,8 +4952,8 @@
+@@ -4957,8 +4958,8 @@
stac92hd73xx_cfg_tbl);
again:
if (spec->board_config < 0)
@@ -192,7 +192,7 @@
else
stac92xx_set_config_regs(codec,
stac92hd73xx_brd_tbl[spec->board_config]);
-@@ -5127,8 +5128,8 @@
+@@ -5133,8 +5134,8 @@
stac92hd83xxx_cfg_tbl);
again:
if (spec->board_config < 0)
@@ -203,7 +203,7 @@
else
stac92xx_set_config_regs(codec,
stac92hd83xxx_brd_tbl[spec->board_config]);
-@@ -5293,8 +5294,8 @@
+@@ -5299,8 +5300,8 @@
stac92hd71bxx_cfg_tbl);
again:
if (spec->board_config < 0)
@@ -214,7 +214,7 @@
else
stac92xx_set_config_regs(codec,
stac92hd71bxx_brd_tbl[spec->board_config]);
-@@ -5549,8 +5550,8 @@
+@@ -5555,8 +5556,8 @@
again:
if (spec->board_config < 0)
@@ -225,7 +225,7 @@
else
stac92xx_set_config_regs(codec,
stac922x_brd_tbl[spec->board_config]);
-@@ -5612,8 +5613,8 @@
+@@ -5618,8 +5619,8 @@
stac927x_cfg_tbl);
again:
if (spec->board_config < 0)
@@ -236,7 +236,7 @@
else
stac92xx_set_config_regs(codec,
stac927x_brd_tbl[spec->board_config]);
-@@ -5747,7 +5748,8 @@
+@@ -5753,7 +5754,8 @@
stac9205_cfg_tbl);
again:
if (spec->board_config < 0)
@@ -246,7 +246,7 @@
else
stac92xx_set_config_regs(codec,
stac9205_brd_tbl[spec->board_config]);
-@@ -5899,8 +5901,8 @@
+@@ -5905,8 +5907,8 @@
stac9872_models,
stac9872_cfg_tbl);
if (spec->board_config < 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-33-IDT-codec-updates new/patches.drivers/alsa-hda-33-IDT-codec-updates
--- old/patches.drivers/alsa-hda-33-IDT-codec-updates 2009-08-17 21:11:11.000000000 +0200
+++ new/patches.drivers/alsa-hda-33-IDT-codec-updates 2009-08-20 17:53:12.000000000 +0200
@@ -25,7 +25,7 @@
};
enum {
-@@ -176,6 +178,12 @@
+@@ -177,6 +179,12 @@
struct snd_jack *jack;
};
@@ -38,7 +38,7 @@
struct sigmatel_spec {
struct snd_kcontrol_new *mixers[4];
unsigned int num_mixers;
-@@ -187,6 +195,7 @@
+@@ -188,6 +196,7 @@
unsigned int hp_detect: 1;
unsigned int spdif_mute: 1;
unsigned int check_volume_offset:1;
@@ -46,7 +46,7 @@
/* gpio lines */
unsigned int eapd_mask;
-@@ -238,6 +247,15 @@
+@@ -239,6 +248,15 @@
unsigned int num_dmuxes;
hda_nid_t *smux_nids;
unsigned int num_smuxes;
@@ -62,7 +62,7 @@
const char **spdif_labels;
hda_nid_t dig_in_nid;
-@@ -334,6 +352,13 @@
+@@ -335,6 +353,13 @@
0x22, 0x23,
};
@@ -76,7 +76,7 @@
#define STAC92HD83XXX_NUM_DMICS 2
static hda_nid_t stac92hd83xxx_dmic_nids[STAC92HD83XXX_NUM_DMICS + 1] = {
0x11, 0x12, 0
-@@ -365,6 +390,13 @@
+@@ -366,6 +391,13 @@
0xc,
};
@@ -90,7 +90,7 @@
static hda_nid_t stac92hd71bxx_pwr_nids[3] = {
0x0a, 0x0d, 0x0f
};
-@@ -394,6 +426,13 @@
+@@ -395,6 +427,13 @@
0x22, 0
};
@@ -104,7 +104,7 @@
static hda_nid_t stac925x_adc_nids[1] = {
0x03,
};
-@@ -415,6 +454,13 @@
+@@ -416,6 +455,13 @@
0x14,
};
@@ -118,7 +118,7 @@
static hda_nid_t stac922x_adc_nids[2] = {
0x06, 0x07,
};
-@@ -423,6 +469,13 @@
+@@ -424,6 +470,13 @@
0x12, 0x13,
};
@@ -132,7 +132,7 @@
static hda_nid_t stac927x_slave_dig_outs[2] = {
0x1f, 0,
};
-@@ -452,6 +505,18 @@
+@@ -453,6 +506,18 @@
0x13, 0x14, 0
};
@@ -151,7 +151,7 @@
static const char *stac927x_spdif_labels[5] = {
"Digital Playback", "ADAT", "Analog Mux 1",
"Analog Mux 2", "Analog Mux 3"
-@@ -478,6 +543,16 @@
+@@ -479,6 +544,16 @@
0x17, 0x18, 0
};
@@ -168,7 +168,7 @@
static hda_nid_t stac9200_pin_nids[8] = {
0x08, 0x09, 0x0d, 0x0e,
0x0f, 0x10, 0x11, 0x12,
-@@ -692,9 +767,35 @@
+@@ -693,9 +768,35 @@
struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
struct sigmatel_spec *spec = codec->spec;
unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
@@ -206,7 +206,7 @@
}
static int stac92xx_mono_mux_enum_info(struct snd_kcontrol *kcontrol,
-@@ -924,19 +1025,6 @@
+@@ -925,19 +1026,6 @@
{}
};
@@ -226,7 +226,7 @@
static struct hda_verb stac92hd71bxx_unmute_core_init[] = {
/* unmute right and left channels for nodes 0x0f, 0xa, 0x0d */
{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-@@ -1069,12 +1157,6 @@
+@@ -1070,12 +1158,6 @@
HDA_CODEC_VOLUME("DAC Mixer Capture Volume", 0x1d, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("DAC Mixer Capture Switch", 0x1d, 0x3, HDA_INPUT),
@@ -239,7 +239,7 @@
{ } /* end */
};
-@@ -1094,12 +1176,6 @@
+@@ -1095,12 +1177,6 @@
};
static struct snd_kcontrol_new stac92hd73xx_8ch_mixer[] = {
@@ -252,7 +252,7 @@
HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT),
HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT),
-@@ -1118,12 +1194,6 @@
+@@ -1119,12 +1195,6 @@
};
static struct snd_kcontrol_new stac92hd73xx_10ch_mixer[] = {
@@ -265,7 +265,7 @@
HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT),
HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT),
-@@ -1143,12 +1213,6 @@
+@@ -1144,12 +1214,6 @@
static struct snd_kcontrol_new stac92hd83xxx_mixer[] = {
@@ -278,7 +278,7 @@
HDA_CODEC_VOLUME("DAC0 Capture Volume", 0x1b, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("DAC0 Capture Switch", 0x1b, 0x3, HDA_INPUT),
-@@ -1168,59 +1232,13 @@
+@@ -1169,59 +1233,13 @@
{ } /* end */
};
@@ -338,7 +338,7 @@
{ } /* end */
};
-@@ -1229,29 +1247,6 @@
+@@ -1230,29 +1248,6 @@
{}
};
@@ -368,7 +368,7 @@
static struct snd_kcontrol_new stac927x_loopback[] = {
STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1),
{}
-@@ -1309,16 +1304,19 @@
+@@ -1310,16 +1305,19 @@
int err;
int i;
@@ -392,7 +392,7 @@
stac_dmux_mixer.count = spec->num_dmuxes;
err = snd_hda_ctl_add(codec,
snd_ctl_new1(&stac_dmux_mixer, codec));
-@@ -2636,8 +2634,7 @@
+@@ -2642,8 +2640,7 @@
return 0;
}
@@ -402,7 +402,7 @@
static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
-@@ -2651,7 +2648,7 @@
+@@ -2657,7 +2654,7 @@
/* check to be sure that the ports are upto date with
* switch changes
*/
@@ -411,7 +411,7 @@
return 1;
}
-@@ -2784,7 +2781,7 @@
+@@ -2790,7 +2787,7 @@
* appropriately according to the pin direction
*/
if (spec->hp_detect)
@@ -420,7 +420,7 @@
return 1;
}
-@@ -2967,6 +2964,8 @@
+@@ -2973,6 +2970,8 @@
struct snd_kcontrol_new *knew;
struct hda_input_mux *imux = &spec->private_imux;
@@ -429,7 +429,7 @@
if (!spec->num_adcs || imux->num_items <= 1)
return 0; /* no need for input source control */
knew = stac_control_new(spec, &stac_input_src_temp,
-@@ -3319,6 +3318,21 @@
+@@ -3325,6 +3324,21 @@
return 0;
}
@@ -451,7 +451,7 @@
/* add playback controls from the parsed DAC table */
static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
const struct auto_pin_cfg *cfg)
-@@ -3559,49 +3573,66 @@
+@@ -3565,49 +3579,66 @@
"Digital Mic 3", "Digital Mic 4"
};
@@ -535,7 +535,7 @@
err = stac92xx_add_control(spec,
STAC_CTL_WIDGET_VOL,
-@@ -3613,15 +3644,101 @@
+@@ -3619,15 +3650,101 @@
return err;
}
@@ -639,7 +639,7 @@
/* create playback/capture controls for input pins */
static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
{
-@@ -3654,6 +3771,7 @@
+@@ -3660,6 +3777,7 @@
imux->items[imux->num_items].index = index;
imux->num_items++;
}
@@ -647,7 +647,7 @@
if (imux->num_items) {
/*
-@@ -3705,7 +3823,7 @@
+@@ -3711,7 +3829,7 @@
{
struct sigmatel_spec *spec = codec->spec;
int hp_swap = 0;
@@ -656,7 +656,7 @@
if ((err = snd_hda_parse_pin_def_config(codec,
&spec->autocfg,
-@@ -3839,6 +3957,21 @@
+@@ -3845,6 +3963,21 @@
spec->autocfg.line_outs = 0;
}
@@ -678,7 +678,7 @@
err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg);
if (err < 0)
return err;
-@@ -4101,14 +4234,14 @@
+@@ -4107,14 +4240,14 @@
}
static struct sigmatel_event *stac_get_event(struct hda_codec *codec,
@@ -695,7 +695,7 @@
return event;
}
return NULL;
-@@ -4128,24 +4261,32 @@
+@@ -4134,24 +4267,32 @@
return NULL;
}
@@ -736,7 +736,7 @@
}
static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
-@@ -4238,20 +4379,35 @@
+@@ -4244,20 +4385,35 @@
hda_nid_t nid = cfg->hp_pins[i];
enable_pin_detect(codec, nid, STAC_HP_EVENT);
}
@@ -774,7 +774,7 @@
for (i = 0; i < AUTO_PIN_LAST; i++) {
hda_nid_t nid = cfg->input_pins[i];
if (nid) {
-@@ -4278,10 +4434,9 @@
+@@ -4284,10 +4440,9 @@
}
conf = snd_hda_codec_get_pincfg(codec, nid);
if (get_defcfg_connect(conf) != AC_JACK_PORT_FIXED) {
@@ -788,7 +788,7 @@
}
}
}
-@@ -4326,10 +4481,8 @@
+@@ -4332,10 +4487,8 @@
stac_toggle_power_map(codec, nid, 1);
continue;
}
@@ -801,7 +801,7 @@
}
if (spec->dac_list)
stac92xx_power_down(codec);
-@@ -4433,6 +4586,48 @@
+@@ -4439,6 +4592,48 @@
return 0;
}
@@ -850,7 +850,7 @@
/* return non-zero if the hp-pin of the given array index isn't
* a jack-detection target
*/
-@@ -4485,13 +4680,6 @@
+@@ -4491,13 +4686,6 @@
for (i = 0; i < cfg->line_outs; i++)
stac92xx_reset_pinctl(codec, cfg->line_out_pins[i],
AC_PINCTL_OUT_EN);
@@ -864,7 +864,7 @@
} else {
/* enable lineouts */
if (spec->hp_switch)
-@@ -4500,14 +4688,8 @@
+@@ -4506,14 +4694,8 @@
for (i = 0; i < cfg->line_outs; i++)
stac92xx_set_pinctl(codec, cfg->line_out_pins[i],
AC_PINCTL_OUT_EN);
@@ -880,7 +880,7 @@
/* toggle hp outs */
for (i = 0; i < cfg->hp_outs; i++) {
unsigned int val = AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN;
-@@ -4592,10 +4774,28 @@
+@@ -4598,10 +4780,28 @@
}
}
@@ -912,7 +912,7 @@
if (!event)
return;
codec->patch_ops.unsol_event(codec, (unsigned)event->tag << 26);
-@@ -4614,8 +4814,18 @@
+@@ -4620,8 +4820,18 @@
switch (event->type) {
case STAC_HP_EVENT:
@@ -932,7 +932,7 @@
case STAC_INSERT_EVENT:
case STAC_PWR_EVENT:
if (spec->num_pwrs > 0)
-@@ -4706,8 +4916,7 @@
+@@ -4712,8 +4922,7 @@
snd_hda_codec_resume_cache(codec);
/* fake event to set up pins again to override cached values */
if (spec->hp_detect)
@@ -942,7 +942,7 @@
return 0;
}
-@@ -4900,6 +5109,9 @@
+@@ -4906,6 +5115,9 @@
spec->init = stac925x_core_init;
spec->mixer = stac925x_mixer;
@@ -952,7 +952,7 @@
err = stac92xx_parse_auto_config(codec, 0x8, 0x7);
if (!err) {
-@@ -4921,16 +5133,6 @@
+@@ -4927,16 +5139,6 @@
return 0;
}
@@ -969,7 +969,7 @@
static int patch_stac92hd73xx(struct hda_codec *codec)
{
struct sigmatel_spec *spec;
-@@ -5000,8 +5202,10 @@
+@@ -5006,8 +5208,10 @@
spec->num_muxes = ARRAY_SIZE(stac92hd73xx_mux_nids);
spec->num_adcs = ARRAY_SIZE(stac92hd73xx_adc_nids);
spec->num_dmuxes = ARRAY_SIZE(stac92hd73xx_dmux_nids);
@@ -982,7 +982,7 @@
switch (spec->board_config) {
case STAC_DELL_EQ:
-@@ -5022,18 +5226,15 @@
+@@ -5028,18 +5232,15 @@
case STAC_DELL_M6_AMIC: /* Analog Mics */
snd_hda_codec_set_pincfg(codec, 0x0b, 0x90A70170);
spec->num_dmics = 0;
@@ -1001,7 +1001,7 @@
break;
}
break;
-@@ -5041,13 +5242,13 @@
+@@ -5047,13 +5248,13 @@
spec->num_dmics = STAC92HD73XX_NUM_DMICS;
spec->num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids);
spec->eapd_switch = 1;
@@ -1016,7 +1016,7 @@
spec->num_pwrs = ARRAY_SIZE(stac92hd73xx_pwr_nids);
spec->pwr_nids = stac92hd73xx_pwr_nids;
-@@ -5079,15 +5280,6 @@
+@@ -5085,15 +5286,6 @@
return 0;
}
@@ -1032,7 +1032,7 @@
static int patch_stac92hd83xxx(struct hda_codec *codec)
{
struct sigmatel_spec *spec;
-@@ -5120,8 +5312,11 @@
+@@ -5126,8 +5318,11 @@
spec->num_adcs = ARRAY_SIZE(stac92hd83xxx_adc_nids);
spec->num_amps = ARRAY_SIZE(stac92hd83xxx_amp_nids);
spec->num_dmics = STAC92HD83XXX_NUM_DMICS;
@@ -1045,7 +1045,7 @@
spec->board_config = snd_hda_check_board_config(codec,
STAC_92HD83XXX_MODELS,
stac92hd83xxx_models,
-@@ -5186,25 +5381,6 @@
+@@ -5192,25 +5387,6 @@
return 0;
}
@@ -1071,7 +1071,7 @@
/* get the pin connection (fixed, none, etc) */
static unsigned int stac_get_defcfg_connect(struct hda_codec *codec, int idx)
{
-@@ -5265,7 +5441,6 @@
+@@ -5271,7 +5447,6 @@
struct sigmatel_spec *spec;
struct hda_verb *unmute_init = stac92hd71bxx_unmute_core_init;
int err = 0;
@@ -1079,7 +1079,7 @@
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL)
-@@ -5310,6 +5485,10 @@
+@@ -5316,6 +5491,10 @@
spec->dmic_nids = stac92hd71bxx_dmic_nids;
spec->dmux_nids = stac92hd71bxx_dmux_nids;
@@ -1090,7 +1090,7 @@
switch (codec->vendor_id) {
case 0x111d76b6: /* 4 Port without Analog Mixer */
case 0x111d76b7:
-@@ -5317,24 +5496,13 @@
+@@ -5323,24 +5502,13 @@
/* fallthru */
case 0x111d76b4: /* 6 Port without Analog Mixer */
case 0x111d76b5:
@@ -1115,7 +1115,7 @@
switch (spec->board_config) {
case STAC_HP_M4:
/* Enable VREF power saving on GPIO1 detect */
-@@ -5356,11 +5524,8 @@
+@@ -5362,11 +5530,8 @@
/* no output amps */
spec->num_pwrs = 0;
@@ -1128,7 +1128,7 @@
unmute_init++;
snd_hda_codec_set_pincfg(codec, 0x0f, 0x40f000f0);
snd_hda_codec_set_pincfg(codec, 0x19, 0x40f000f3);
-@@ -5368,8 +5533,6 @@
+@@ -5374,8 +5539,6 @@
spec->num_dmics = stac92hd71bxx_connected_ports(codec,
stac92hd71bxx_dmic_nids,
STAC92HD71BXX_NUM_DMICS - 1);
@@ -1137,7 +1137,7 @@
break;
case 0x111d7603: /* 6 Port with Analog Mixer */
if ((codec->revision_id & 0xf) == 1)
-@@ -5379,17 +5542,12 @@
+@@ -5385,17 +5548,12 @@
spec->num_pwrs = 0;
/* fallthru */
default:
@@ -1157,7 +1157,7 @@
}
if (get_wcaps(codec, 0xa) & AC_WCAP_IN_AMP)
-@@ -5417,6 +5575,7 @@
+@@ -5423,6 +5581,7 @@
spec->num_muxes = ARRAY_SIZE(stac92hd71bxx_mux_nids);
spec->num_adcs = ARRAY_SIZE(stac92hd71bxx_adc_nids);
@@ -1165,7 +1165,7 @@
spec->num_smuxes = stac92hd71bxx_connected_smuxes(codec, 0x1e);
switch (spec->board_config) {
-@@ -5471,8 +5630,6 @@
+@@ -5477,8 +5636,6 @@
#endif
spec->multiout.dac_nids = spec->dac_nids;
@@ -1174,7 +1174,7 @@
err = stac92xx_parse_auto_config(codec, 0x21, 0);
if (!err) {
-@@ -5564,7 +5721,10 @@
+@@ -5570,7 +5727,10 @@
spec->num_pwrs = 0;
spec->init = stac922x_core_init;
@@ -1186,7 +1186,7 @@
spec->multiout.dac_nids = spec->dac_nids;
-@@ -5639,7 +5799,6 @@
+@@ -5645,7 +5805,6 @@
spec->num_dmics = 0;
spec->init = d965_core_init;
@@ -1194,7 +1194,7 @@
break;
case STAC_DELL_BIOS:
switch (codec->subsystem_id) {
-@@ -5671,7 +5830,6 @@
+@@ -5677,7 +5836,6 @@
spec->num_dmics = STAC927X_NUM_DMICS;
spec->init = d965_core_init;
@@ -1202,7 +1202,7 @@
spec->dmux_nids = stac927x_dmux_nids;
spec->num_dmuxes = ARRAY_SIZE(stac927x_dmux_nids);
break;
-@@ -5684,9 +5842,12 @@
+@@ -5690,9 +5848,12 @@
spec->num_dmics = 0;
spec->init = stac927x_core_init;
@@ -1216,7 +1216,7 @@
spec->num_pwrs = 0;
spec->aloopback_ctl = stac927x_loopback;
spec->aloopback_mask = 0x40;
-@@ -5768,9 +5929,12 @@
+@@ -5774,9 +5935,12 @@
spec->num_pwrs = 0;
spec->init = stac9205_core_init;
@@ -1230,7 +1230,7 @@
spec->aloopback_mask = 0x40;
spec->aloopback_shift = 0;
/* Turn on/off EAPD per HP plugging */
-@@ -5845,12 +6009,6 @@
+@@ -5851,12 +6015,6 @@
{}
};
@@ -1243,7 +1243,7 @@
static hda_nid_t stac9872_pin_nids[] = {
0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
0x11, 0x13, 0x14,
-@@ -5864,6 +6022,11 @@
+@@ -5870,6 +6028,11 @@
0x15
};
@@ -1255,7 +1255,7 @@
static unsigned int stac9872_vaio_pin_configs[9] = {
0x03211020, 0x411111f0, 0x411111f0, 0x03a15030,
0x411111f0, 0x90170110, 0x411111f0, 0x411111f0,
-@@ -5912,8 +6075,10 @@
+@@ -5918,8 +6081,10 @@
spec->adc_nids = stac9872_adc_nids;
spec->num_muxes = ARRAY_SIZE(stac9872_mux_nids);
spec->mux_nids = stac9872_mux_nids;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-48-alc268-oops-fix new/patches.drivers/alsa-hda-48-alc268-oops-fix
--- old/patches.drivers/alsa-hda-48-alc268-oops-fix 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/alsa-hda-48-alc268-oops-fix 2009-08-20 17:53:12.000000000 +0200
@@ -0,0 +1,146 @@
+From fdbc66266c21976027938642f60e0f047149a61a Mon Sep 17 00:00:00 2001
+From: Takashi Iwai