Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2015-11-02 12:54:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2015-10-28 17:26:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2015-11-02 12:54:26.000000000 +0100 @@ -1,0 +2,49 @@ +Wed Oct 28 16:41:18 CET 2015 - [email protected] + +- rpm/kernel-binary.spec.in: really pass down %{?_smp_mflags} +- commit 273a7fb + +------------------------------------------------------------------- +Wed Oct 28 08:49:09 CET 2015 - [email protected] + +- ALSA: hda - Disable 64bit address for Creative HDA controllers + (bnc#814440). +- commit ef2823b + +------------------------------------------------------------------- +Tue Oct 27 09:11:49 CET 2015 - [email protected] + +- Linux 4.2.5. +- commit 27d2719 + +------------------------------------------------------------------- +Mon Oct 26 17:15:43 CET 2015 - [email protected] + +- rpm/kernel-binary.spec.in: Use parallel make in all invocations + Also, remove the lengthy comment, since we are using a standard rpm + macro now. +- commit 4d6ba88 + +------------------------------------------------------------------- +Mon Oct 26 17:13:43 CET 2015 - [email protected] + +- rpm/kernel-binary.spec.in: Delete one more DEBUG_SECTION_MISMATCH assignment +- commit fce45dc + +------------------------------------------------------------------- +Mon Oct 26 11:26:34 CET 2015 - [email protected] + +- rpm/kernel-binary.spec.in: Do not explicitly set DEBUG_SECTION_MISMATCH + CONFIG_DEBUG_SECTION_MISMATCH is a selectable Kconfig option since + 2.6.39 and is enabled in our configs. +- commit 15aa4f8 + +------------------------------------------------------------------- +Sat Oct 24 20:59:13 CEST 2015 - [email protected] + +- config: arm: Enable ADS7846 touchscreen driver + This SPI connected chip is common on RPi TFT displays. + (cherry picked from commit 71386ea914fddea7d598c24a38a312ba210a51ae) +- commit 48484ee + +------------------------------------------------------------------- @@ -19,0 +69,9 @@ +Fri Oct 23 08:39:30 CEST 2015 - [email protected] + +- staging/dgnc: fix info leak in ioctl (CVE-2015-7885, + boo#951627). +- [media] media/vivid-osd: fix info leak in ioctl (CVE-2015-7884, + bnc#951626). +- commit 8031e24 + +------------------------------------------------------------------- @@ -27,0 +86,13 @@ +Tue Oct 20 20:38:15 CEST 2015 - [email protected] + +- Disable leftover CONFIG_FW_LOADER_USER_HELPER_FALLBACK in armv6hl/* (boo#951260) +- commit 60f5033 + +------------------------------------------------------------------- +Tue Oct 20 20:37:10 CEST 2015 - [email protected] + +- drm/sti: Remove select of CONFIG_FW_LOADER_USER_HELPER_FALLBACK + (boo#951260). +- commit e9cf2df + +------------------------------------------------------------------- @@ -40,0 +112,6 @@ +Fri Oct 16 16:01:01 CEST 2015 - [email protected] + +- rpm/kernel-source.rpmlintrc: Update the filters +- commit e26b4cc + +------------------------------------------------------------------- @@ -48,0 +126,13 @@ +Fri Oct 16 10:32:06 CEST 2015 - [email protected] + +- rpm/kernel-binary.spec.in: Use upstream script to support config.addon +- commit e8739f8 + +------------------------------------------------------------------- +Fri Oct 16 10:28:57 CEST 2015 - [email protected] + +- rpm/kernel-binary.spec.in: Drop the %build_src_dir macro + It is the parent directory of the O= directory. +- commit 2ed0dbe + +------------------------------------------------------------------- @@ -336 +426 @@ -- commit b57d276 +- commit 9012f40 @@ -3574 +3664 @@ -- commit 4f4442d +- commit 14e56cc kernel-default.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-pv.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- configtool.pl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %define vanilla_only 0 @@ -31,13 +31,12 @@ %define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2") %define build_vanilla ("%build_flavor" == "vanilla") -%define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir -%define kernel_build_dir %build_src_dir/linux-obj +%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%(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,compress-vmlinux.sh}) +%(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,log.sh,try-disable-staging-driver,compress-vmlinux.sh}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -59,9 +58,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif @@ -196,7 +195,6 @@ Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros -Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h Source69: try-disable-staging-driver @@ -275,7 +273,6 @@ NoSource: 63 NoSource: 64 NoSource: 65 -NoSource: 66 NoSource: 67 NoSource: 68 NoSource: 69 @@ -428,14 +425,13 @@ cat %_sourcedir/localversion > localversion fi +cp %my_builddir/config/%cpu_arch_flavor .config if test -e %my_builddir/config.addon/%cpu_arch_flavor; then # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at # the top of the specfile - %_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config -else - cp %my_builddir/config/%cpu_arch_flavor .config + ../scripts/kconfig/merge_config.sh -m .config %my_builddir/config.addon/%cpu_arch_flavor fi -%build_src_dir/scripts/config \ +../scripts/config \ --set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} @@ -445,7 +441,7 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -504,24 +500,15 @@ touch x509.genkey touch signing_key.x509 -# The %{_smp_mflags} 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 "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ -# kernel-$flavor.spec -# You can also set this permanently in ~/.rpmmacros: -# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}" + %if %CONFIG_KMSG_IDS == "y" chmod +x ../scripts/kmsg-doc MAKE_ARGS="$MAKE_ARGS D=2" %endif while true; do - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + make all $MAKE_ARGS 2>&1 \ | tee buildlog if test "${PIPESTATUS[0]}" -eq 0; then break @@ -543,11 +530,6 @@ %if %CONFIG_EFI_STUB == "y" BRP_PESIGN_FILES="$BRP_PESIGN_FILES /boot/vmlinuz-%kernelrelease-%build_flavor" %endif -%ifarch %ix86 -# XXX: do not sign on x86, as the repackaging changes kernel-pae -# from i686 to i586 -BRP_PESIGN_FILES="" -%endif # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary kernel-default.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -16,7 +16,7 @@ # -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -27,9 +27,9 @@ Summary: Kernel Documentation (man pages) License: GPL-2.0 Group: Documentation/Man -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %define vanilla_only 0 @@ -31,13 +31,12 @@ %define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2") %define build_vanilla ("%build_flavor" == "vanilla") -%define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir -%define kernel_build_dir %build_src_dir/linux-obj +%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%(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,compress-vmlinux.sh}) +%(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,log.sh,try-disable-staging-driver,compress-vmlinux.sh}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -59,9 +58,9 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif @@ -190,7 +189,6 @@ Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros -Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h Source69: try-disable-staging-driver @@ -269,7 +267,6 @@ NoSource: 63 NoSource: 64 NoSource: 65 -NoSource: 66 NoSource: 67 NoSource: 68 NoSource: 69 @@ -424,14 +421,13 @@ cat %_sourcedir/localversion > localversion fi +cp %my_builddir/config/%cpu_arch_flavor .config if test -e %my_builddir/config.addon/%cpu_arch_flavor; then # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at # the top of the specfile - %_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config -else - cp %my_builddir/config/%cpu_arch_flavor .config + ../scripts/kconfig/merge_config.sh -m .config %my_builddir/config.addon/%cpu_arch_flavor fi -%build_src_dir/scripts/config \ +../scripts/config \ --set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} @@ -441,7 +437,7 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -500,24 +496,15 @@ touch x509.genkey touch signing_key.x509 -# The %{_smp_mflags} 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 "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ -# kernel-$flavor.spec -# You can also set this permanently in ~/.rpmmacros: -# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}" + %if %CONFIG_KMSG_IDS == "y" chmod +x ../scripts/kmsg-doc MAKE_ARGS="$MAKE_ARGS D=2" %endif while true; do - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + make all $MAKE_ARGS 2>&1 \ | tee buildlog if test "${PIPESTATUS[0]}" -eq 0; then break @@ -539,11 +526,6 @@ %if %CONFIG_EFI_STUB == "y" BRP_PESIGN_FILES="$BRP_PESIGN_FILES /boot/vmlinuz-%kernelrelease-%build_flavor" %endif -%ifarch %ix86 -# XXX: do not sign on x86, as the repackaging changes kernel-pae -# from i686 to i586 -BRP_PESIGN_FILES="" -%endif # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -45,9 +45,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif ++++++ kernel-obs-qa-xen.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif kernel-obs-qa.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %define vanilla_only 0 @@ -31,13 +31,12 @@ %define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2") %define build_vanilla ("%build_flavor" == "vanilla") -%define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir -%define kernel_build_dir %build_src_dir/linux-obj +%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%(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,compress-vmlinux.sh}) +%(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,log.sh,try-disable-staging-driver,compress-vmlinux.sh}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -59,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif @@ -202,7 +201,6 @@ Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros -Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h Source69: try-disable-staging-driver @@ -281,7 +279,6 @@ NoSource: 63 NoSource: 64 NoSource: 65 -NoSource: 66 NoSource: 67 NoSource: 68 NoSource: 69 @@ -440,14 +437,13 @@ cat %_sourcedir/localversion > localversion fi +cp %my_builddir/config/%cpu_arch_flavor .config if test -e %my_builddir/config.addon/%cpu_arch_flavor; then # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at # the top of the specfile - %_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config -else - cp %my_builddir/config/%cpu_arch_flavor .config + ../scripts/kconfig/merge_config.sh -m .config %my_builddir/config.addon/%cpu_arch_flavor fi -%build_src_dir/scripts/config \ +../scripts/config \ --set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} @@ -457,7 +453,7 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -516,24 +512,15 @@ touch x509.genkey touch signing_key.x509 -# The %{_smp_mflags} 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 "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ -# kernel-$flavor.spec -# You can also set this permanently in ~/.rpmmacros: -# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}" + %if %CONFIG_KMSG_IDS == "y" chmod +x ../scripts/kmsg-doc MAKE_ARGS="$MAKE_ARGS D=2" %endif while true; do - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + make all $MAKE_ARGS 2>&1 \ | tee buildlog if test "${PIPESTATUS[0]}" -eq 0; then break @@ -555,11 +542,6 @@ %if %CONFIG_EFI_STUB == "y" BRP_PESIGN_FILES="$BRP_PESIGN_FILES /boot/vmlinuz-%kernelrelease-%build_flavor" %endif -%ifarch %ix86 -# XXX: do not sign on x86, as the repackaging changes kernel-pae -# from i686 to i586 -BRP_PESIGN_FILES="" -%endif # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary ++++++ kernel-pv.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %define vanilla_only 0 @@ -31,13 +31,12 @@ %define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2") %define build_vanilla ("%build_flavor" == "vanilla") -%define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir -%define kernel_build_dir %build_src_dir/linux-obj +%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%(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,compress-vmlinux.sh}) +%(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,log.sh,try-disable-staging-driver,compress-vmlinux.sh}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -59,9 +58,9 @@ Summary: The para-virtualized Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif @@ -190,7 +189,6 @@ Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros -Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h Source69: try-disable-staging-driver @@ -269,7 +267,6 @@ NoSource: 63 NoSource: 64 NoSource: 65 -NoSource: 66 NoSource: 67 NoSource: 68 NoSource: 69 @@ -423,14 +420,13 @@ cat %_sourcedir/localversion > localversion fi +cp %my_builddir/config/%cpu_arch_flavor .config if test -e %my_builddir/config.addon/%cpu_arch_flavor; then # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at # the top of the specfile - %_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config -else - cp %my_builddir/config/%cpu_arch_flavor .config + ../scripts/kconfig/merge_config.sh -m .config %my_builddir/config.addon/%cpu_arch_flavor fi -%build_src_dir/scripts/config \ +../scripts/config \ --set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} @@ -440,7 +436,7 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -499,24 +495,15 @@ touch x509.genkey touch signing_key.x509 -# The %{_smp_mflags} 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 "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ -# kernel-$flavor.spec -# You can also set this permanently in ~/.rpmmacros: -# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}" + %if %CONFIG_KMSG_IDS == "y" chmod +x ../scripts/kmsg-doc MAKE_ARGS="$MAKE_ARGS D=2" %endif while true; do - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + make all $MAKE_ARGS 2>&1 \ | tee buildlog if test "${PIPESTATUS[0]}" -eq 0; then break @@ -538,11 +525,6 @@ %if %CONFIG_EFI_STUB == "y" BRP_PESIGN_FILES="$BRP_PESIGN_FILES /boot/vmlinuz-%kernelrelease-%build_flavor" %endif -%ifarch %ix86 -# XXX: do not sign on x86, as the repackaging changes kernel-pae -# from i686 to i586 -BRP_PESIGN_FILES="" -%endif # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -18,7 +18,7 @@ %define srcversion 4.2 -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif @@ -86,7 +86,6 @@ Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros -Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h Source69: try-disable-staging-driver @@ -115,7 +114,7 @@ # Source is only complete with devel files. Requires: kernel-devel%variant = %version-%release -%(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,compress-vmlinux.sh}) +%(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,log.sh,try-disable-staging-driver,compress-vmlinux.sh}) %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.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.2.4 +Version: 4.2.5 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:32.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.4 +%define patchversion 4.2.5 %define variant %{nil} %define vanilla_only 0 @@ -31,13 +31,12 @@ %define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2") %define build_vanilla ("%build_flavor" == "vanilla") -%define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir -%define kernel_build_dir %build_src_dir/linux-obj +%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%(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,compress-vmlinux.sh}) +%(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,log.sh,try-disable-staging-driver,compress-vmlinux.sh}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -59,9 +58,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 4.2.4 +Version: 4.2.5 %if 0%{?is_kotd} -Release: <RELEASE>.g6ae5577 +Release: <RELEASE>.g0491388 %else Release: 0 %endif @@ -190,7 +189,6 @@ Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros -Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h Source69: try-disable-staging-driver @@ -269,7 +267,6 @@ NoSource: 63 NoSource: 64 NoSource: 65 -NoSource: 66 NoSource: 67 NoSource: 68 NoSource: 69 @@ -421,14 +418,13 @@ cat %_sourcedir/localversion > localversion fi +cp %my_builddir/config/%cpu_arch_flavor .config if test -e %my_builddir/config.addon/%cpu_arch_flavor; then # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at # the top of the specfile - %_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config -else - cp %my_builddir/config/%cpu_arch_flavor .config + ../scripts/kconfig/merge_config.sh -m .config %my_builddir/config.addon/%cpu_arch_flavor fi -%build_src_dir/scripts/config \ +../scripts/config \ --set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} @@ -438,7 +434,7 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -497,24 +493,15 @@ touch x509.genkey touch signing_key.x509 -# The %{_smp_mflags} 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 "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ -# kernel-$flavor.spec -# You can also set this permanently in ~/.rpmmacros: -# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}" + %if %CONFIG_KMSG_IDS == "y" chmod +x ../scripts/kmsg-doc MAKE_ARGS="$MAKE_ARGS D=2" %endif while true; do - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + make all $MAKE_ARGS 2>&1 \ | tee buildlog if test "${PIPESTATUS[0]}" -eq 0; then break @@ -536,11 +523,6 @@ %if %CONFIG_EFI_STUB == "y" BRP_PESIGN_FILES="$BRP_PESIGN_FILES /boot/vmlinuz-%kernelrelease-%build_flavor" %endif -%ifarch %ix86 -# XXX: do not sign on x86, as the repackaging changes kernel-pae -# from i686 to i586 -BRP_PESIGN_FILES="" -%endif # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default --- old/config/arm64/default 2015-10-22 15:58:57.000000000 +0200 +++ new/config/arm64/default 2015-10-27 23:56:29.000000000 +0100 @@ -2924,7 +2924,7 @@ CONFIG_TABLET_SERIAL_WACOM4=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_OF_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/vanilla new/config/arm64/vanilla --- old/config/arm64/vanilla 2015-10-22 15:58:57.000000000 +0200 +++ new/config/arm64/vanilla 2015-10-27 23:56:29.000000000 +0100 @@ -2920,7 +2920,7 @@ CONFIG_TABLET_SERIAL_WACOM4=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_OF_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/default new/config/armv6hl/default --- old/config/armv6hl/default 2015-10-22 15:58:57.000000000 +0200 +++ new/config/armv6hl/default 2015-10-27 23:56:29.000000000 +0100 @@ -1527,7 +1527,7 @@ # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y -CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_WANT_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y @@ -2544,7 +2544,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_OF_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_88PM860X=m -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/vanilla new/config/armv6hl/vanilla --- old/config/armv6hl/vanilla 2015-10-22 15:58:57.000000000 +0200 +++ new/config/armv6hl/vanilla 2015-10-27 23:56:29.000000000 +0100 @@ -2541,7 +2541,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_OF_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_88PM860X=m -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default --- old/config/armv7hl/default 2015-10-22 15:58:57.000000000 +0200 +++ new/config/armv7hl/default 2015-10-27 23:56:29.000000000 +0100 @@ -3269,7 +3269,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_OF_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_88PM860X=m -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae --- old/config/armv7hl/lpae 2015-10-22 15:58:57.000000000 +0200 +++ new/config/armv7hl/lpae 2015-10-27 23:56:29.000000000 +0100 @@ -3164,7 +3164,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_OF_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_88PM860X=m -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/vanilla new/config/armv7hl/vanilla --- old/config/armv7hl/vanilla 2015-10-22 15:58:57.000000000 +0200 +++ new/config/armv7hl/vanilla 2015-10-27 23:56:29.000000000 +0100 @@ -3266,7 +3266,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_OF_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_88PM860X=m -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:33.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:33.000000000 +0100 @@ -31,11 +31,10 @@ %define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2") %define build_vanilla ("%build_flavor" == "vanilla") -%define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir -%define kernel_build_dir %build_src_dir/linux-obj +%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj %(chmod +x %_sourcedir/{@SCRIPTS@}) @@ -295,14 +294,13 @@ cat %_sourcedir/localversion > localversion fi +cp %my_builddir/config/%cpu_arch_flavor .config if test -e %my_builddir/config.addon/%cpu_arch_flavor; then # FIXME: config.addon doesn't affect the %CONFIG_ macros defined at # the top of the specfile - %_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config -else - cp %my_builddir/config/%cpu_arch_flavor .config + ../scripts/kconfig/merge_config.sh -m .config %my_builddir/config.addon/%cpu_arch_flavor fi -%build_src_dir/scripts/config \ +../scripts/config \ --set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} @@ -312,7 +310,7 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -371,24 +369,15 @@ touch x509.genkey touch signing_key.x509 -# The %{_smp_mflags} 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 "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ -# kernel-$flavor.spec -# You can also set this permanently in ~/.rpmmacros: -# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) +MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}" + %if %CONFIG_KMSG_IDS == "y" chmod +x ../scripts/kmsg-doc MAKE_ARGS="$MAKE_ARGS D=2" %endif while true; do - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + make all $MAKE_ARGS 2>&1 \ | tee buildlog if test "${PIPESTATUS[0]}" -eq 0; then break @@ -410,11 +399,6 @@ %if %CONFIG_EFI_STUB == "y" BRP_PESIGN_FILES="$BRP_PESIGN_FILES /boot/vmlinuz-%kernelrelease-%build_flavor" %endif -%ifarch %ix86 -# XXX: do not sign on x86, as the repackaging changes kernel-pae -# from i686 to i586 -BRP_PESIGN_FILES="" -%endif # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary ++++++ kernel-source.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:33.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:33.000000000 +0100 @@ -1,10 +1,11 @@ # These zero-length files are correct: -addFilter("zero-length /usr/src/linux-3\..*obj/.*include/config.*h") +addFilter("zero-length /usr/src/linux-.*-obj/.*/include/config.*h") # vdsos are special -addFilter("shared-lib-without-dependency-information /lib/modules/3\..*/vdso/.*") -addFilter("missing-PT_GNU_STACK-section /lib/modules/3\..*/vdso/") +addFilter("shared-lib-without-dependency-information /lib/modules/[1-9].*/vdso/.*") +addFilter("missing-PT_GNU_STACK-section /lib/modules/[1-9].*/vdso/.*") # This is a stale symlink until the kernel-source package is installed: -addFilter("dangling-symlink /lib/modules/3\..*/source") +addFilter("dangling-symlink /lib/modules/[1-9].*/source") # These hidden files are fine: -addFilter ("hidden-file-or-dir /usr/src/linux-3\..*-obj/.*/.config") -addFilter ("hidden-file-or-dir /usr/src/linux-3\..*-obj/.*/.kernel-binary.spec.buildenv") +addFilter("hidden-file-or-dir /usr/src/linux-.*-obj/.*/.config") +addFilter("hidden-file-or-dir /usr/src/linux-.*-obj/.*/.kernel-binary.spec.buildenv") +addFilter("hidden-file-or-dir /boot/\..*\.hmac") ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:33.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:33.000000000 +0100 @@ -86,7 +86,6 @@ Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros -Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h Source69: try-disable-staging-driver ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Disable-64bit-address-for-Creative-HDA-cont new/patches.drivers/ALSA-hda-Disable-64bit-address-for-Creative-HDA-cont --- old/patches.drivers/ALSA-hda-Disable-64bit-address-for-Creative-HDA-cont 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Disable-64bit-address-for-Creative-HDA-cont 2015-10-28 08:49:09.000000000 +0100 @@ -0,0 +1,54 @@ +From cadd16ea33a938d49aee99edd4758cc76048b399 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <[email protected]> +Date: Tue, 27 Oct 2015 14:21:51 +0100 +Subject: [PATCH] ALSA: hda - Disable 64bit address for Creative HDA controllers +Git-commit: cadd16ea33a938d49aee99edd4758cc76048b399 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +Patch-mainline: Queued in subsystem maintainer repository +References: bnc#814440 + +We've had many reports that some Creative sound cards with CA0132 +don't work well. Some reported that it starts working after reloading +the module, while some reported it starts working when a 32bit kernel +is used. All these facts seem implying that the chip fails to +communicate when the buffer is located in 64bit address. + +This patch addresses these issues by just adding AZX_DCAPS_NO_64BIT +flag to the corresponding PCI entries. I casually had a chance to +test an SB Recon3D board, and indeed this seems helping. + +Although this hasn't been tested on all Creative devices, it's safer +to assume that this restriction applies to the rest of them, too. So +the flag is applied to all Creative entries. + +Cc: <[email protected]> +Signed-off-by: Takashi Iwai <[email protected]> + +--- + sound/pci/hda/hda_intel.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -334,6 +334,7 @@ enum { + + #define AZX_DCAPS_PRESET_CTHDA \ + (AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB |\ ++ AZX_DCAPS_NO_64BIT |\ + AZX_DCAPS_4K_BDLE_BOUNDARY | AZX_DCAPS_SNOOP_OFF) + + /* +@@ -2284,11 +2285,13 @@ static const struct pci_device_id azx_id + .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, + .class_mask = 0xffffff, + .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | ++ AZX_DCAPS_NO_64BIT | + AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + #else + /* this entry seems still valid -- i.e. without emu20kx chip */ + { PCI_DEVICE(0x1102, 0x0009), + .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | ++ AZX_DCAPS_NO_64BIT | + AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + #endif + /* CM8888 */ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-sti-Remove-select-of-CONFI_FW_LOADER_USER_HELPER new/patches.fixes/drm-sti-Remove-select-of-CONFI_FW_LOADER_USER_HELPER --- old/patches.fixes/drm-sti-Remove-select-of-CONFI_FW_LOADER_USER_HELPER 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/drm-sti-Remove-select-of-CONFI_FW_LOADER_USER_HELPER 2015-10-26 15:37:15.000000000 +0100 @@ -0,0 +1,37 @@ +From: Takashi Iwai <[email protected]> +Subject: [PATCH] drm/sti: Remove select of CONFIG_FW_LOADER_USER_HELPER_FALLBACK +Date: Mon, 19 Oct 2015 08:16:10 +0200 +Message-id: <[email protected]> +Patch-mainline: Submitted, Mon, 19 Oct 2015 08:16:10 +0200, LKML +References: boo#951260 + +The commit [4fdbc678fe4d: drm: sti: add HQVDP plane] added the select +of CONFIG_FW_LOADER_USER_HELPER_FALLBACK by some unwritten reason. +But this config is known to be harmful, and is present only for +compatibility reason for an old exotic system that mandates udev +interaction which isn't supposed to be selected by a driver. +Let's remove it. + +Fixes: 4fdbc678fe4d ('drm: sti: add HQVDP plane') +Cc: <[email protected]> +Signed-off-by: Takashi Iwai <[email protected]> + +--- + drivers/gpu/drm/sti/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig +index fbccc105819b..a18159074b76 100644 +--- a/drivers/gpu/drm/sti/Kconfig ++++ b/drivers/gpu/drm/sti/Kconfig +@@ -6,7 +6,6 @@ config DRM_STI + select DRM_GEM_CMA_HELPER + select DRM_KMS_CMA_HELPER + select DRM_PANEL +- select FW_LOADER_USER_HELPER_FALLBACK + help + Choose this option to enable DRM on STM stiH41x chipset + +-- +2.6.1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/media-media-vivid-osd-fix-info-leak-in-ioctl.patch new/patches.fixes/media-media-vivid-osd-fix-info-leak-in-ioctl.patch --- old/patches.fixes/media-media-vivid-osd-fix-info-leak-in-ioctl.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/media-media-vivid-osd-fix-info-leak-in-ioctl.patch 2015-10-26 15:37:15.000000000 +0100 @@ -0,0 +1,35 @@ +From eda98796aff0d9bf41094b06811f5def3b4c333c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Salva=20Peir=C3=B3?= <[email protected]> +Date: Wed, 7 Oct 2015 07:09:26 -0300 +Subject: [PATCH] [media] media/vivid-osd: fix info leak in ioctl +Mime-version: 1.0 +Content-type: text/plain; charset=UTF-8 +Content-transfer-encoding: 8bit +Git-commit: eda98796aff0d9bf41094b06811f5def3b4c333c +Git-repo: git://linuxtv.org/mchehab/media-next.git +Patch-mainline: Queued in subsystem maintainer repository +References: CVE-2015-7884, bnc#951626 + +The vivid_fb_ioctl() code fails to initialize the 16 _reserved bytes of +struct fb_vblank after the ->hcount member. Add an explicit +memset(0) before filling the structure to avoid the info leak. + +Signed-off-by: Salva Peiró <[email protected]> +Signed-off-by: Hans Verkuil <[email protected]> +Signed-off-by: Mauro Carvalho Chehab <[email protected]> +Acked-by: Takashi Iwai <[email protected]> + +--- + drivers/media/platform/vivid/vivid-osd.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/media/platform/vivid/vivid-osd.c ++++ b/drivers/media/platform/vivid/vivid-osd.c +@@ -85,6 +85,7 @@ static int vivid_fb_ioctl(struct fb_info + case FBIOGET_VBLANK: { + struct fb_vblank vblank; + ++ memset(&vblank, 0, sizeof(vblank)); + vblank.flags = FB_VBLANK_HAVE_COUNT | FB_VBLANK_HAVE_VCOUNT | + FB_VBLANK_HAVE_VSYNC; + vblank.count = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/staging-dgnc-fix-info-leak-in-ioctl.patch new/patches.fixes/staging-dgnc-fix-info-leak-in-ioctl.patch --- old/patches.fixes/staging-dgnc-fix-info-leak-in-ioctl.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/staging-dgnc-fix-info-leak-in-ioctl.patch 2015-10-26 15:37:15.000000000 +0100 @@ -0,0 +1,34 @@ +From 4b6184336ebb5c8dc1eae7f7ab46ee608a748b05 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Salva=20Peir=C3=B3?= <[email protected]> +Date: Wed, 14 Oct 2015 17:48:02 +0200 +Subject: [PATCH] staging/dgnc: fix info leak in ioctl +Mime-version: 1.0 +Content-type: text/plain; charset=UTF-8 +Content-transfer-encoding: 8bit +Git-commit: 4b6184336ebb5c8dc1eae7f7ab46ee608a748b05 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +Patch-mainline: Queued in subsystem maintainer repository +References: CVE-2015-7885, boo#951627 + +The dgnc_mgmt_ioctl() code fails to initialize the 16 _reserved bytes of +struct digi_dinfo after the ->dinfo_nboards member. Add an explicit +memset(0) before filling the structure to avoid the info leak. + +Signed-off-by: Salva Peiró <[email protected]> +Signed-off-by: Greg Kroah-Hartman <[email protected]> +Acked-by: Takashi Iwai <[email protected]> + +--- + drivers/staging/dgnc/dgnc_mgmt.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/dgnc/dgnc_mgmt.c ++++ b/drivers/staging/dgnc/dgnc_mgmt.c +@@ -115,6 +115,7 @@ long dgnc_mgmt_ioctl(struct file *file, + + spin_lock_irqsave(&dgnc_global_lock, flags); + ++ memset(&ddi, 0, sizeof(ddi)); + ddi.dinfo_nboards = dgnc_NumBoards; + sprintf(ddi.dinfo_version, "%s", DG_PART); + ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 2009 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:34.000000000 +0100 @@ -31,6 +31,7 @@ patches.kernel.org/patch-4.2.1-2 patches.kernel.org/patch-4.2.2-3 patches.kernel.org/patch-4.2.3-4 + patches.kernel.org/patch-4.2.4-5 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -351,10 +352,12 @@ +jeffm patches.fixes/nouveau-fix-race-with-fence-signaling patches.drivers/0001-vmwgfx-Rework-device-initialization.patch patches.drivers/0002-drm-vmwgfx-Allow-dropped-masters-render-node-like-ac.patch + patches.fixes/drm-sti-Remove-select-of-CONFI_FW_LOADER_USER_HELPER ######################################################## # video4linux ######################################################## + patches.fixes/media-media-vivid-osd-fix-info-leak-in-ioctl.patch ######################################################## # Network @@ -404,6 +407,7 @@ # Sound ########################################################## patches.drivers/ALSA-hda-Fix-deadlock-at-error-in-building-PCM + patches.drivers/ALSA-hda-Disable-64bit-address-for-Creative-HDA-cont ######################################################## # Char / serial @@ -502,6 +506,7 @@ # Staging tree patches # new drivers that are going upstream ######################################################## + patches.fixes/staging-dgnc-fix-info-leak-in-ioctl.patch ######################################################## # You'd better have a good reason for adding a patch ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.lLRKlF/_old 2015-11-02 12:54:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lLRKlF/_new 2015-11-02 12:54:34.000000000 +0100 @@ -1,3 +1,3 @@ -2015-10-24 18:00:29 +0200 -GIT Revision: 6ae5577eacb34a319fbd7bc1db7eadcaaceaa642 +2015-10-28 18:49:15 +0100 +GIT Revision: 0491388eeb2f409aa709a00b47cd55553bc6d41b GIT Branch: stable
