May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit xterm for openSUSE:Factory
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2014-05-23 15:00:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2014-05-10 08:31:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2014-05-23 15:00:23.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 22 09:04:25 UTC 2014 - gber(a)opensuse.org + +- enable support for sixel graphics originally introduced with + patch #294 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.BKy5RP/_old 2014-05-23 15:00:24.000000000 +0200 +++ /var/tmp/diff_new_pack.BKy5RP/_new 2014-05-23 15:00:24.000000000 +0200 @@ -134,6 +134,7 @@ --x-libraries=/usr/X11R6/%{_lib} \ %endif --enable-backarrow-is-erase \ + --enable-sixel-graphics make %{?_smp_mflags} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-vm for openSUSE:Factory
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2014-05-23 15:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-vm" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2014-05-17 22:01:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2014-05-23 15:00:22.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 22 11:36:51 UTC 2014 - jreidinger(a)suse.com + +- Fix passed kernel flavor (bnc#878909) +- 3.1.10 + +------------------------------------------------------------------- Old: ---- yast2-vm-3.1.9.tar.bz2 New: ---- yast2-vm-3.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.mfAmz9/_old 2014-05-23 15:00:23.000000000 +0200 +++ /var/tmp/diff_new_pack.mfAmz9/_new 2014-05-23 15:00:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.9 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-vm-3.1.9.tar.bz2 -> yast2-vm-3.1.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.9/package/yast2-vm.changes new/yast2-vm-3.1.10/package/yast2-vm.changes --- old/yast2-vm-3.1.9/package/yast2-vm.changes 2014-05-15 09:37:46.000000000 +0200 +++ new/yast2-vm-3.1.10/package/yast2-vm.changes 2014-05-22 14:07:44.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 22 11:36:51 UTC 2014 - jreidinger(a)suse.com + +- Fix passed kernel flavor (bnc#878909) +- 3.1.10 + +------------------------------------------------------------------- Wed May 14 15:57:31 UTC 2014 - jreidinger(a)suse.com - adapt to new yast2-bootloader API(bnc#869608) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.9/package/yast2-vm.spec new/yast2-vm-3.1.10/package/yast2-vm.spec --- old/yast2-vm-3.1.9/package/yast2-vm.spec 2014-05-15 09:37:46.000000000 +0200 +++ new/yast2-vm-3.1.10/package/yast2-vm.spec 2014-05-22 14:07:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.9 +Version: 3.1.10 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.9/src/modules/VM_XEN.rb new/yast2-vm-3.1.10/src/modules/VM_XEN.rb --- old/yast2-vm-3.1.9/src/modules/VM_XEN.rb 2014-05-15 09:37:46.000000000 +0200 +++ new/yast2-vm-3.1.10/src/modules/VM_XEN.rb 2014-05-22 14:07:44.000000000 +0200 @@ -505,12 +505,12 @@ SCR.Execute(path(".target.bash"), cmd) else # For s390, make sure /etc/zipl.conf contain switch_amode - switch_amode = Bootloader.kernel_param(:current, "switch_amode") + switch_amode = Bootloader.kernel_param(:common, "switch_amode") if switch_amode == :missing Builtins.y2milestone( "No switch_amode kernel boot parameter in /etc/zipl.conf, adding ..." ) - Bootloader.modify_kernel_params(:current, "switch_amode", :present) + Bootloader.modify_kernel_params(:common, "switch_amode", :present) if Bootloader.Write zipl_updated = true Builtins.y2milestone( -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libXfont for openSUSE:13.1:Update
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package libXfont for openSUSE:13.1:Update checked in at 2014-05-23 13:20:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/libXfont (Old) and /work/SRC/openSUSE:13.1:Update/.libXfont.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXfont" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.VgJf1F/_old 2014-05-23 13:20:41.000000000 +0200 +++ /var/tmp/diff_new_pack.VgJf1F/_new 2014-05-23 13:20:41.000000000 +0200 @@ -1 +1 @@ -<link package='libXfont.2465' cicount='copy' /> +<link package='libXfont.2823' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libXfont for openSUSE:12.3:Update
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package libXfont for openSUSE:12.3:Update checked in at 2014-05-23 13:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/libXfont (Old) and /work/SRC/openSUSE:12.3:Update/.libXfont.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXfont" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.k2zMMu/_old 2014-05-23 13:20:40.000000000 +0200 +++ /var/tmp/diff_new_pack.k2zMMu/_new 2014-05-23 13:20:40.000000000 +0200 @@ -1 +1 @@ -<link package='libXfont.2465' cicount='copy' /> +<link package='libXfont.2823' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-LWP-Protocol-https for openSUSE:12.3:Update
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package perl-LWP-Protocol-https for openSUSE:12.3:Update checked in at 2014-05-23 13:20:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/perl-LWP-Protocol-https (Old) and /work/SRC/openSUSE:12.3:Update/.perl-LWP-Protocol-https.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-LWP-Protocol-https" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='perl-LWP-Protocol-https.2818' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-LWP-Protocol-https.2818 for openSUSE:12.3:Update
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package perl-LWP-Protocol-https.2818 for openSUSE:12.3:Update checked in at 2014-05-23 13:20:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/perl-LWP-Protocol-https.2818 (Old) and /work/SRC/openSUSE:12.3:Update/.perl-LWP-Protocol-https.2818.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-LWP-Protocol-https.2818" Changes: -------- New Changes file: --- /dev/null 2014-05-19 01:51:27.372033255 +0200 +++ /work/SRC/openSUSE:12.3:Update/.perl-LWP-Protocol-https.2818.new/perl-LWP-Protocol-https.changes 2014-05-23 13:20:27.000000000 +0200 @@ -0,0 +1,19 @@ +------------------------------------------------------------------- +Tue Feb 21 11:26:38 UTC 2012 - coolo(a)suse.com + +- updated to 6.03 + * Skip test if offline [RT#74163] + * Typo fixes + * Restore perl-5.8.1 compatibility. + +------------------------------------------------------------------- +Tue Mar 29 12:06:43 UTC 2011 - vcizek(a)novell.com + +- initial package 6.02 + * created by cpanspec 1.78.03 + + This module used to be bundled with the libwww-perl, but it was unbundled in + v6.02 in order to be able to declare its dependencies properly for the CPAN + tool-chain. Applications that need https support can just declare their + dependency on LWP::Protocol::https and will no longer need to know what + underlying modules to install. New: ---- LWP-Protocol-https-6.03-systemca.diff LWP-Protocol-https-6.03.tar.gz perl-LWP-Protocol-https.changes perl-LWP-Protocol-https.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-LWP-Protocol-https.spec ++++++ # # spec file for package perl-LWP-Protocol-https # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: perl-LWP-Protocol-https Version: 6.03 Release: 0 %define cpan_name LWP-Protocol-https Summary: Provide https support for LWP::UserAgent License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/LWP-Protocol-https/ Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz # patch for using system certificates Patch0: %{cpan_name}-6.03-systemca.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(IO::Socket::SSL) >= 1.54 BuildRequires: perl(LWP::UserAgent) >= 6.04 #BuildRequires: perl(Mozilla::CA) >= 20110101 BuildRequires: perl(Net::HTTPS) >= 6 #BuildRequires: perl(LWP::Protocol::http) Requires: perl(IO::Socket::SSL) >= 1.54 Requires: perl(LWP::UserAgent) >= 6.04 #Requires: perl(Mozilla::CA) >= 20110101 Requires: perl(Net::HTTPS) >= 6 %{perl_requires} %description The LWP::Protocol::https module provides support for using https schemed URLs with LWP. This module is a plug-in to the LWP protocol handling, so you don't use it directly. Once the module is installed LWP is able to access sites using HTTP over SSL/TLS. If hostname verification is requested by LWP::UserAgent's 'ssl_opts', and neither 'SSL_ca_file' nor 'SSL_ca_path' is set, then 'SSL_ca_file' is implied to be the one provided by Mozilla::CA. If the Mozilla::CA module isn't available SSL requests will fail. Either install this module, set up an alternative 'SSL_ca_file' or disable hostname verification. This module used to be bundled with the libwww-perl, but it was unbundled in v6.02 in order to be able to declare its dependencies properly for the CPAN tool-chain. Applications that need https support can just declare their dependency on LWP::Protocol::https and will no longer need to know what underlying modules to install. %prep %setup -q -n %{cpan_name}-%{version} %patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist %files -f %{name}.files %defattr(-,root,root,755) %doc Changes README %changelog ++++++ LWP-Protocol-https-6.03-systemca.diff ++++++ Index: LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm =================================================================== --- LWP-Protocol-https-6.03.orig/lib/LWP/Protocol/https.pm 2012-02-18 23:53:36.000000000 +0100 +++ LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm 2012-02-21 12:32:56.614080436 +0100 @@ -20,6 +20,7 @@ sub _extra_sock_opts $ssl_opts{SSL_verifycn_scheme} = 'www'; } if ($ssl_opts{SSL_verify_mode}) { + $ssl_opts{SSL_ca_path} ||= '/etc/ssl/certs'; unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { eval { require Mozilla::CA; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vhba-kmp for openSUSE:13.1:Update
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package vhba-kmp for openSUSE:13.1:Update checked in at 2014-05-23 11:07:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/vhba-kmp (Old) and /work/SRC/openSUSE:13.1:Update/.vhba-kmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vhba-kmp" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.GOWQy9/_old 2014-05-23 11:07:48.000000000 +0200 +++ /var/tmp/diff_new_pack.GOWQy9/_new 2014-05-23 11:07:48.000000000 +0200 @@ -1 +1 @@ -<link package='vhba-kmp.2549' cicount='copy' /> +<link package='vhba-kmp.2836' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav for openSUSE:13.1:Update
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package clamav for openSUSE:13.1:Update checked in at 2014-05-23 11:02:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/clamav (Old) and /work/SRC/openSUSE:13.1:Update/.clamav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clamav" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.EnFqZs/_old 2014-05-23 11:02:43.000000000 +0200 +++ /var/tmp/diff_new_pack.EnFqZs/_new 2014-05-23 11:02:43.000000000 +0200 @@ -1 +1 @@ -<link package='clamav.2582' cicount='copy' /> +<link package='clamav.2817' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav for openSUSE:12.3:Update
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package clamav for openSUSE:12.3:Update checked in at 2014-05-23 11:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/clamav (Old) and /work/SRC/openSUSE:12.3:Update/.clamav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clamav" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.TksP7D/_old 2014-05-23 11:02:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TksP7D/_new 2014-05-23 11:02:41.000000000 +0200 @@ -1 +1 @@ -<link package='clamav.2582' cicount='copy' /> +<link package='clamav.2817' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 23 May '14

23 May '14

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-05-23 10:55:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-04-13 08:28:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-05-23 10:55:55.000000000 +0200 @@ -1,0 +2,601 @@ +Wed May 21 19:34:45 CEST 2014 - jdelvare(a)suse.de + +- Fix a typo in config/ppc/vanilla, sorry +- commit cc68f12 + +------------------------------------------------------------------- +Wed May 21 19:18:25 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable unused RTC platform drivers +- commit 85c0b8b + +------------------------------------------------------------------- +Wed May 21 15:48:03 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable the rtc-moxart driver + This driver is only needed on Moxa ART systems, which we do not + support. +- commit 9939e8f + +------------------------------------------------------------------- +Tue May 20 15:14:35 CEST 2014 - jbeulich(a)suse.com + +- supported.conf: Take care of a few driver renames/splits/etc. +- commit ed5e591 + +------------------------------------------------------------------- +Tue May 20 08:21:20 CEST 2014 - jbeulich(a)suse.com + +- Update Xen config files: Set compatibility level back to 4.1 + (bnc#851338). +- commit 22da852 + +------------------------------------------------------------------- +Mon May 19 17:13:58 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/default config file: CONFIG_DRM_PTN3460=y + Align on what exynos has, in anticipation of both files being + merged someday. +- commit 8ba853c + +------------------------------------------------------------------- +Mon May 19 17:12:24 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable DRM_PTN3460 + Currently it's only needed on arm/exynos. +- commit 6f380e7 + +------------------------------------------------------------------- +Mon May 19 14:33:16 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/exynos config file: CONFIG_DRM_PTN3460=y + DRM_EXYNOS_DP depends on DRM_PTN3460, and we have the former built-in, + so the latter must be built-in as well. Otherwise we get a linker + failure like: + .../linux-3.15-rc5/drivers/gpu/drm/exynos/exynos_dp_core.c:1004: + undefined reference to `ptn3460_init' +- commit bb0a6e6 + +------------------------------------------------------------------- +Fri May 16 22:05:47 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable all EG20T drivers except on i386 + EG20T (aka Topcliff PCH) is a chipset for 32-bit x86 processors, so + we only need these drivers on i386. +- commit 923c7d2 + +------------------------------------------------------------------- +Fri May 16 15:58:47 CEST 2014 - mhocko(a)suse.cz + +- memcg: fix swapcache charge from kernel thread context (bnc#878306). +- commit 8eaaed7 + +------------------------------------------------------------------- +Fri May 16 14:47:44 CEST 2014 - jdelvare(a)suse.de + +- Update arm64 config file to fix the build +- commit beb76a8 + +------------------------------------------------------------------- +Fri May 16 12:46:15 CEST 2014 - afaerber(a)suse.de + +- config: armv6hl: Update config to 3.15-rc5 +- commit 15546e3 + +------------------------------------------------------------------- +Fri May 16 12:46:14 CEST 2014 - afaerber(a)suse.de + +- config: armv7hl: Update configs to 3.15-rc5 +- commit de0d16f + +------------------------------------------------------------------- +Thu May 15 18:23:06 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/lpae config file: Enable SERIAL_TEGRA + Despite what the Kconfig text says, the serial-tegra driver works on + all Tegra platforms. +- commit 222a09f + +------------------------------------------------------------------- +Thu May 15 17:39:27 CEST 2014 - jdelvare(a)suse.de + +- Update ppc64le config files: Disable DA903x support completely + It makes no sense to support some sub-drivers and not the rest. +- commit 269e033 + +------------------------------------------------------------------- +Thu May 15 17:02:27 CEST 2014 - duwe(a)suse.de + +- Update config files: + i386/x86_64/ppc64/ppc64le disable: + timeriomem-rng + pwm-pca9685 + unsupported RTC drivers + ssd1307fb/da903x_bl +- commit 7725871 + +------------------------------------------------------------------- +Wed May 14 18:41:03 CEST 2014 - afaerber(a)suse.de + +- config: arm64: Update config for 3.15 +- commit 2d96bf1 + +------------------------------------------------------------------- +Wed May 14 12:01:16 CEST 2014 - jbeulich(a)suse.com + +- Update Xen patches to 3.15-rc5. +- privcmd: actually batch hypercalls for batch ioctls. +- Refresh patches.xen/xen-blkfront-indirect (bnc#876786). +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 9ebd57d + +------------------------------------------------------------------- +Wed May 14 11:47:08 CEST 2014 - jbeulich(a)suse.com + +- Refresh patches.suse/stack-unwind (dump_trace_unwind() can be static). +- commit 47a05b6 + +------------------------------------------------------------------- +Tue May 13 18:16:15 CEST 2014 - jdelvare(a)suse.de + +- Update ec2 config files: Disable CAN support + It was enabled by accident. +- commit 4f49dd9 + +------------------------------------------------------------------- +Tue May 13 08:44:43 CEST 2014 - jbeulich(a)suse.com + +- patches.suse/stack-unwind: Drop bogus (redundant) asmlinkage from + unwind_init_running() definition. +- commit d2673c3 + +------------------------------------------------------------------- +Mon May 12 18:45:00 CEST 2014 - tiwai(a)suse.de + +- pvpanic: Set high notifier priority (bnc#875220). +- commit da0842c + +------------------------------------------------------------------- +Mon May 12 15:27:30 CEST 2014 - jeffm(a)suse.de + +- Update to 3.15-rc5. +- Eliminated 2 patches. +- Config changes: + - CAN_C_CAN_STRICT_FRAME_ORDERING=n (default) +- commit 7f2c6bf + +------------------------------------------------------------------- +Wed May 7 15:45:30 CEST 2014 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well +- commit 3375bd7 + +------------------------------------------------------------------- +Wed May 7 14:48:12 CEST 2014 - jdelvare(a)suse.de + +- Update x86 config files: Disable unused CAN drivers + Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T + CAN drivers on x86_64. These are believed to be useless, and will + only be enabled upon explicit request. +- commit dab25a2 + +------------------------------------------------------------------- +Wed May 7 13:56:06 CEST 2014 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package + Also, get rid of the comparison of the base and devel filelist. +- commit f1e303f + +------------------------------------------------------------------- +Wed May 7 12:02:52 CEST 2014 - tiwai(a)suse.de + +- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699). +- commit efc8676 + +------------------------------------------------------------------- +Tue May 6 18:12:01 CEST 2014 - mmarek(a)suse.cz ++++ 462 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 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-obs-build.changes: same change New Changes file: --- /dev/null 2014-05-19 01:51:27.372033255 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa-xen.changes 2014-05-23 10:55:56.000000000 +0200 @@ -0,0 +1,31472 @@ +------------------------------------------------------------------- +Wed May 21 19:34:45 CEST 2014 - jdelvare(a)suse.de + +- Fix a typo in config/ppc/vanilla, sorry +- commit cc68f12 + +------------------------------------------------------------------- +Wed May 21 19:18:25 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable unused RTC platform drivers +- commit 85c0b8b + +------------------------------------------------------------------- +Wed May 21 15:48:03 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable the rtc-moxart driver + This driver is only needed on Moxa ART systems, which we do not + support. +- commit 9939e8f + +------------------------------------------------------------------- +Tue May 20 15:14:35 CEST 2014 - jbeulich(a)suse.com + +- supported.conf: Take care of a few driver renames/splits/etc. +- commit ed5e591 + +------------------------------------------------------------------- +Tue May 20 08:21:20 CEST 2014 - jbeulich(a)suse.com + +- Update Xen config files: Set compatibility level back to 4.1 + (bnc#851338). +- commit 22da852 + +------------------------------------------------------------------- +Mon May 19 17:13:58 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/default config file: CONFIG_DRM_PTN3460=y + Align on what exynos has, in anticipation of both files being + merged someday. +- commit 8ba853c + +------------------------------------------------------------------- +Mon May 19 17:12:24 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable DRM_PTN3460 + Currently it's only needed on arm/exynos. +- commit 6f380e7 + +------------------------------------------------------------------- +Mon May 19 14:33:16 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/exynos config file: CONFIG_DRM_PTN3460=y + DRM_EXYNOS_DP depends on DRM_PTN3460, and we have the former built-in, + so the latter must be built-in as well. Otherwise we get a linker + failure like: + .../linux-3.15-rc5/drivers/gpu/drm/exynos/exynos_dp_core.c:1004: + undefined reference to `ptn3460_init' +- commit bb0a6e6 + +------------------------------------------------------------------- +Fri May 16 22:05:47 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable all EG20T drivers except on i386 + EG20T (aka Topcliff PCH) is a chipset for 32-bit x86 processors, so + we only need these drivers on i386. +- commit 923c7d2 + +------------------------------------------------------------------- +Fri May 16 15:58:47 CEST 2014 - mhocko(a)suse.cz + +- memcg: fix swapcache charge from kernel thread context (bnc#878306). +- commit 8eaaed7 + +------------------------------------------------------------------- +Fri May 16 14:47:44 CEST 2014 - jdelvare(a)suse.de + +- Update arm64 config file to fix the build +- commit beb76a8 + +------------------------------------------------------------------- +Fri May 16 12:46:15 CEST 2014 - afaerber(a)suse.de + +- config: armv6hl: Update config to 3.15-rc5 +- commit 15546e3 + +------------------------------------------------------------------- +Fri May 16 12:46:14 CEST 2014 - afaerber(a)suse.de + +- config: armv7hl: Update configs to 3.15-rc5 +- commit de0d16f + +------------------------------------------------------------------- +Thu May 15 18:23:06 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/lpae config file: Enable SERIAL_TEGRA + Despite what the Kconfig text says, the serial-tegra driver works on + all Tegra platforms. +- commit 222a09f + +------------------------------------------------------------------- +Thu May 15 17:39:27 CEST 2014 - jdelvare(a)suse.de + +- Update ppc64le config files: Disable DA903x support completely + It makes no sense to support some sub-drivers and not the rest. +- commit 269e033 + +------------------------------------------------------------------- +Thu May 15 17:02:27 CEST 2014 - duwe(a)suse.de + +- Update config files: + i386/x86_64/ppc64/ppc64le disable: + timeriomem-rng + pwm-pca9685 + unsupported RTC drivers + ssd1307fb/da903x_bl +- commit 7725871 + +------------------------------------------------------------------- +Wed May 14 18:41:03 CEST 2014 - afaerber(a)suse.de + +- config: arm64: Update config for 3.15 +- commit 2d96bf1 + +------------------------------------------------------------------- +Wed May 14 12:01:16 CEST 2014 - jbeulich(a)suse.com + +- Update Xen patches to 3.15-rc5. +- privcmd: actually batch hypercalls for batch ioctls. +- Refresh patches.xen/xen-blkfront-indirect (bnc#876786). +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 9ebd57d + +------------------------------------------------------------------- +Wed May 14 11:47:08 CEST 2014 - jbeulich(a)suse.com + +- Refresh patches.suse/stack-unwind (dump_trace_unwind() can be static). +- commit 47a05b6 + +------------------------------------------------------------------- +Tue May 13 18:16:15 CEST 2014 - jdelvare(a)suse.de + +- Update ec2 config files: Disable CAN support + It was enabled by accident. +- commit 4f49dd9 + +------------------------------------------------------------------- +Tue May 13 08:44:43 CEST 2014 - jbeulich(a)suse.com + +- patches.suse/stack-unwind: Drop bogus (redundant) asmlinkage from + unwind_init_running() definition. +- commit d2673c3 + +------------------------------------------------------------------- +Mon May 12 18:45:00 CEST 2014 - tiwai(a)suse.de + +- pvpanic: Set high notifier priority (bnc#875220). +- commit da0842c + +------------------------------------------------------------------- +Mon May 12 15:27:30 CEST 2014 - jeffm(a)suse.de + +- Update to 3.15-rc5. +- Eliminated 2 patches. +- Config changes: + - CAN_C_CAN_STRICT_FRAME_ORDERING=n (default) +- commit 7f2c6bf + +------------------------------------------------------------------- +Wed May 7 15:45:30 CEST 2014 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well +- commit 3375bd7 + +------------------------------------------------------------------- +Wed May 7 14:48:12 CEST 2014 - jdelvare(a)suse.de + +- Update x86 config files: Disable unused CAN drivers + Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T + CAN drivers on x86_64. These are believed to be useless, and will + only be enabled upon explicit request. +- commit dab25a2 + +------------------------------------------------------------------- +Wed May 7 13:56:06 CEST 2014 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package + Also, get rid of the comparison of the base and devel filelist. +- commit f1e303f + +------------------------------------------------------------------- +Wed May 7 12:02:52 CEST 2014 - tiwai(a)suse.de + +- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699). +- commit efc8676 + +------------------------------------------------------------------- ++++ 31275 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa-xen.changes --- /work/SRC/openSUSE:Factory/kernel-source/kernel-obs-qa.changes 2014-04-13 08:28:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa.changes 2014-05-23 10:55:56.000000000 +0200 @@ -1,0 +2,601 @@ +Wed May 21 19:34:45 CEST 2014 - jdelvare(a)suse.de + +- Fix a typo in config/ppc/vanilla, sorry +- commit cc68f12 + +------------------------------------------------------------------- +Wed May 21 19:18:25 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable unused RTC platform drivers +- commit 85c0b8b + +------------------------------------------------------------------- +Wed May 21 15:48:03 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable the rtc-moxart driver + This driver is only needed on Moxa ART systems, which we do not + support. +- commit 9939e8f + +------------------------------------------------------------------- +Tue May 20 15:14:35 CEST 2014 - jbeulich(a)suse.com + +- supported.conf: Take care of a few driver renames/splits/etc. +- commit ed5e591 + +------------------------------------------------------------------- +Tue May 20 08:21:20 CEST 2014 - jbeulich(a)suse.com + +- Update Xen config files: Set compatibility level back to 4.1 + (bnc#851338). +- commit 22da852 + +------------------------------------------------------------------- +Mon May 19 17:13:58 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/default config file: CONFIG_DRM_PTN3460=y + Align on what exynos has, in anticipation of both files being + merged someday. +- commit 8ba853c + +------------------------------------------------------------------- +Mon May 19 17:12:24 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable DRM_PTN3460 + Currently it's only needed on arm/exynos. +- commit 6f380e7 + +------------------------------------------------------------------- +Mon May 19 14:33:16 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/exynos config file: CONFIG_DRM_PTN3460=y + DRM_EXYNOS_DP depends on DRM_PTN3460, and we have the former built-in, + so the latter must be built-in as well. Otherwise we get a linker + failure like: + .../linux-3.15-rc5/drivers/gpu/drm/exynos/exynos_dp_core.c:1004: + undefined reference to `ptn3460_init' +- commit bb0a6e6 + +------------------------------------------------------------------- +Fri May 16 22:05:47 CEST 2014 - jdelvare(a)suse.de + +- Update config files: Disable all EG20T drivers except on i386 + EG20T (aka Topcliff PCH) is a chipset for 32-bit x86 processors, so + we only need these drivers on i386. +- commit 923c7d2 + +------------------------------------------------------------------- +Fri May 16 15:58:47 CEST 2014 - mhocko(a)suse.cz + +- memcg: fix swapcache charge from kernel thread context (bnc#878306). +- commit 8eaaed7 + +------------------------------------------------------------------- +Fri May 16 14:47:44 CEST 2014 - jdelvare(a)suse.de + +- Update arm64 config file to fix the build +- commit beb76a8 + +------------------------------------------------------------------- +Fri May 16 12:46:15 CEST 2014 - afaerber(a)suse.de + +- config: armv6hl: Update config to 3.15-rc5 +- commit 15546e3 + +------------------------------------------------------------------- +Fri May 16 12:46:14 CEST 2014 - afaerber(a)suse.de + +- config: armv7hl: Update configs to 3.15-rc5 +- commit de0d16f + +------------------------------------------------------------------- +Thu May 15 18:23:06 CEST 2014 - jdelvare(a)suse.de + +- Update armv7hl/lpae config file: Enable SERIAL_TEGRA + Despite what the Kconfig text says, the serial-tegra driver works on + all Tegra platforms. +- commit 222a09f + +------------------------------------------------------------------- +Thu May 15 17:39:27 CEST 2014 - jdelvare(a)suse.de + +- Update ppc64le config files: Disable DA903x support completely + It makes no sense to support some sub-drivers and not the rest. +- commit 269e033 + +------------------------------------------------------------------- +Thu May 15 17:02:27 CEST 2014 - duwe(a)suse.de + +- Update config files: + i386/x86_64/ppc64/ppc64le disable: + timeriomem-rng + pwm-pca9685 + unsupported RTC drivers + ssd1307fb/da903x_bl +- commit 7725871 + +------------------------------------------------------------------- +Wed May 14 18:41:03 CEST 2014 - afaerber(a)suse.de + +- config: arm64: Update config for 3.15 +- commit 2d96bf1 + +------------------------------------------------------------------- +Wed May 14 12:01:16 CEST 2014 - jbeulich(a)suse.com + +- Update Xen patches to 3.15-rc5. +- privcmd: actually batch hypercalls for batch ioctls. +- Refresh patches.xen/xen-blkfront-indirect (bnc#876786). +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 9ebd57d + +------------------------------------------------------------------- +Wed May 14 11:47:08 CEST 2014 - jbeulich(a)suse.com + +- Refresh patches.suse/stack-unwind (dump_trace_unwind() can be static). +- commit 47a05b6 + +------------------------------------------------------------------- +Tue May 13 18:16:15 CEST 2014 - jdelvare(a)suse.de + +- Update ec2 config files: Disable CAN support + It was enabled by accident. +- commit 4f49dd9 + +------------------------------------------------------------------- +Tue May 13 08:44:43 CEST 2014 - jbeulich(a)suse.com + +- patches.suse/stack-unwind: Drop bogus (redundant) asmlinkage from + unwind_init_running() definition. +- commit d2673c3 + +------------------------------------------------------------------- +Mon May 12 18:45:00 CEST 2014 - tiwai(a)suse.de + +- pvpanic: Set high notifier priority (bnc#875220). +- commit da0842c + +------------------------------------------------------------------- +Mon May 12 15:27:30 CEST 2014 - jeffm(a)suse.de + +- Update to 3.15-rc5. +- Eliminated 2 patches. +- Config changes: + - CAN_C_CAN_STRICT_FRAME_ORDERING=n (default) +- commit 7f2c6bf + +------------------------------------------------------------------- +Wed May 7 15:45:30 CEST 2014 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well +- commit 3375bd7 + +------------------------------------------------------------------- +Wed May 7 14:48:12 CEST 2014 - jdelvare(a)suse.de + +- Update x86 config files: Disable unused CAN drivers + Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T + CAN drivers on x86_64. These are believed to be useless, and will + only be enabled upon explicit request. +- commit dab25a2 + +------------------------------------------------------------------- +Wed May 7 13:56:06 CEST 2014 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package + Also, get rid of the comparison of the base and devel filelist. +- commit f1e303f + +------------------------------------------------------------------- +Wed May 7 12:02:52 CEST 2014 - tiwai(a)suse.de + +- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699). +- commit efc8676 + +------------------------------------------------------------------- +Tue May 6 18:12:01 CEST 2014 - mmarek(a)suse.cz ++++ 462 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-obs-qa.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa.changes kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- kernel-trace.changes kernel-trace.spec linux-3.14.tar.xz New: ---- kernel-obs-qa-xen.changes kernel-obs-qa-xen.spec linux-3.15-rc5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor debug %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -151,7 +150,7 @@ Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -533,49 +532,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -641,8 +611,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -698,7 +669,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -726,6 +697,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -869,7 +842,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -877,22 +850,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -905,10 +895,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1070,16 +1057,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor default %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -159,7 +158,7 @@ Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -540,49 +539,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -648,8 +618,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -705,7 +676,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -733,6 +704,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -876,7 +849,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -884,22 +857,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -912,10 +902,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1075,16 +1062,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor desktop %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel optimized for the desktop License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -542,49 +541,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -650,8 +620,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -707,7 +678,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -735,6 +706,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -878,7 +851,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -886,22 +859,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -914,10 +904,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1103,16 +1090,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 3.14.0 +%define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,9 +25,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor ec2 %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -532,49 +531,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -640,8 +610,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -697,7 +668,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -725,6 +696,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -868,7 +841,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -876,22 +849,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -904,10 +894,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1073,16 +1060,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-exynos.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor exynos %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel for Samsung's Exynos SoC License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -529,49 +528,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -637,8 +607,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -694,7 +665,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -722,6 +693,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -865,7 +838,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -873,22 +846,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -901,10 +891,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1064,16 +1051,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor lpae %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -530,49 +529,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -638,8 +608,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -695,7 +666,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -723,6 +694,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -866,7 +839,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -874,22 +847,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -902,10 +892,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1067,16 +1054,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 3.14.0 +%define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -33,11 +33,11 @@ %ifarch %ix86 x86_64 BuildRequires: kernel-xen %endif -ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1320 # For SLE 11 -BuildRequires: yast2-bootloader BuildRequires: mkinitrd +BuildRequires: perl-Bootloader BuildRoot: %{_tmppath}/%{name}-%{version}-build %else BuildRequires: dracut @@ -45,9 +45,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -115,7 +115,7 @@ %else dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-$.*-default$,\1,p'` %ifarch %ix86 x86_64 -dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-$.*-xen$,\1,p'` +dracut --host-only --drivers="$KERNEL_MODULES xenblk" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-$.*-xen$,\1,p'` %endif %endif ++++++ kernel-obs-qa-xen.spec ++++++ # # spec file for package kernel-obs-qa # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # needsrootforbuild %define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-obs-qa-xen BuildRequires: kernel-xen # kernel-obs-build must be also configured as VMinstall, but is required # here as well to avoid that qa and build package build parallel BuildRequires: kernel-obs-build BuildRequires: modutils ExclusiveArch: %ix86 x86_64 %if 0%{?suse_version} < 1200 # for SLE 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES Version: 3.15.rc5 %if 0%{?is_kotd} Release: <RELEASE>.gcc68f12 %else Release: 0 %endif %description This package is using the kernel compiled within Open Build Service(OBS) projects and runs basic tests. %prep %build %check # More tests are comming, currently the main test is the existens of # this spec file. It does trigger a build within OBS VM which is using # the kernel of the same project. # test suites should be packaged in other packages, but build required # and called here. if ! /sbin/modprobe loop; then echo "ERROR: Unable to load the kernel loop module." echo "Usually the wrong kernel is running, this is atm" cat /proc/version echo "Installed kernel modules are:" rpm -q kernel-xen exit 1 fi %install mkdir -p %{buildroot}/usr/share/%name touch %{buildroot}/usr/share/%name/logfile %files %defattr(-,root,root) /usr/share/%name %changelog ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -17,18 +17,18 @@ # needsrootforbuild -%define patchversion 3.14.0 +%define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-obs-qa BuildRequires: kernel-default +# kernel-obs-build must be also configured as VMinstall, but is required +# here as well to avoid that qa and build package build parallel +BuildRequires: kernel-obs-build BuildRequires: modutils -%ifarch %ix86 x86_64 -BuildRequires: kernel-xen -%endif -ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1200 # for SLE 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -59,14 +59,22 @@ # test suites should be packaged in other packages, but build required # and called here. -/sbin/modprobe loop || exit 1 +if ! /sbin/modprobe loop; then + echo "ERROR: Unable to load the kernel loop module." + echo "Usually the wrong kernel is running, this is atm" + cat /proc/version + echo "Installed kernel modules are:" + rpm -q kernel-default + exit 1 +fi + %install -mkdir -p %{buildroot}/usr/share/kernel-qa/ -touch %{buildroot}/usr/share/kernel-qa/logfile +mkdir -p %{buildroot}/usr/share/%name +touch %{buildroot}/usr/share/%name/logfile %files %defattr(-,root,root) -/usr/share/kernel-qa +/usr/share/%name %changelog ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor pae %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -153,7 +152,7 @@ Provides: kernel-vmi = 2.6.38 Obsoletes: kernel-vmi <= 2.6.38 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -541,49 +540,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -649,8 +619,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -706,7 +677,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -734,6 +705,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -877,7 +850,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -885,22 +858,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -913,10 +903,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1093,16 +1080,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -45,7 +45,7 @@ Provides: %name = %version-%source_rel Provides: linux Provides: multiversion(kernel) -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 3.14.0 +Version: 3.15.rc5 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor vanilla %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -529,49 +528,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -637,8 +607,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -694,7 +665,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -722,6 +693,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -865,7 +838,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -873,22 +846,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -901,10 +891,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1064,16 +1051,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor xen %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -151,7 +150,7 @@ Provides: kernel-xenpae = 2.6.17 Obsoletes: kernel-xenpae <= 2.6.17 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -535,49 +534,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -643,8 +613,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -700,7 +671,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -728,6 +699,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -871,7 +844,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -879,22 +852,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -907,10 +897,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1076,16 +1063,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -16,7 +16,6 @@ <package>kernel-exynos</package> <package>kernel-lpae</package> <package>kernel-pae</package> -<package>kernel-trace</package> <package>kernel-vanilla</package> <package>kernel-xen</package> </conditions> ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -15,7 +15,6 @@ +i386 i386/xen +i386 -syms i386/ec2 +i386 i386/vanilla -+i386 -syms i386/trace +x86_64 x86_64/default +x86_64 x86_64/desktop @@ -23,17 +22,14 @@ +x86_64 -syms x86_64/ec2 +x86_64 -syms x86_64/debug +x86_64 x86_64/vanilla -+x86_64 -syms x86_64/trace +ppc ppc/default +ppc ppc/vanilla +ppc64 ppc64/default -+ppc64 -syms ppc64/trace +ppc64 -syms ppc64/debug +ppc64 ppc64/vanilla +ppc64le ppc64le/default -+ppc64le -syms ppc64le/trace +ppc64le -syms ppc64le/debug +ppc64le ppc64le/vanilla @@ -45,5 +41,4 @@ +arm64 arm64/default +s390x s390x/default -+s390x -syms s390x/trace +s390x s390x/vanilla ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.14 +SRCVERSION=3.15-rc5 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 55297 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200 @@ -28,10 +28,8 @@ %define build_flavor @FLAVOR@ %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -407,49 +406,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again + chmod +x %buildroot/$vmlinux + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) - chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -515,8 +485,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -572,7 +543,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -600,6 +571,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -743,7 +716,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob > %my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -751,22 +724,39 @@ done { cd %buildroot - find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' $ -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -779,10 +769,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -942,16 +929,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200 @@ -36,8 +36,8 @@ ExclusiveArch: @ARCHS@ %if 0%{?suse_version} < 1320 # For SLE 11 -BuildRequires: yast2-bootloader BuildRequires: mkinitrd +BuildRequires: perl-Bootloader BuildRoot: %{_tmppath}/%{name}-%{version}-build %else BuildRequires: dracut @@ -115,7 +115,7 @@ %else dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-$.*-default$,\1,p'` %ifarch %ix86 x86_64 -dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-$.*-xen$,\1,p'` +dracut --host-only --drivers="$KERNEL_MODULES xenblk" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-$.*-xen$,\1,p'` %endif %endif ++++++ kernel-obs-qa.spec.in ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200 @@ -22,12 +22,12 @@ %include %_sourcedir/kernel-spec-macros -Name: kernel-obs-qa -BuildRequires: kernel-default +Name: @NAME@ +BuildRequires: kernel-@FLAVOR@ +# kernel-obs-build must be also configured as VMinstall, but is required +# here as well to avoid that qa and build package build parallel +BuildRequires: kernel-obs-build BuildRequires: modutils -%ifarch %ix86 x86_64 -BuildRequires: kernel-xen -%endif ExclusiveArch: @ARCHS@ %if 0%{?suse_version} < 1200 # for SLE 11 @@ -59,14 +59,22 @@ # test suites should be packaged in other packages, but build required # and called here. -/sbin/modprobe loop || exit 1 +if ! /sbin/modprobe loop; then + echo "ERROR: Unable to load the kernel loop module." + echo "Usually the wrong kernel is running, this is atm" + cat /proc/version + echo "Installed kernel modules are:" + rpm -q kernel-@FLAVOR@ + exit 1 +fi + %install -mkdir -p %{buildroot}/usr/share/kernel-qa/ -touch %{buildroot}/usr/share/kernel-qa/logfile +mkdir -p %{buildroot}/usr/share/%name +touch %{buildroot}/usr/share/%name/logfile %files %defattr(-,root,root) -/usr/share/kernel-qa +/usr/share/%name %changelog ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200 @@ -136,12 +136,25 @@ REQUIRES => $requires, ARCHS => $all_archs); } - # kernel-obs-*.spec +} + +# kernel-obs-*.spec +{ + my $default_archs = join(" ", arch2rpm(@{$flavor_archs{default}})); + my $xen_archs = join(" ", arch2rpm(@{$flavor_archs{xen} || []})); if (!$variant) { do_spec('obs-build', "kernel-obs-build.spec", %macros, - ARCHS => $all_archs); + ARCHS => $default_archs); do_spec('obs-qa', "kernel-obs-qa.spec", %macros, - ARCHS => $all_archs); + ARCHS => $default_archs, + NAME => "kernel-obs-qa", + FLAVOR => "default"); + } + if ($xen_archs) { + do_spec('obs-qa', "kernel-obs-qa-xen.spec", %macros, + ARCHS => $xen_archs, + NAME => "kernel-obs-qa-xen", + FLAVOR => "xen"); } } ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch --- old/patches.arch/acpi_thermal_passive_blacklist.patch 2014-02-17 09:32:04.000000000 +0100 +++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2014-04-27 20:22:13.000000000 +0200 @@ -16,9 +16,9 @@ +#include <linux/dmi.h> #include <linux/thermal.h> #include <linux/acpi.h> - #include <asm/uaccess.h> + #include <linux/workqueue.h> @@ -984,6 +985,86 @@ static void acpi_thermal_guess_offset(st - tz->kelvin_offset = 2732; + acpi_thermal_check(tz); } +static struct dmi_system_id thermal_psv_dmi_table[] = { @@ -120,6 +120,6 @@ + } + } + + INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn); + pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device), - acpi_device_bid(device), KELVIN_TO_CELSIUS(tz->temperature)); - goto end; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch new/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch --- old/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch 2014-02-17 09:32:04.000000000 +0100 +++ new/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch 2014-04-27 20:22:13.000000000 +0200 @@ -24,7 +24,7 @@ --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -45,6 +45,7 @@ - #include <linux/usb/of.h> + #include <linux/debugfs.h> #include "musb_core.h" +#include "../../../arch/arm/mach-omap2/usb.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-arndale-dma.patch new/patches.arch/arm-arndale-dma.patch --- old/patches.arch/arm-arndale-dma.patch 2014-02-17 09:32:04.000000000 +0100 +++ new/patches.arch/arm-arndale-dma.patch 2014-04-27 20:22:13.000000000 +0200 @@ -14,21 +14,19 @@ arch/arm/mach-exynos/mach-exynos5-dt.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -Index: linux-3.12-rc2-master/arch/arm/mach-exynos/mach-exynos5-dt.c -=================================================================== ---- linux-3.12-rc2-master.orig/arch/arm/mach-exynos/mach-exynos5-dt.c -+++ linux-3.12-rc2-master/arch/arm/mach-exynos/mach-exynos5-dt.c +--- linux-3.12-rc2-master.orig/arch/arm/mach-exynos/exynos5.c ++++ linux-3.12-rc2-master/arch/arm/mach-exynos/exynos.c @@ -14,6 +14,7 @@ #include <linux/of_platform.h> - #include <linux/of_fdt.h> - #include <linux/io.h> + #include <linux/platform_device.h> + #include <linux/pm_domain.h> +#include <linux/dma-mapping.h> - #include <asm/mach/arch.h> - #include <plat/mfc.h> + #include <asm/cacheflush.h> + #include <asm/hardware/cache-l2x0.h> @@ -23,6 +24,26 @@ - #include "common.h" - #include "regs-pmu.h" + } + early_initcall(exynos4_l2x0_cache_init); +static u64 dma_mask64 = DMA_BIT_MASK(64); + @@ -50,7 +48,7 @@ + .notifier_call = exynos5250_platform_notifier, +}; + - static void __init exynos5_dt_machine_init(void) + static void __init exynos_dt_machine_init(void) { struct device_node *i2c_np; @@ -47,6 +68,9 @@ static void __init exynos5_dt_machine_in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/cubox-configuration.patch new/patches.arch/cubox-configuration.patch --- old/patches.arch/cubox-configuration.patch 2014-02-17 09:32:04.000000000 +0100 +++ new/patches.arch/cubox-configuration.patch 2014-04-27 20:22:13.000000000 +0200 @@ -2806,8 +2806,8 @@ --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -15,6 +15,13 @@ config MACH_CM_A510 - Say 'Y' here if you want your kernel to support the - Marvell Dove using flattened device tree. + Say 'Y' here if you want your kernel to support the + CompuLab CM-A510 Board. +config MACH_CUBOX + bool "SolidRun CuBox" @@ -2824,8 +2824,8 @@ --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -2,3 +2,4 @@ obj-y += common.o addr-map.o irq.o pcie.o mpp.o + obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o - obj-$(CONFIG_MACH_DOVE_DT) += board-dt.o obj-$(CONFIG_MACH_CM_A510) += cm-a510.o +obj-$(CONFIG_MACH_CUBOX) += cubox-setup.o diff --git a/arch/arm/mach-dove/cubox-setup.c b/arch/arm/mach-dove/cubox-setup.c ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440 new/patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440 --- old/patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440 2014-05-07 12:02:52.000000000 +0200 @@ -0,0 +1,65 @@ +From 1c37c22332a2d2c1b4ab32177a4f847c7fe06e38 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Tue, 6 May 2014 17:34:42 +0200 +Subject: [PATCH] ALSA: hda - Add dock pin setups for Thinkpad T440 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +Git-commit: 1c37c22332a2d2c1b4ab32177a4f847c7fe06e38 +Patch-mainline: To be in 3.16-rc1 +References: bnc#876699 + +The headphone and mic jacks on Thinkpad T440 are assigned to pins NID +0x16 and 0x19, respectively. These need to be set up manually by a +fixup. + +Reported-and-tested-by: Joschi Brauchle <joschi.brauchle(a)tum.de> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_realtek.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4159,6 +4159,7 @@ enum { + ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, + ALC255_FIXUP_HEADSET_MODE, + ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC, ++ ALC292_FIXUP_TPT440_DOCK, + }; + + static const struct hda_fixup alc269_fixups[] = { +@@ -4552,6 +4553,16 @@ static const struct hda_fixup alc269_fix + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_headset_mode_alc255_no_hp_mic, + }, ++ [ALC292_FIXUP_TPT440_DOCK] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x16, 0x21211010 }, /* dock headphone */ ++ { 0x19, 0x21a11010 }, /* dock mic */ ++ { } ++ }, ++ .chained = true, ++ .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST ++ }, + }; + + static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -4710,7 +4721,8 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK), + SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK), + SND_PCI_QUIRK(0x17aa, 0x2208, "Thinkpad T431s", ALC269_FIXUP_LENOVO_DOCK), +- SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), ++ SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK), ++ SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK), + SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), +@@ -4788,6 +4800,7 @@ static const struct hda_model_fixup alc2 + {.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"}, + {.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"}, + {.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"}, ++ {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"}, + {} + }; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-sigmatel-Allow-auto-switching-for-dock-line new/patches.drivers/ALSA-hda-sigmatel-Allow-auto-switching-for-dock-line --- old/patches.drivers/ALSA-hda-sigmatel-Allow-auto-switching-for-dock-line 2014-02-28 14:27:47.000000000 +0100 +++ new/patches.drivers/ALSA-hda-sigmatel-Allow-auto-switching-for-dock-line 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -From e8b99a1dcb49b0d362b19a4831a00d85c76bd4b3 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai(a)suse.de> -Date: Thu, 27 Feb 2014 16:24:53 +0100 -Subject: [PATCH] ALSA: hda/sigmatel - Allow auto-switching for dock line-in of HP laptops -Git-commit: e8b99a1dcb49b0d362b19a4831a00d85c76bd4b3 -Patch-mainline: Submitted -References: bnc#866100 - -Many HP laptops with STAC codecs have a docking station port and BIOS -sets the pins for the input on the dock as a line in. Because the -generic parser doesn't handle a line in pin as auto-switchable, this -resulted in the manual capture source selection on these laptops. - -However, from the usability POV, the automatic switching is easier. -This patch adds the line_in_auto_switch hint in the fixup function for -these laptops. Even if no dock port is present, this should be -harmless as the generic parser allows the auto-switching only in a -limited situation (all three pins are located in different -positions). - -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - sound/pci/hda/patch_sigmatel.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/sound/pci/hda/patch_sigmatel.c -+++ b/sound/pci/hda/patch_sigmatel.c -@@ -2088,6 +2088,9 @@ static void stac92hd83xxx_fixup_hp(struc - snd_printd("mute LED gpio %d polarity %d\n", - spec->gpio_led, - spec->gpio_led_polarity); -+ -+ /* allow auto-switching of dock line-in */ -+ spec->gen.line_in_auto_switch = true; - } - - static void stac92hd83xxx_fixup_hp_zephyr(struct hda_codec *codec, ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/0001-memcg-fix-swapcache-charge-from-kernel-thread-contex.patch new/patches.fixes/0001-memcg-fix-swapcache-charge-from-kernel-thread-contex.patch --- old/patches.fixes/0001-memcg-fix-swapcache-charge-from-kernel-thread-contex.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/0001-memcg-fix-swapcache-charge-from-kernel-thread-contex.patch 2014-05-19 10:37:44.000000000 +0200 @@ -0,0 +1,116 @@ +From: Michal Hocko <mhocko(a)suse.cz> +Date: Fri, 16 May 2014 14:26:40 +0200 +Subject: [PATCH] memcg: fix swapcache charge from kernel thread context +Patch-mainline: not-yet +References: bnc#878306 + +284f39afeaa4 (mm: memcg: push !mm handling out to page cache charge +function) explicitly checks for page cache charges without any mm +context (from kernel thread context[1]). + +This seemed to be the only possible case where memory could be charged +without mm context so 03583f1a631c (memcg: remove unnecessary !mm check +from try_get_mem_cgroup_from_mm()) removed the mm check from +get_mem_cgroup_from_mm. This however caused another NULL ptr dereference +during early boot when loopback kernel thread splices to tmpfs: + +Bug: unable to handle kernel NULL pointer dereference at 0000000000000360 +Ip: [<ffffffff81196aab>] get_mem_cgroup_from_mm.isra.42+0x2b/0x60 +PGD 5082067 PUD 83c3067 PMD 0 +Oops: 0000 [#1] SMP +Modules linked in: btrfs dm_multipath dm_mod scsi_dh multipath raid10 raid456 async_raid6_recov async_memcpy async_pq raid6_pq async_xor xor async_tx raid1 raid0 md_mod parport_pc parport nls_utf8 isofs usb_storage iscsi_ibft iscsi_boot_sysfs arc4 ecb fan thermal nfs lockd fscache nls_iso8859_1 nls_cp437 sg st hid_generic usbhid af_packet sunrpc sr_mod cdrom ata_generic uhci_hcd virtio_net virtio_blk ehci_hcd usbcore ata_piix floppy processor button usb_common virtio_pci virtio_ring virtio edd squashfs loop + ppa] +Cpu: 0 PID: 97 Comm: loop1 Not tainted 3.15.0-rc5-5-default #1 +Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 +Task: ffff880039b7a390 ti: ffff880038efe000 task.ti: ffff880038efe000 +Rip: 0010:[<ffffffff81196aab>] [<ffffffff81196aab>] get_mem_cgroup_from_mm.isra.42+0x2b/0x60 +Rsp: 0018:ffff880038effa40 EFLAGS: 00010246 +Rax: 0000000000000000 RBX: ffffea00001e5140 RCX: 0000000000000020 +Rdx: ffff88003c365020 RSI: ffffea00001e5140 RDI: 0000000000000360 +Rbp: ffff880038effa78 R08: 0000000000000ab3 R09: ffff880039572248 +R10: 0000000000002ace R11: 0000000000000000 R12: 0000000000000010 +R13: 0000000000000000 R14: ffff880038c72448 R15: 00000000fffffffe +Fs: 00007fb0042ed880(0000) GS:ffff88003c000000(0000) knlGS:0000000000000000 +Cs: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b +Cr2: 0000000000000360 CR3: 0000000005e2b000 CR4: 00000000000006f0 +Stack: ffffffff8119bae0 0000000000000000 0000000000000000 ffffea00001e5140 + 0000000000000001 00000000ffffffef ffffffff8119c04b 0000000000000000 + ffff880038c722f8 0000000000000ab3 ffffffff8115129b 00000000000001d7 +Call Trace: + [<ffffffff8119bae0>] __mem_cgroup_try_charge_swapin+0x40/0xe0 + [<ffffffff8119c04b>] mem_cgroup_charge_file+0x8b/0xd0 + [<ffffffff8115129b>] shmem_getpage_gfp+0x66b/0x7b0 + [<ffffffff811518cf>] shmem_file_splice_read+0x18f/0x430 + [<ffffffff811ceff2>] splice_direct_to_actor+0xa2/0x1c0 + [<ffffffffa00019ea>] do_lo_receive+0x5a/0x60 [loop] + [<ffffffffa0002158>] loop_thread+0x298/0x720 [loop] + [<ffffffff810778d6>] kthread+0xc6/0xe0 + [<ffffffff815c0dbc>] ret_from_fork+0x7c/0xb0 +Code: 66 66 66 66 90 eb 24 66 0f 1f 84 00 00 00 00 00 f6 40 48 01 75 3a 48 8b 50 18 f6 c2 03 75 32 65 ff 02 ba 01 00 00 00 84 d2 75 25 <48> 8b 07 48 85 c0 74 10 48 8b 80 70 08 00 00 48 8b 40 60 48 85 +RIP [<ffffffff81196aab>] get_mem_cgroup_from_mm.isra.42+0x2b/0x60 + RSP <ffff880038effa40> +Cr2: 0000000000000360 + +This patch fixes the issue by reintroducing mm check into get_mem_cgroup_from_mm. +We could do the same trick in __mem_cgroup_try_charge_swapin as we do +for the regular page cache path but it is not worth troubles. The check +is not that expensive and it is better to have get_mem_cgroup_from_mm +more robust. + +[1] - http://marc.info/?l=linux-mm&m=139463617808941&w=2 + +Fixes: 03583f1a631c (3.15-rc1) +Signed-off-by: Michal Hocko <mhocko(a)suse.cz> + +--- + mm/memcontrol.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/mm/memcontrol.c b/mm/memcontrol.c +index 2cb81478d30c..2248a648a127 100644 +--- a/mm/memcontrol.c ++++ b/mm/memcontrol.c +@@ -1061,9 +1061,17 @@ static struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) + + rcu_read_lock(); + do { +- memcg = mem_cgroup_from_task(rcu_dereference(mm->owner)); +- if (unlikely(!memcg)) ++ /* ++ * Page cache or loopback insertions can happen without an ++ * actual mm context, e.g. during disk probing on boot ++ */ ++ if (unlikely(!mm)) + memcg = root_mem_cgroup; ++ else { ++ memcg = mem_cgroup_from_task(rcu_dereference(mm->owner)); ++ if (unlikely(!memcg)) ++ memcg = root_mem_cgroup; ++ } + } while (!css_tryget(&memcg->css)); + rcu_read_unlock(); + return memcg; +@@ -3857,17 +3865,9 @@ int mem_cgroup_charge_file(struct page *page, struct mm_struct *mm, + return 0; + } + +- /* +- * Page cache insertions can happen without an actual mm +- * context, e.g. during disk probing on boot. +- */ +- if (unlikely(!mm)) +- memcg = root_mem_cgroup; +- else { +- memcg = mem_cgroup_try_charge_mm(mm, gfp_mask, 1, true); +- if (!memcg) +- return -ENOMEM; +- } ++ memcg = mem_cgroup_try_charge_mm(mm, gfp_mask, 1, true); ++ if (!memcg) ++ return -ENOMEM; + __mem_cgroup_commit_charge(memcg, page, 1, type, false); + return 0; + } +-- +2.0.0.rc2 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/kvm-ioapic.patch new/patches.fixes/kvm-ioapic.patch --- old/patches.fixes/kvm-ioapic.patch 2013-12-02 02:25:37.000000000 +0100 +++ new/patches.fixes/kvm-ioapic.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -From: agraf(a)suse.de -Subject: Ignore apic polarity -Patch-mainline: unknown -References: bnc#556564 - ---- - virt/kvm/ioapic.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/virt/kvm/ioapic.c -+++ b/virt/kvm/ioapic.c -@@ -205,7 +205,8 @@ int kvm_ioapic_set_irq(struct kvm_ioapic - irq_level = __kvm_irq_line_state(&ioapic->irq_states[irq], - irq_source_id, level); - entry = ioapic->redirtbl[irq]; -- irq_level ^= entry.fields.polarity; -+// polarity is always active high in qemu -+// irq_level ^= entry.fields.polarity; - if (!irq_level) { - ioapic->irr &= ~mask; - ret = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/pvpanic-Set-high-notifier-priority new/patches.fixes/pvpanic-Set-high-notifier-priority --- old/patches.fixes/pvpanic-Set-high-notifier-priority 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/pvpanic-Set-high-notifier-priority 2014-05-19 10:37:44.000000000 +0200 @@ -0,0 +1,40 @@ +From ddae3fadc1d5e3fb5417b54157a84d8eb325274b Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Tue, 6 May 2014 07:35:36 +0200 +Subject: [PATCH] pvpanic: Set high notifier priority +Git-commit: ddae3fadc1d5e3fb5417b54157a84d8eb325274b +Patch-mainline: Submitted +References: bnc#875220 + +We've observed the missing pvpanic call at panic, and it turned out +that this was blocked by the broken notifier of drm_fb_helper, where +scheduling may be called during switching to the fb console. +It's fairly difficult to fix the drm_fb problem and a quick fix isn't +foreseen, a simpler solution for the missing pvpanic call would be +just to call this earlier. + +In order to assure that, this patch sets a higher priority to pvpanic +notifier_block. Once when the issue of drm_fb is resolved, we can +remove this priority again. + +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + drivers/platform/x86/pvpanic.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/platform/x86/pvpanic.c b/drivers/platform/x86/pvpanic.c +index c9f6e511daa6..073a90a63dbc 100644 +--- a/drivers/platform/x86/pvpanic.c ++++ b/drivers/platform/x86/pvpanic.c +@@ -70,6 +70,7 @@ pvpanic_panic_notify(struct notifier_block *nb, unsigned long code, + + static struct notifier_block pvpanic_panic_nb = { + .notifier_call = pvpanic_panic_notify, ++ .priority = 1, /* let this called before broken drm_fb_helper */ + }; + + +-- +1.9.2 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-dh-queuedata-accessors new/patches.fixes/scsi-dh-queuedata-accessors --- old/patches.fixes/scsi-dh-queuedata-accessors 2013-12-02 02:25:37.000000000 +0100 +++ new/patches.fixes/scsi-dh-queuedata-accessors 2014-05-19 10:37:44.000000000 +0200 @@ -51,7 +51,7 @@ --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1594,6 +1594,17 @@ out: - spin_lock_irq(q->queue_lock); + blk_delay_queue(q, SCSI_QUEUE_DELAY); } +struct scsi_device *scsi_device_from_queue(struct request_queue *q) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/chipidea-clean-up-dependencies new/patches.rpmify/chipidea-clean-up-dependencies --- old/patches.rpmify/chipidea-clean-up-dependencies 2014-04-08 11:15:33.000000000 +0200 +++ new/patches.rpmify/chipidea-clean-up-dependencies 2014-04-27 22:28:05.000000000 +0200 @@ -38,9 +38,9 @@ --- a/drivers/usb/chipidea/Makefile +++ b/drivers/usb/chipidea/Makefile @@ -10,12 +10,5 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG) += - # Glue/Bridge layers go here obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_msm.o + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o - -# PCI doesn't provide stubs, need to check -ifneq ($(CONFIG_PCI),) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/s390-add-slab-h-for-kzalloc-kfree new/patches.rpmify/s390-add-slab-h-for-kzalloc-kfree --- old/patches.rpmify/s390-add-slab-h-for-kzalloc-kfree 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/s390-add-slab-h-for-kzalloc-kfree 2014-04-27 22:28:05.000000000 +0200 @@ -0,0 +1,23 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: s390: add slab.h for kzalloc/kfree +Patch-mainline: Submitted to LKML 27 Apr 2014 + +This fixes: +arch/s390/appldata/appldata_mem.c:135:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration] +arch/s390/appldata/appldata_mem.c:141:3: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration] + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + arch/s390/appldata/appldata_mem.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/s390/appldata/appldata_mem.c ++++ b/arch/s390/appldata/appldata_mem.c +@@ -13,6 +13,7 @@ + #include <linux/kernel_stat.h> + #include <linux/pagemap.h> + #include <linux/swap.h> ++#include <linux/slab.h> + #include <asm/io.h> + + #include "appldata.h" ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch new/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch --- old/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch 2014-03-24 15:11:38.000000000 +0100 +++ new/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch 2014-05-14 11:47:08.000000000 +0200 @@ -79,7 +79,7 @@ + if (IS_APPEND(inode) || IS_IMMUTABLE(inode) || IS_SWAPFILE(inode)) return -EPERM; if (isdir) { - if (!d_is_directory(victim) && !d_is_autodir(victim)) + if (!d_is_dir(victim)) @@ -2206,6 +2232,25 @@ static int may_delete(struct inode *dir, return 0; } @@ -189,24 +189,30 @@ if (error) return error; -@@ -3697,14 +3745,14 @@ int vfs_rename(struct inode *old_dir, st - if (old_dentry->d_inode == new_dentry->d_inode) - return 0; - +@@ -3697,19 +3745,19 @@ int vfs_rename(struct inode *old_dir, st + if (source == target) + return 0; + - error = may_delete(old_dir, old_dentry, is_dir); + error = may_delete(old_dir, old_dentry, is_dir, 0); if (error) return error; - if (!new_dentry->d_inode) + if (!target) { - error = may_create(new_dir, new_dentry); + error = may_create(new_dir, new_dentry, is_dir); - else -- error = may_delete(new_dir, new_dentry, is_dir); -+ error = may_delete(new_dir, new_dentry, is_dir, 1); + } else { + new_is_dir = d_is_dir(new_dentry); + + if (!(flags & RENAME_EXCHANGE)) +- error = may_delete(new_dir, new_dentry, is_dir); ++ error = may_delete(new_dir, new_dentry, is_dir, 1); + else +- error = may_delete(new_dir, new_dentry, new_is_dir); ++ error = may_delete(new_dir, new_dentry, new_is_dir, 1); + } if (error) return error; - --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1836,6 +1836,10 @@ struct inode_operations { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/dm-mpath-no-partitions-feature new/patches.suse/dm-mpath-no-partitions-feature --- old/patches.suse/dm-mpath-no-partitions-feature 2014-03-24 15:11:38.000000000 +0100 +++ new/patches.suse/dm-mpath-no-partitions-feature 2014-05-14 11:47:08.000000000 +0200 @@ -36,8 +36,8 @@ unsigned pg_init_delay_msecs; /* Number of msecs before pg_init retry */ + unsigned features; /* Additional selected features */ - unsigned queue_size; - struct work_struct process_queued_ios; + struct work_struct trigger_event; + @@ -811,6 +814,10 @@ static int parse_features(struct dm_arg_ continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/ovl05-overlay-filesystem.patch new/patches.suse/ovl05-overlay-filesystem.patch --- old/patches.suse/ovl05-overlay-filesystem.patch 2014-03-24 15:11:38.000000000 +0100 +++ new/patches.suse/ovl05-overlay-filesystem.patch 2014-05-14 11:47:08.000000000 +0200 @@ -1092,7 +1092,7 @@ + } + + err = vfs_rename(old_upperdir->d_inode, olddentry, -+ new_upperdir->d_inode, newdentry, NULL); ++ new_upperdir->d_inode, newdentry, NULL, 0); + + if (err) { + if (new_create && ovl_dentry_is_opaque(new)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/stack-unwind new/patches.suse/stack-unwind --- old/patches.suse/stack-unwind 2014-03-24 15:11:38.000000000 +0100 +++ new/patches.suse/stack-unwind 2014-05-14 11:47:08.000000000 +0200 @@ -22,21 +22,7 @@ arch/x86/include/asm/stacktrace.h | 4 arch/x86/include/asm/switch_to.h | 10 arch/x86/include/asm/unwind.h | 163 +++ - arch/x86/kernel/dumpstack.c | 87 ++ - arch/x86/kernel/dumpstack_32.c | 4 - arch/x86/kernel/dumpstack_64.c | 7 - arch/x86/kernel/entry_32.S | 35 - arch/x86/kernel/entry_64.S | 34 - arch/x86/kernel/vmlinux.lds.S | 2 - arch/x86/tools/relocs.c | 1 - Makefile | 5 - arch/x86/Kconfig | 2 - arch/x86/Makefile | 2 - arch/x86/include/asm/dwarf2.h | 3 - arch/x86/include/asm/stacktrace.h | 4 - arch/x86/include/asm/switch_to.h | 10 - arch/x86/include/asm/unwind.h | 163 +++ - arch/x86/kernel/dumpstack.c | 87 ++ + arch/x86/kernel/dumpstack.c | 88 ++ arch/x86/kernel/dumpstack_32.c | 4 arch/x86/kernel/dumpstack_64.c | 7 arch/x86/kernel/entry_32.S | 35 @@ -327,12 +313,13 @@ static int die_counter; static void printk_stack_address(unsigned long address, int reliable) -@@ -70,6 +76,69 @@ print_ftrace_graph_addr(unsigned long ad +@@ -70,6 +76,70 @@ print_ftrace_graph_addr(unsigned long ad { } #endif -+int asmlinkage dump_trace_unwind(struct unwind_frame_info *info, -+ const struct stacktrace_ops *ops, void *data) ++static int asmlinkage dump_trace_unwind(struct unwind_frame_info *info, ++ const struct stacktrace_ops *ops, ++ void *data) +{ + int n = 0; +#ifdef CONFIG_STACK_UNWIND @@ -397,7 +384,7 @@ /* * x86-64 can have up to three kernel stacks: * process stack -@@ -344,3 +413,21 @@ static int __init code_bytes_setup(char +@@ -344,3 +414,21 @@ static int __init code_bytes_setup(char return 1; } __setup("code_bytes=", code_bytes_setup); @@ -2485,7 +2472,7 @@ + * Prepare to unwind the currently running thread. + */ +int unwind_init_running(struct unwind_frame_info *info, -+ asmlinkage unwind_callback_fn callback, ++ unwind_callback_fn callback, + const struct stacktrace_ops *ops, void *data) +{ + info->task = current; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag new/patches.suse/supported-flag --- old/patches.suse/supported-flag 2014-03-24 15:11:38.000000000 +0100 +++ new/patches.suse/supported-flag 2014-05-14 11:47:08.000000000 +0200 @@ -48,9 +48,9 @@ --- a/Documentation/sysctl/kernel.txt 2013-11-22 19:20:13.295034826 -0500 +++ b/Documentation/sysctl/kernel.txt 2013-11-22 19:21:01.822360873 -0500 @@ -742,6 +742,18 @@ can be ORed together: - 1024 - A module from drivers/staging was loaded. - 2048 - The system is working around a severe firmware bug. 4096 - An out-of-tree module has been loaded. + 8192 - An unsigned module has been loaded in a kernel supporting module + signature. + 0x40000000 - An unsupported kernel module was loaded. + 0x80000000 - An kernel module with external support was loaded. + @@ -93,8 +93,8 @@ /* * Only to be used by arch init code. If the user over-wrote the default @@ -428,6 +431,15 @@ extern enum system_states { - #define TAINT_FIRMWARE_WORKAROUND 11 #define TAINT_OOT_MODULE 12 + #define TAINT_UNSIGNED_MODULE 13 +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED +/* @@ -215,9 +215,9 @@ * Mutex protects: * 1) List of modules (also safely readable with preempt_disable), @@ -1015,6 +1031,12 @@ static size_t module_flags_taint(struct - buf[l++] = 'F'; - if (mod->taints & (1 << TAINT_CRAP)) buf[l++] = 'C'; + if (mod->taints & (1 << TAINT_UNSIGNED_MODULE)) + buf[l++] = 'E'; +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED + if (mod->taints & (1 << TAINT_NO_SUPPORT)) + buf[l++] = 'N'; @@ -226,7 +226,7 @@ +#endif /* * TAINT_FORCED_RMMOD: could be added. - * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't + * TAINT_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't @@ -1092,6 +1114,33 @@ static ssize_t show_taint(struct module_ static struct module_attribute modinfo_taint = __ATTR(taint, 0444, show_taint, NULL); @@ -311,8 +311,8 @@ out_unreg_holders: @@ -3817,6 +3897,9 @@ void print_modules(void) if (last_unloaded_module[0]) - printk(" [last unloaded: %s]", last_unloaded_module); - printk("\n"); + pr_cont(" [last unloaded: %s]", last_unloaded_module); + pr_cont("\n"); +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED + printk("Supported: %s\n", supported_printable(get_taint())); +#endif @@ -322,9 +322,9 @@ --- a/kernel/panic.c 2013-11-22 19:20:13.335034272 -0500 +++ b/kernel/panic.c 2013-11-22 19:21:01.838360651 -0500 @@ -210,6 +210,10 @@ static const struct tnt tnts[] = { - { TAINT_CRAP, 'C', ' ' }, { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, { TAINT_OOT_MODULE, 'O', ' ' }, + { TAINT_UNSIGNED_MODULE, 'E', ' ' }, +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED + { TAINT_NO_SUPPORT, 'N', ' ' }, + { TAINT_EXTERNAL_SUPPORT, 'X', ' ' }, @@ -333,9 +333,9 @@ /** @@ -228,6 +232,8 @@ static const struct tnt tnts[] = { - * 'C' - modules from drivers/staging are loaded. * 'I' - Working around severe firmware bug. * 'O' - Out-of-tree module has been loaded. + * 'E' - Unsigned module has been loaded. + * 'N' - Unsuported modules loaded. + * 'X' - Modules with external support loaded. * @@ -377,7 +377,7 @@ --- a/scripts/mod/modpost.c 2013-11-22 19:20:13.347034103 -0500 +++ b/scripts/mod/modpost.c 2013-11-22 19:21:01.846360540 -0500 @@ -1676,6 +1676,50 @@ static void check_sec_ref(struct module - } + return s; } +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/unwind-remove-check-for-vdso32-compat-range new/patches.suse/unwind-remove-check-for-vdso32-compat-range --- old/patches.suse/unwind-remove-check-for-vdso32-compat-range 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/unwind-remove-check-for-vdso32-compat-range 2014-05-14 11:47:08.000000000 +0200 @@ -0,0 +1,37 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: unwind: remove check for vdso32 compat range +Patch-mainline: depends on unwind patchset + +Commit b0b49f2673f (x86, vdso: Remove compat vdso support) removed +the FIX_VDSO macro defining the vdso area. + +Without the compat mode in the fixed range, the vdso pointer will always +be in the userspace range. The special check can simply be removed. + +Reviewed-by: Jan Beulich <jbeulich(a)suse.de> +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + arch/x86/include/asm/elf.h | 1 + + arch/x86/include/asm/unwind.h | 18 +++++++++++++++--- + arch/x86/vdso/vdso32-setup.c | 2 +- + 3 files changed, 17 insertions(+), 4 deletions(-) + +--- a/arch/x86/include/asm/unwind.h ++++ b/arch/x86/include/asm/unwind.h +@@ -66,7 +66,6 @@ struct unwind_frame_info + + #else /* X86_32 */ + +-#include <asm/fixmap.h> + + #define FRAME_RETADDR_OFFSET 4 + +@@ -141,8 +154,6 @@ static inline int arch_unw_user_mode(/*c + #else + return user_mode_vm(&info->regs) + || info->regs.ip < PAGE_OFFSET +- || (info->regs.ip >= __fix_to_virt(FIX_VDSO) +- && info->regs.ip < __fix_to_virt(FIX_VDSO) + PAGE_SIZE) + || info->regs.sp < PAGE_OFFSET; + #endif + } ++++++ patches.xen.tar.bz2 ++++++ ++++ 12873 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:04.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:04.000000000 +0200 @@ -35,6 +35,7 @@ ######################################################## patches.rpmify/chipidea-clean-up-dependencies patches.rpmify/lustre-lloop-dont-change-logical-size + patches.rpmify/s390-add-slab-h-for-kzalloc-kfree ######################################################## # kABI consistency patches @@ -177,6 +178,7 @@ ######################################################## patches.suse/readahead-request-tunables.patch patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch + patches.fixes/0001-memcg-fix-swapcache-charge-from-kernel-thread-contex.patch ######################################################## # IPC patches @@ -410,7 +412,7 @@ ########################################################## # Sound ########################################################## - patches.drivers/ALSA-hda-sigmatel-Allow-auto-switching-for-dock-line + patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440 ######################################################## # Char / serial @@ -423,6 +425,8 @@ # Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN) +hare patches.suse/no-partition-scan + patches.fixes/pvpanic-Set-high-notifier-priority + ######################################################## # Other drivers we have added to the tree ######################################################## @@ -479,6 +483,7 @@ patches.suse/crasher-26.diff patches.suse/stack-unwind patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops + patches.suse/unwind-remove-check-for-vdso32-compat-range patches.suse/no-frame-pointer-select patches.arch/x86_64-unwind-annotations patches.arch/stack-unwind-cfi_ignore-takes-more-arguments @@ -502,7 +507,6 @@ ######################################################## # KVM patches ######################################################## - patches.fixes/kvm-ioapic.patch patches.fixes/kvm-macos.patch ######################################################## @@ -598,6 +602,7 @@ patches.xen/xen3-patch-3.12 patches.xen/xen3-patch-3.13 patches.xen/xen3-patch-3.14 + patches.xen/xen3-patch-3.15-rc5 # ports of other patches patches.xen/xen3-stack-unwind @@ -616,6 +621,7 @@ patches.xen/xen-configurable-guest-devices patches.xen/xen-setup-gsi patches.xen/xen-privcmd-hcall-preemption + patches.xen/xen-privcmd-truly-batch patches.xen/xen-unpriv-build patches.xen/xen-cpufreq-report patches.xen/xen-multi-page-ring ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:05.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:05.000000000 +0200 @@ -1,3 +1,3 @@ -2014-04-11 11:18:16 +0200 -GIT Revision: e0d430410e91cf3b2a14c5a80157e37d1b18d4d4 +2014-05-21 19:34:45 +0200 +GIT Revision: cc68f1221265fcc29f06801efd7bf9022a1a985f GIT Branch: master ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:05.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:05.000000000 +0200 @@ -77,6 +77,7 @@ arch/x86/oprofile/oprofile # OProfile system profiler arch/x86/kernel/cpu/mcheck/mce-inject # Needed for Intel MCE/RAS testing mm/hwpoison-inject # Needed for Intel MCE/RAS testing + crypto/ablk_helper crypto/aead crypto/aes_generic crypto/anubis @@ -87,18 +88,24 @@ crypto/async_tx/async_tx crypto/async_tx/async_xor crypto/authenc - crypto/blowfish # Blowfish Cipher Algorithm - crypto/camellia - crypto/cast5 # Cast5 Cipher Algorithm - crypto/cast6 # Cast6 Cipher Algorithm + crypto/blowfish_common # Blowfish Cipher Algorithm + crypto/blowfish_generic # Blowfish Cipher Algorithm + crypto/camellia_generic + crypto/cast_common + crypto/cast5_generic # Cast5 Cipher Algorithm + crypto/cast6_generic # Cast6 Cipher Algorithm crypto/cbc crypto/ccm crypto/chainiv - crypto/crc32c # CRC32c (Castagnoli) calculations wrapper for lib/crc32c + crypto/crc32c_generic # CRC32c (Castagnoli) calculations wrapper for lib/crc32c + crypto/crct10dif_common + crypto/crct10dif_generic crypto/cryptd + crypto/crypto crypto/cryptomgr crypto/crypto_algapi crypto/crypto_blkcipher + crypto/crypto_hash crypto/crypto_null # Null Cryptographic Algorithms crypto/crypto_wq crypto/ctr @@ -111,7 +118,7 @@ crypto/hmac crypto/gcm crypto/gf128mul - crypto/crypto_hash + crypto/ghash-generic crypto/khazad # Khazad Cryptographic Algorithm crypto/krng crypto/lrw @@ -129,7 +136,7 @@ crypto/salsa20_generic crypto/seed crypto/seqiv - crypto/serpent # Serpent Cipher Algorithm + crypto/serpent_generic # Serpent Cipher Algorithm crypto/sha1_generic crypto/sha256_generic crypto/sha512_generic @@ -137,7 +144,7 @@ crypto/tea # TEA & XTEA Cryptographic Algorithms crypto/tgr192 # Tiger hashing Algorithm crypto/twofish_common - crypto/twofish # Twofish Cipher Algorithm + crypto/twofish_generic # Twofish Cipher Algorithm crypto/wp512 crypto/xcbc crypto/xor @@ -277,6 +284,7 @@ drivers/char/agp/hp-agp drivers/char/agp/i460-agp drivers/char/agp/intel-agp + drivers/char/agp/intel-gtt drivers/char/agp/nvidia-agp drivers/char/agp/sgi-agp drivers/char/agp/sis-agp @@ -352,6 +360,7 @@ drivers/clocksource/scx200_hrt drivers/cpufreq/amd_freq_sensitivity # AMD frequency sensitivity feedback to the ondemand governor drivers/cpufreq/cpufreq_conservative + drivers/cpufreq/cpufreq_ondemand drivers/cpufreq/cpufreq_powersave # CPUfreq policy governor 'powersave' drivers/cpufreq/cpufreq_stats drivers/cpufreq/cpufreq_userspace # CPUfreq policy governor 'userspace' @@ -430,6 +439,7 @@ drivers/hid/hid-drff drivers/hid/hid-ezkey drivers/hid/hid-gaff + drivers/hid/hid-generic drivers/hid/hid-gyration drivers/hid/hid-kensington drivers/hid/hid-kye @@ -1395,7 +1405,6 @@ drivers/rtc/rtc-ds1307 drivers/rtc/rtc-ds1374 drivers/rtc/rtc-ds1511 - drivers/rtc/rtc-ds1553 drivers/rtc/rtc-ds1672 drivers/rtc/rtc-ds1742 drivers/rtc/rtc-efi @@ -1404,8 +1413,6 @@ drivers/rtc/rtc-lib drivers/rtc/rtc-m41t80 drivers/rtc/rtc-m41t94 - drivers/rtc/rtc-m48t59 - drivers/rtc/rtc-m48t86 drivers/rtc/rtc-max6900 drivers/rtc/rtc-max6902 drivers/rtc/rtc-pcf8563 @@ -1415,7 +1422,6 @@ drivers/rtc/rtc-rs5c348 drivers/rtc/rtc-rs5c372 drivers/rtc/rtc-s35390a - drivers/rtc/rtc-stk17ta8 drivers/rtc/rtc-test drivers/rtc/rtc-v3020 drivers/rtc/rtc-x1205 @@ -1577,7 +1583,6 @@ drivers/serial/8250_fourport drivers/serial/8250_hub6 drivers/serial/8250_pci - drivers/serial/8250_pnp drivers/serial/icom drivers/serial/ioc3_serial drivers/serial/ioc4_serial @@ -1630,11 +1635,13 @@ drivers/usb/class/usbtmc # USB test and measurement driver +base drivers/usb/core/usbcore +base drivers/usb/host/ehci-hcd # 2003-Dec-29 USB 2.0 'Enhanced' Host Controller (EHCI) Driver ++base drivers/usb/host/ehci-pci - drivers/usb/host/hwa-hc - drivers/usb/host/isp1362-hcd - drivers/usb/host/isp116x-hcd # ISP116x HCD (Host Controller Driver) for USB - drivers/usb/host/isp1760 +base drivers/usb/host/ohci-hcd # 2004 Feb 02 USB 1.1 'Open' Host Controller (OHCI) Driver ++base drivers/usb/host/ohci-pci - drivers/usb/host/oxu210hp-hcd drivers/usb/host/r8a66597-hcd - drivers/usb/host/sl811_cs # PCMCIA driver for SL811HS (as found in REX-CFU1U) @@ -1755,6 +1762,7 @@ drivers/video/carminefb drivers/video/cfbcopyarea drivers/video/cfbfillrect + drivers/video/cfbimgblt drivers/video/cirrusfb # Accelerated FBDev driver for Cirrus Logic chips drivers/video/console/mdacon drivers/video/cyber2000fb # CyberPro 2000, 2010 and 5000 framebuffer driver -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0