From de873c9900f8f80463b2c3682e574cd75e99294c0876e5f77cb21d2dedf4f649 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 8 Aug 2013 06:04:25 +0000 Subject: [PATCH] commit 910e01da495bde688f298e4c5fdb3fb431f088c2 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7591 --- config.tar.bz2 | 4 ++-- kernel-cert-subpackage | 13 ++++++------- kernel-debug.changes | 20 ++++++++++++++++++++ kernel-debug.spec | 2 +- kernel-default.changes | 20 ++++++++++++++++++++ kernel-default.spec | 2 +- kernel-desktop.changes | 20 ++++++++++++++++++++ kernel-desktop.spec | 2 +- kernel-docs.changes | 20 ++++++++++++++++++++ kernel-docs.spec | 2 +- kernel-pae.changes | 20 ++++++++++++++++++++ kernel-pae.spec | 2 +- kernel-source.changes | 20 ++++++++++++++++++++ kernel-source.spec | 2 +- kernel-syms.changes | 20 ++++++++++++++++++++ kernel-syms.spec | 2 +- kernel-trace.changes | 20 ++++++++++++++++++++ kernel-trace.spec | 2 +- kernel-vanilla.changes | 20 ++++++++++++++++++++ kernel-vanilla.spec | 2 +- macros.kernel-source | 7 +++++-- source-timestamp | 4 ++-- 22 files changed, 204 insertions(+), 22 deletions(-) diff --git a/config.tar.bz2 b/config.tar.bz2 index ef4577f4..6a526866 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05b1090882669656444d2ec60fc5a756723b8b4f36659b7c1ab7a6389b3429c7 -size 174239 +oid sha256:87c7936730c772967c2f415603cff14fb6ddf885e1043ace60a29d9d6c101436 +size 174824 diff --git a/kernel-cert-subpackage b/kernel-cert-subpackage index 8ab0e651..60e80ca0 100644 --- a/kernel-cert-subpackage +++ b/kernel-cert-subpackage @@ -8,20 +8,18 @@ modules in the %{-n*}-kmp packages. # The scriptlets are reused in kernel-binary.spec.in by a sed script that # stops at the next line that starts with a percent sign %post -n %{-n*}-ueficert -# Make the -cert subpackage scriptlets non-fatal and verbose in the -# Beta phase -set -x +e if ! command -v mokutil >/dev/null; then exit 0 fi # XXX: Only call mokutil if UEFI and shim are used for cert in @CERTS@; do - mokutil --import "$cert" --root-pw + if ! mokutil --import "$cert" --root-pw; then + echo "Failed to import $cert" + fi done exit 0 %preun -n %{-n*}-ueficert -set -x +e if ! command -v mokutil >/dev/null; then exit 0 fi @@ -31,13 +29,14 @@ done exit 0 %postun -n %{-n*}-ueficert -set -x +e if ! command -v mokutil >/dev/null; then exit 0 fi for cert in @CERTS@; do if ! test -e "$cert"; then - mokutil --delete "$cert.delete" --root-pw + if ! mokutil --delete "$cert.delete" --root-pw; then + echo "Failed to delete $cert" + fi fi rm "$cert.delete" done diff --git a/kernel-debug.changes b/kernel-debug.changes index 5d8b2100..692eb15a 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index b51bffd1..281be46a 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -60,7 +60,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-default.changes b/kernel-default.changes index 5d8b2100..692eb15a 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 16e048f7..48f45e01 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -60,7 +60,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 5d8b2100..692eb15a 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 44d1b4e4..60a22e53 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -60,7 +60,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-docs.changes b/kernel-docs.changes index 5d8b2100..692eb15a 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index fcd13d2e..b2f4f1f5 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -25,7 +25,7 @@ Name: kernel-docs Summary: Kernel Documentation Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ diff --git a/kernel-pae.changes b/kernel-pae.changes index 5d8b2100..692eb15a 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 1e8c0acb..e0a90c18 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -60,7 +60,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-source.changes b/kernel-source.changes index 5d8b2100..692eb15a 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index b0fa67fd..d99944b4 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -30,7 +30,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ diff --git a/kernel-syms.changes b/kernel-syms.changes index 5d8b2100..692eb15a 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index dd64596b..bffab8f5 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -25,7 +25,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 3.11.rc4 %if %using_buildservice -Release: .g01695c8 +Release: .g910e01d %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release diff --git a/kernel-trace.changes b/kernel-trace.changes index 5d8b2100..692eb15a 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index d778d43d..f3a22004 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -60,7 +60,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 5d8b2100..692eb15a 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 7 19:07:39 CEST 2013 - jeffm@suse.com + +- config: disable RCU_USER_QS + RCU_USER_QS is used for hacking on debugging the full dynticks model, + which we've disabled. +- commit 910e01d + ------------------------------------------------------------------- Mon Aug 5 22:59:55 CEST 2013 - jeffm@suse.com @@ -751,6 +759,18 @@ Wed Apr 24 17:51:17 CEST 2013 - jeffm@suse.com Eliminated 2 patches. - commit a86daba +------------------------------------------------------------------- +Wed Apr 24 16:08:25 CEST 2013 - mmarek@suse.cz + +- rpm/macros.kernel-source: Fix the -c option if -n is not given +- commit d704806 + +------------------------------------------------------------------- +Thu Apr 18 14:23:45 CEST 2013 - mmarek@suse.cz + +- Remove set -x and set +e statements in KMP scripts +- commit 5575c3c + ------------------------------------------------------------------- Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index e7490b7c..72067702 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -60,7 +60,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 3.11.rc4 -Release: .g01695c8 +Release: .g910e01d License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/macros.kernel-source b/macros.kernel-source index 02a51004..11a9c558 100644 --- a/macros.kernel-source +++ b/macros.kernel-source @@ -4,7 +4,7 @@ # Defines %flavors_to_build and %kernel_source() as a side effect. %_kernel_module_package(n:v:r:t:f:Xp:bc:) \ -%{expand:%( set -x \ +%{expand:%( \ subpkg=%{-t*}%{!-t:/usr/lib/rpm/kernel-module-subpackage} \ echo "%%define _suse_kernel_module_subpackage(n:v:r:f:p:bc) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \ flavors_to_build= \ @@ -34,7 +34,10 @@ %{-c: for fmt in DER PEM; do h=$(openssl x509 -inform $fmt -fingerprint -noout -in %{-c*}); if test -n "$h"; then break; fi; done \ cert=/etc/uefi/certs/$(echo "$h" | sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\\1/p').crt - sed "s:@CERTS@:$cert:g" /usr/lib/rpm/kernel-cert-subpackage \ + : The -n expanstion in kernel-cert-subpackage only works if + : -n is actually passed to the macro. Fix this here, so that + : we do not have to modify the modsign-repackage script + sed "s|@CERTS@|$cert|g; s|%%{-n.}|%{-n*}%{!-n:%name}|g" /usr/lib/rpm/kernel-cert-subpackage \ echo "%%global __spec_build_pre %%__spec_build_pre mkdir -p %%buildroot/etc/uefi/certs; openssl x509 -in %{-c*} -inform $fmt -out %%buildroot/$cert -outform DER" } \ )} diff --git a/source-timestamp b/source-timestamp index e9b183a2..562f7978 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2013-08-05 23:01:13 +0200 -GIT Revision: 01695c8c4f81eb25bdc6b65eda2dd17dd0a10f15 +2013-08-07 19:07:39 +0200 +GIT Revision: 910e01da495bde688f298e4c5fdb3fb431f088c2 GIT Branch: master