Hello community,
here is the log from the commit of package kernel-source for openSUSE:13.1
checked in at 2013-10-11 08:52:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/kernel-source (Old)
and /work/SRC/openSUSE:13.1/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Changes:
--------
--- /work/SRC/openSUSE:13.1/kernel-source/kernel-cubox.changes 2013-10-04
07:32:17.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.kernel-source.new/kernel-cubox.changes
2013-10-11 08:52:43.000000000 +0200
@@ -1,0 +2,31 @@
+Tue Oct 8 20:02:53 CEST 2013 - ti...@suse.de
+
+- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645).
+- commit a306dfb
+
+-------------------------------------------------------------------
+Sat Oct 5 18:59:29 CEST 2013 - jsl...@suse.cz
+
+- Linux 3.11.4.
+- commit 40d7ca3
+
+-------------------------------------------------------------------
+Fri Oct 4 13:04:43 CEST 2013 - mma...@suse.cz
+
+- rpm/split-modules: Check module support only if the -extra package is
requested
+- commit add86bf
+
+-------------------------------------------------------------------
+Fri Oct 4 13:02:48 CEST 2013 - mma...@suse.cz
+
+- rpm/split-modules: Remove unused options
+- commit 3736315
+
+-------------------------------------------------------------------
+Fri Oct 4 12:57:44 CEST 2013 - mma...@suse.cz
+
+- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
+ CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
+- commit 9e5b6fe
+
+-------------------------------------------------------------------
@@ -4960,0 +4992,19 @@
+
+-------------------------------------------------------------------
+Thu Sep 22 11:18:31 CEST 2011 - mma...@suse.cz
+
+- rpm/split-modules: Print the full path for modules missing in supported.conf
+- commit e55e4c6
+
+-------------------------------------------------------------------
+Wed Sep 21 16:33:53 CEST 2011 - mma...@suse.cz
+
+- Add support for wildcards in supported.conf
+- rpm/kernel-binary.spec.in: Generate Module.supported with all
+ lines from supported conf, unsupported modules are marked as "no"
+- rpm/split-modules: Use the supported flag in modules, instead of
+ parsing the Module.supported file and report modules that have no
+ supported marking.
+- rpm/check-supported-list: Delete, this is done by split-modules
+ now.
+- commit edfdc2a
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-exynos.changes: same change
kernel-lpae.changes: same change
kernel-pae.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
Old:
----
check-supported-list
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-cubox.spec ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 3.11
-%define patchversion 3.11.3
+%define patchversion 3.11.4
%define variant %{nil}
%define vanilla_only 0
@@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
+%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_ENTERPRISE_SUPPORT == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -59,9 +59,9 @@
Name: kernel-cubox
Summary: Kernel for SolidRun Cubox
-Version: 3.11.3
+Version: 3.11.4
%if 0%{?is_kotd}
-Release: <RELEASE>.g485f0d1
+Release: <RELEASE>.ga306dfb
%else
Release: 0
%endif
@@ -161,7 +161,6 @@
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
-Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@@ -317,16 +316,27 @@
mkdir -p %kernel_build_dir
-supported_conf() {
- %_sourcedir/guards $* < %_sourcedir/supported.conf | \
- sed 's,.*/,,; s,\.ko$,,' | sort -u
-}
-
-# Generate the list of modules to be marked as supported
-{ supported_conf base
- supported_conf --default=0 external | sed 's/$/ external/'
-} > %kernel_build_dir/Module.supported
-supported_conf --default=0 base >%kernel_build_dir/Module.base
+# Generate a list of modules with their support status marking
+%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
+awk '
+ /^\+(base|yes) / {
+ print $(NF);
+ next;
+ }
+ /^\+external / {
+ print $(NF) " external";
+ next;
+ }
+ /^[-+]/ {
+ print $(NF) " no";
+ next;
+ }
+ {
+ print $(NF);
+ }
+' >%kernel_build_dir/Module.supported
+%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
+ sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
cd linux-%srcversion
@@ -671,14 +681,6 @@
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
- if ! %_sourcedir/check-supported-list \
- %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor;
then
-%if %supported_modules_check
- exit 1
-%endif
- echo "Consistency check error: please update supported.conf."
- fi
-
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -731,10 +733,12 @@
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
+%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
+ -e \
+%endif
%if ! %supported_modules_check
- -i \
+ -i
%endif
- -s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
kernel-debug.spec: same change
kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -17,16 +17,16 @@
# norootforbuild
-%define patchversion 3.11.3
+%define patchversion 3.11.4
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
Summary: Kernel Documentation
-Version: 3.11.3
+Version: 3.11.4
%if 0%{?is_kotd}
-Release: <RELEASE>.g485f0d1
+Release: <RELEASE>.ga306dfb
%else
Release: 0
%endif
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 3.11
-%define patchversion 3.11.3
+%define patchversion 3.11.4
%define variant %{nil}
%define vanilla_only 0
@@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
+%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_ENTERPRISE_SUPPORT == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -59,9 +59,9 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 3.11.3
+Version: 3.11.4
%if 0%{?is_kotd}
-Release: <RELEASE>.g485f0d1
+Release: <RELEASE>.ga306dfb
%else
Release: 0
%endif
@@ -161,7 +161,6 @@
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
-Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@@ -319,16 +318,27 @@
mkdir -p %kernel_build_dir
-supported_conf() {
- %_sourcedir/guards $* < %_sourcedir/supported.conf | \
- sed 's,.*/,,; s,\.ko$,,' | sort -u
-}
-
-# Generate the list of modules to be marked as supported
-{ supported_conf base
- supported_conf --default=0 external | sed 's/$/ external/'
-} > %kernel_build_dir/Module.supported
-supported_conf --default=0 base >%kernel_build_dir/Module.base
+# Generate a list of modules with their support status marking
+%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
+awk '
+ /^\+(base|yes) / {
+ print $(NF);
+ next;
+ }
+ /^\+external / {
+ print $(NF) " external";
+ next;
+ }
+ /^[-+]/ {
+ print $(NF) " no";
+ next;
+ }
+ {
+ print $(NF);
+ }
+' >%kernel_build_dir/Module.supported
+%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
+ sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
cd linux-%srcversion
@@ -673,14 +683,6 @@
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
- if ! %_sourcedir/check-supported-list \
- %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor;
then
-%if %supported_modules_check
- exit 1
-%endif
- echo "Consistency check error: please update supported.conf."
- fi
-
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -733,10 +735,12 @@
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
+%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
+ -e \
+%endif
%if ! %supported_modules_check
- -i \
+ -i
%endif
- -s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
kernel-exynos.spec: same change
kernel-lpae.spec: same change
kernel-pae.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 3.11
-%define patchversion 3.11.3
+%define patchversion 3.11.4
%define variant %{nil}
%define vanilla_only 0
@@ -29,9 +29,9 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 3.11.3
+Version: 3.11.4
%if 0%{?is_kotd}
-Release: <RELEASE>.g485f0d1
+Release: <RELEASE>.ga306dfb
%else
Release: 0
%endif
@@ -60,7 +60,6 @@
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
-Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@@ -111,7 +110,7 @@
# Source is only complete with devel files.
Requires: kernel-devel = %version-%release
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
+%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat
%_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -23,10 +23,10 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 3.11.3
+Version: 3.11.4
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g485f0d1
+Release: <RELEASE>.ga306dfb
%else
Release: 0
%endif
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 3.11
-%define patchversion 3.11.3
+%define patchversion 3.11.4
%define variant %{nil}
%define vanilla_only 0
@@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
+%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_ENTERPRISE_SUPPORT == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -59,9 +59,9 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
-Version: 3.11.3
+Version: 3.11.4
%if 0%{?is_kotd}
-Release: <RELEASE>.g485f0d1
+Release: <RELEASE>.ga306dfb
%else
Release: 0
%endif
@@ -164,7 +164,6 @@
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
-Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@@ -319,16 +318,27 @@
mkdir -p %kernel_build_dir
-supported_conf() {
- %_sourcedir/guards $* < %_sourcedir/supported.conf | \
- sed 's,.*/,,; s,\.ko$,,' | sort -u
-}
-
-# Generate the list of modules to be marked as supported
-{ supported_conf base
- supported_conf --default=0 external | sed 's/$/ external/'
-} > %kernel_build_dir/Module.supported
-supported_conf --default=0 base >%kernel_build_dir/Module.base
+# Generate a list of modules with their support status marking
+%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
+awk '
+ /^\+(base|yes) / {
+ print $(NF);
+ next;
+ }
+ /^\+external / {
+ print $(NF) " external";
+ next;
+ }
+ /^[-+]/ {
+ print $(NF) " no";
+ next;
+ }
+ {
+ print $(NF);
+ }
+' >%kernel_build_dir/Module.supported
+%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
+ sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
cd linux-%srcversion
@@ -673,14 +683,6 @@
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
- if ! %_sourcedir/check-supported-list \
- %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor;
then
-%if %supported_modules_check
- exit 1
-%endif
- echo "Consistency check error: please update supported.conf."
- fi
-
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -733,10 +735,12 @@
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
+%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
+ -e \
+%endif
%if ! %supported_modules_check
- -i \
+ -i
%endif
- -s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
kernel-vanilla.spec: same change
kernel-xen.spec: same change
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -46,10 +46,10 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_ENTERPRISE_SUPPORT == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -240,16 +240,27 @@
mkdir -p %kernel_build_dir
-supported_conf() {
- %_sourcedir/guards $* < %_sourcedir/supported.conf | \
- sed 's,.*/,,; s,\.ko$,,' | sort -u
-}
-
-# Generate the list of modules to be marked as supported
-{ supported_conf base
- supported_conf --default=0 external | sed 's/$/ external/'
-} > %kernel_build_dir/Module.supported
-supported_conf --default=0 base >%kernel_build_dir/Module.base
+# Generate a list of modules with their support status marking
+%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
+awk '
+ /^\+(base|yes) / {
+ print $(NF);
+ next;
+ }
+ /^\+external / {
+ print $(NF) " external";
+ next;
+ }
+ /^[-+]/ {
+ print $(NF) " no";
+ next;
+ }
+ {
+ print $(NF);
+ }
+' >%kernel_build_dir/Module.supported
+%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
+ sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
cd linux-%srcversion
@@ -594,14 +605,6 @@
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
- if ! %_sourcedir/check-supported-list \
- %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor;
then
-%if %supported_modules_check
- exit 1
-%endif
- echo "Consistency check error: please update supported.conf."
- fi
-
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -654,10 +657,12 @@
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
+%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
+ -e \
+%endif
%if ! %supported_modules_check
- -i \
+ -i
%endif
- -s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:49.000000000 +0200
@@ -60,7 +60,6 @@
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
-Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ
new/patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ
--- old/patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ 1970-01-01
01:00:00.000000000 +0100
+++ new/patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ 2013-10-08
20:02:53.000000000 +0200
@@ -0,0 +1,34 @@
+From c6cc3d58b4042f5cadae653ff8d3df26af1a0169 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <ti...@suse.de>
+Date: Tue, 8 Oct 2013 19:57:50 +0200
+Subject: [PATCH] ALSA: hda - Add fixup for ASUS N56VZ
+Git-commit: c6cc3d58b4042f5cadae653ff8d3df26af1a0169
+Patch-mainline: Submitted
+References: bnc#841645
+
+ASUS N56VZ needs a fixup for the bass speaker pin, which was already
+provided via model=asus-mode4.
+
+Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=841645
+Cc: <sta...@vger.kernel.org>
+Signed-off-by: Takashi Iwai <ti...@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 52c26d3..ed9deb6 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4596,6 +4596,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
+ SND_PCI_QUIRK(0x1028, 0x05d8, "Dell",
ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
+ SND_PCI_QUIRK(0x1028, 0x05db, "Dell",
ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
+ SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
++ SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4),
+ SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
+ SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),
+ SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
+--
+1.8.4
+
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 2020 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:50.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:50.000000000 +0200
@@ -30,6 +30,7 @@
patches.kernel.org/patch-3.11.1
patches.kernel.org/patch-3.11.1-2
patches.kernel.org/patch-3.11.2-3
+ patches.kernel.org/patch-3.11.3-4
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -472,6 +473,7 @@
##########################################################
# Sound
##########################################################
+ patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ
########################################################
# Char / serial
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:50.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:50.000000000 +0200
@@ -1,3 +1,3 @@
-2013-10-02 07:54:02 +0200
-GIT Revision: 485f0d128ebc47c0d72393c99edb2b304f7cf487
+2013-10-08 20:02:53 +0200
+GIT Revision: a306dfbfe46816f08e7c9026df7424ab47ed589d
GIT Branch: openSUSE-13.1
++++++ split-modules ++++++
--- /var/tmp/diff_new_pack.H6xRs5/_old 2013-10-11 08:52:50.000000000 +0200
+++ /var/tmp/diff_new_pack.H6xRs5/_new 2013-10-11 08:52:50.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# given a Module.supported, Module.base and modules.dep, generate list
+# given a Module.base and modules.dep, generate list
# of base / supported / unsupported modules
set -e
@@ -8,39 +8,41 @@
usage()
{
- echo "Usage: ${0##*/} -b Module.base -s Module.supported [-d dir] [-i]
[-o outdir]"
+ echo "Usage: ${0##*/} -b Module.base [-d dir] [-i] [-e] [-o outdir]"
+ echo " -i Ignore supported.conf errors"
+ echo " -e Create the -extra filelist (otherwise, treat all modules
as supported)"
}
-options=$(getopt -o b:s:d:o:i -- "$@")
+options=$(getopt -o b:d:o:ie -- "$@")
if test $? -ne 0; then
usage >&2
exit 1
fi
eval set -- "$options"
opt_base=
-opt_supp=
opt_out=.
opt_dir=.
opt_ignore_errors=false
+opt_extra=false
while test $# -gt 0; do
opt=$1
shift
case "$opt" in
- -b | -s | -d | -o | -D)
+ -b | -d | -o)
arg=$1
shift
esac
case "$opt" in
-b)
opt_base=$arg ;;
- -s)
- opt_supp=$arg ;;
-d)
opt_dir=$arg ;;
-o)
opt_out=$arg ;;
-i)
opt_ignore_errors=true ;;
+ -e)
+ opt_extra=true ;;
--)
break ;;
*)
@@ -48,7 +50,7 @@
exit 1
esac
done
-if test -z "$opt_base" -o -z "$opt_supp"; then
+if test -z "$opt_base"; then
usage >&2
exit 1
fi
@@ -61,6 +63,32 @@
awk -F/ '{ n=$NF; gsub(/-/, "_", n); sub(/\.ko$/, "", n); print n " "
$0; }' | \
sort >"$tmp/all"
+err=false
+while read mod path; do
+ if $opt_extra; then
+ support=$(/sbin/modinfo -F supported "$opt_dir/$path")
+ else
+ support=yes
+ fi
+ case "$support" in
+ yes | external)
+ echo "$mod"
+ ;;
+ no)
+ ;;
+ "")
+ echo "warning: ${path#/lib/modules/*/kernel/} not listed in
supported.conf" >&2
+ ;;
+ *)
+ echo "error: invalid support flag for $mod: $support" >&2
+ err=true
+ ;;
+ esac
+done <"$tmp/all" | sort -u >"$tmp/supp"
+if $err; then
+ exit 1
+fi
+
modules_dep=$(find "$opt_dir" -type f -name modules.dep)
if test -z "$modules_dep"; then
echo "Cannot find modules.dep in $opt_dir" >&2
@@ -86,7 +114,6 @@
join -j 1 -o 2.2 "$tmp/base" "$tmp/all" >"$opt_out/base-modules"
# main
-sed 's/ .*//; y/-/_/' "$opt_supp" | sort -u >"$tmp/supp"
add_dependent_modules "$tmp/supp-explain" <"$tmp/supp" >"$tmp/supp-all"
if ! cmp -s "$tmp/supp" "$tmp/supp-all"; then
echo "The following unsupported modules are used by supported modules:"
>&2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
