pool/kernel-source
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit 910e01da495bde688f298e4c5fdb3fb431f088c2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7591
This commit is contained in:
Michal Marek 2013-08-08 06:04:25 +00:00 committed by Git OBS Bridge
parent 585366819d
commit de873c9900
22 changed files with 204 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:05b1090882669656444d2ec60fc5a756723b8b4f36659b7c1ab7a6389b3429c7 oid sha256:87c7936730c772967c2f415603cff14fb6ddf885e1043ace60a29d9d6c101436
size 174239 size 174824

13
kernel-cert-subpackage
View File

@ -8,20 +8,18 @@ modules in the %{-n*}-kmp packages.
# The scriptlets are reused in kernel-binary.spec.in by a sed script that # 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 # stops at the next line that starts with a percent sign
%post -n %{-n*}-ueficert %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 if ! command -v mokutil >/dev/null; then
exit 0 exit 0
fi fi
# XXX: Only call mokutil if UEFI and shim are used # XXX: Only call mokutil if UEFI and shim are used
for cert in @CERTS@; do for cert in @CERTS@; do
mokutil --import "$cert" --root-pw if ! mokutil --import "$cert" --root-pw; then
echo "Failed to import $cert"
fi
done done
exit 0 exit 0
%preun -n %{-n*}-ueficert %preun -n %{-n*}-ueficert
set -x +e
if ! command -v mokutil >/dev/null; then if ! command -v mokutil >/dev/null; then
exit 0 exit 0
fi fi
@ -31,13 +29,14 @@ done
exit 0 exit 0
%postun -n %{-n*}-ueficert %postun -n %{-n*}-ueficert
set -x +e
if ! command -v mokutil >/dev/null; then if ! command -v mokutil >/dev/null; then
exit 0 exit 0
fi fi
for cert in @CERTS@; do for cert in @CERTS@; do
if ! test -e "$cert"; then 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 fi
rm "$cert.delete" rm "$cert.delete"
done done

20
kernel-debug.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-debug.spec
View File

@ -60,7 +60,7 @@
Name: kernel-debug Name: kernel-debug
Summary: A Debug Version of the Kernel Summary: A Debug Version of the Kernel
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
License: GPL-2.0 License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/

20
kernel-default.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-default.spec
View File

@ -60,7 +60,7 @@
Name: kernel-default Name: kernel-default
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
License: GPL-2.0 License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/

20
kernel-desktop.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-desktop.spec
View File

@ -60,7 +60,7 @@
Name: kernel-desktop Name: kernel-desktop
Summary: Kernel optimized for the desktop Summary: Kernel optimized for the desktop
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
License: GPL-2.0 License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/

20
kernel-docs.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-docs.spec
View File

@ -25,7 +25,7 @@
Name: kernel-docs Name: kernel-docs
Summary: Kernel Documentation Summary: Kernel Documentation
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant BuildRequires: kernel-source%variant
Url: http://www.kernel.org/ Url: http://www.kernel.org/

20
kernel-pae.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-pae.spec
View File

@ -60,7 +60,7 @@
Name: kernel-pae Name: kernel-pae
Summary: Kernel with PAE Support Summary: Kernel with PAE Support
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
License: GPL-2.0 License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/

20
kernel-source.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-source.spec
View File

@ -30,7 +30,7 @@
Name: kernel-source Name: kernel-source
Summary: The Linux Kernel Sources Summary: The Linux Kernel Sources
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
License: GPL-2.0 License: GPL-2.0
Group: Development/Sources Group: Development/Sources
Url: http://www.kernel.org/ Url: http://www.kernel.org/

20
kernel-syms.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-syms.spec
View File

@ -25,7 +25,7 @@ Name: kernel-syms
Summary: Kernel Symbol Versions (modversions) Summary: Kernel Symbol Versions (modversions)
Version: 3.11.rc4 Version: 3.11.rc4
%if %using_buildservice %if %using_buildservice
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
%else %else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) %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 Release: %kernel_source_release

20
kernel-trace.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-trace.spec
View File

@ -60,7 +60,7 @@
Name: kernel-trace Name: kernel-trace
Summary: The Standard Kernel with Tracing Features Summary: The Standard Kernel with Tracing Features
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
License: GPL-2.0 License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/

20
kernel-vanilla.changes
View File

@ -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 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. Eliminated 2 patches.
- commit a86daba - 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 Fri Apr 12 22:48:25 CEST 2013 - agraf@suse.de

2
kernel-vanilla.spec
View File

@ -60,7 +60,7 @@
Name: kernel-vanilla Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches Summary: The Standard Kernel - without any SUSE patches
Version: 3.11.rc4 Version: 3.11.rc4
Release: <RELEASE>.g01695c8 Release: <RELEASE>.g910e01d
License: GPL-2.0 License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/

7
macros.kernel-source
View File

@ -4,7 +4,7 @@
# Defines %flavors_to_build and %kernel_source() as a side effect. # Defines %flavors_to_build and %kernel_source() as a side effect.
%_kernel_module_package(n:v:r:t:f:Xp:bc:) \ %_kernel_module_package(n:v:r:t:f:Xp:bc:) \
%{expand:%( set -x \ %{expand:%( \
subpkg=%{-t*}%{!-t:/usr/lib/rpm/kernel-module-subpackage} \ 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)}" \ echo "%%define _suse_kernel_module_subpackage(n:v:r:f:p:bc) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \
flavors_to_build= \ flavors_to_build= \
@ -34,7 +34,10 @@
%{-c: %{-c:
for fmt in DER PEM; do h=$(openssl x509 -inform $fmt -fingerprint -noout -in %{-c*}); if test -n "$h"; then break; fi; done \ 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 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" } \ 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" } \
)} )}

4
source-timestamp
View File

@ -1,3 +1,3 @@
2013-08-05 23:01:13 +0200 2013-08-07 19:07:39 +0200
GIT Revision: 01695c8c4f81eb25bdc6b65eda2dd17dd0a10f15 GIT Revision: 910e01da495bde688f298e4c5fdb3fb431f088c2
GIT Branch: master GIT Branch: master