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

commit 4dac1be16631862650d14a0955360962e33a3fa0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=479
This commit is contained in:
Jiri Slaby 2016-02-11 08:59:36 +00:00 committed by Git OBS Bridge
parent e75fed5e5b
commit ac3f0af7a8
24 changed files with 315 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kernel-binary.spec.in
View File

@ -46,7 +46,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_KEY CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
@ -350,31 +350,27 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# copy optional module signing files:
# *.x509, *.crt
# - certificates with pubkeys used to verify module and firmware signatures
# at runtime. *.crt files assumed to be in the PEM format.
# signing_key.priv
# - unencrypted private key used to sign modules and firmware during build
# x509.genkey
# - openssl req config to generate a new signing_key.{x509,priv} pair for the
# build
for f in %_sourcedir/*.x509 %_sourcedir/{signing_key.priv,x509.genkey}; do
if test -e "$f"; then
cp "$f" .
fi
done
# copy module signing certificate(s)
found_sigkey=false
for f in %_sourcedir/*.crt; do
if ! test -e "$f"; then
continue
fi
out=${f##*/}
out=${out%.crt}.x509
openssl x509 -inform PEM -in "$f" -outform DER -out "$out"
if test "${f##*/}" = %CONFIG_MODULE_SIG_KEY; then
found_sigkey=true
cp "$f" .
else
cat "$f" >>keyring.crt
fi
done
# Convince kernel/Makefile not to generate a new keypair
touch x509.genkey
touch signing_key.x509
if ! $found_sigkey; then
echo "warning: %CONFIG_MODULE_SIG_KEY not found"
# Let certs/Makefile generate a keypair
../scripts/config --set-str CONFIG_MODULE_SIG_KEY "certs/signing_key.pem"
fi
if test -s keyring.crt; then
../scripts/config --set-str SYSTEM_TRUSTED_KEYS_FILENAME "keyring.crt"
fi
MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

19
kernel-debug.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

40
kernel-debug.spec
View File

@ -46,7 +46,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_KEY CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif
@ -481,31 +481,27 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# copy optional module signing files:
# *.x509, *.crt
# - certificates with pubkeys used to verify module and firmware signatures
# at runtime. *.crt files assumed to be in the PEM format.
# signing_key.priv
# - unencrypted private key used to sign modules and firmware during build
# x509.genkey
# - openssl req config to generate a new signing_key.{x509,priv} pair for the
# build
for f in %_sourcedir/*.x509 %_sourcedir/{signing_key.priv,x509.genkey}; do
if test -e "$f"; then
cp "$f" .
fi
done
# copy module signing certificate(s)
found_sigkey=false
for f in %_sourcedir/*.crt; do
if ! test -e "$f"; then
continue
fi
out=${f##*/}
out=${out%.crt}.x509
openssl x509 -inform PEM -in "$f" -outform DER -out "$out"
if test "${f##*/}" = %CONFIG_MODULE_SIG_KEY; then
found_sigkey=true
cp "$f" .
else
cat "$f" >>keyring.crt
fi
done
# Convince kernel/Makefile not to generate a new keypair
touch x509.genkey
touch signing_key.x509
if ! $found_sigkey; then
echo "warning: %CONFIG_MODULE_SIG_KEY not found"
# Let certs/Makefile generate a keypair
../scripts/config --set-str CONFIG_MODULE_SIG_KEY "certs/signing_key.pem"
fi
if test -s keyring.crt; then
../scripts/config --set-str SYSTEM_TRUSTED_KEYS_FILENAME "keyring.crt"
fi
MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

19
kernel-default.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

40
kernel-default.spec
View File

@ -46,7 +46,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_KEY CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif
@ -524,31 +524,27 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# copy optional module signing files:
# *.x509, *.crt
# - certificates with pubkeys used to verify module and firmware signatures
# at runtime. *.crt files assumed to be in the PEM format.
# signing_key.priv
# - unencrypted private key used to sign modules and firmware during build
# x509.genkey
# - openssl req config to generate a new signing_key.{x509,priv} pair for the
# build
for f in %_sourcedir/*.x509 %_sourcedir/{signing_key.priv,x509.genkey}; do
if test -e "$f"; then
cp "$f" .
fi
done
# copy module signing certificate(s)
found_sigkey=false
for f in %_sourcedir/*.crt; do
if ! test -e "$f"; then
continue
fi
out=${f##*/}
out=${out%.crt}.x509
openssl x509 -inform PEM -in "$f" -outform DER -out "$out"
if test "${f##*/}" = %CONFIG_MODULE_SIG_KEY; then
found_sigkey=true
cp "$f" .
else
cat "$f" >>keyring.crt
fi
done
# Convince kernel/Makefile not to generate a new keypair
touch x509.genkey
touch signing_key.x509
if ! $found_sigkey; then
echo "warning: %CONFIG_MODULE_SIG_KEY not found"
# Let certs/Makefile generate a keypair
../scripts/config --set-str CONFIG_MODULE_SIG_KEY "certs/signing_key.pem"
fi
if test -s keyring.crt; then
../scripts/config --set-str SYSTEM_TRUSTED_KEYS_FILENAME "keyring.crt"
fi
MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

19
kernel-docs.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

2
kernel-docs.spec
View File

@ -29,7 +29,7 @@ License: GPL-2.0
Group: Documentation/Man
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif

19
kernel-lpae.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

40
kernel-lpae.spec
View File

@ -46,7 +46,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_KEY CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif
@ -475,31 +475,27 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# copy optional module signing files:
# *.x509, *.crt
# - certificates with pubkeys used to verify module and firmware signatures
# at runtime. *.crt files assumed to be in the PEM format.
# signing_key.priv
# - unencrypted private key used to sign modules and firmware during build
# x509.genkey
# - openssl req config to generate a new signing_key.{x509,priv} pair for the
# build
for f in %_sourcedir/*.x509 %_sourcedir/{signing_key.priv,x509.genkey}; do
if test -e "$f"; then
cp "$f" .
fi
done
# copy module signing certificate(s)
found_sigkey=false
for f in %_sourcedir/*.crt; do
if ! test -e "$f"; then
continue
fi
out=${f##*/}
out=${out%.crt}.x509
openssl x509 -inform PEM -in "$f" -outform DER -out "$out"
if test "${f##*/}" = %CONFIG_MODULE_SIG_KEY; then
found_sigkey=true
cp "$f" .
else
cat "$f" >>keyring.crt
fi
done
# Convince kernel/Makefile not to generate a new keypair
touch x509.genkey
touch signing_key.x509
if ! $found_sigkey; then
echo "warning: %CONFIG_MODULE_SIG_KEY not found"
# Let certs/Makefile generate a keypair
../scripts/config --set-str CONFIG_MODULE_SIG_KEY "certs/signing_key.pem"
fi
if test -s keyring.crt; then
../scripts/config --set-str SYSTEM_TRUSTED_KEYS_FILENAME "keyring.crt"
fi
MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

19
kernel-obs-build.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

6
kernel-obs-build.spec
View File

@ -53,7 +53,7 @@ License: GPL-2.0
Group: SLES
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif
@ -96,6 +96,10 @@ info " binfmt misc..."
modprobe binfmt_misc
EOF
chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh
# Configure systemd in kernel-obs-build's initrd not to limit TasksMax,
# we run with build as PID 1 (boo#965564)
echo "DefaultTasksMax=infinity" >> /etc/systemd/system.conf
echo "DefaultTasksAccounting=no" >> /etc/systemd/system.conf
# a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org, so we stay compatible.

4
kernel-obs-build.spec.in
View File

@ -96,6 +96,10 @@ info " binfmt misc..."
modprobe binfmt_misc
EOF
chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh
# Configure systemd in kernel-obs-build's initrd not to limit TasksMax,
# we run with build as PID 1 (boo#965564)
echo "DefaultTasksMax=infinity" >> /etc/systemd/system.conf
echo "DefaultTasksAccounting=no" >> /etc/systemd/system.conf
# a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org, so we stay compatible.

19
kernel-obs-qa.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

2
kernel-obs-qa.spec
View File

@ -38,7 +38,7 @@ License: GPL-2.0
Group: SLES
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif

19
kernel-pae.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

40
kernel-pae.spec
View File

@ -46,7 +46,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_KEY CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif
@ -501,31 +501,27 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# copy optional module signing files:
# *.x509, *.crt
# - certificates with pubkeys used to verify module and firmware signatures
# at runtime. *.crt files assumed to be in the PEM format.
# signing_key.priv
# - unencrypted private key used to sign modules and firmware during build
# x509.genkey
# - openssl req config to generate a new signing_key.{x509,priv} pair for the
# build
for f in %_sourcedir/*.x509 %_sourcedir/{signing_key.priv,x509.genkey}; do
if test -e "$f"; then
cp "$f" .
fi
done
# copy module signing certificate(s)
found_sigkey=false
for f in %_sourcedir/*.crt; do
if ! test -e "$f"; then
continue
fi
out=${f##*/}
out=${out%.crt}.x509
openssl x509 -inform PEM -in "$f" -outform DER -out "$out"
if test "${f##*/}" = %CONFIG_MODULE_SIG_KEY; then
found_sigkey=true
cp "$f" .
else
cat "$f" >>keyring.crt
fi
done
# Convince kernel/Makefile not to generate a new keypair
touch x509.genkey
touch signing_key.x509
if ! $found_sigkey; then
echo "warning: %CONFIG_MODULE_SIG_KEY not found"
# Let certs/Makefile generate a keypair
../scripts/config --set-str CONFIG_MODULE_SIG_KEY "certs/signing_key.pem"
fi
if test -s keyring.crt; then
../scripts/config --set-str SYSTEM_TRUSTED_KEYS_FILENAME "keyring.crt"
fi
MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

19
kernel-source.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

2
kernel-source.spec
View File

@ -32,7 +32,7 @@ License: GPL-2.0
Group: Development/Sources
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif

4
kernel-spec-macros
View File

@ -10,9 +10,11 @@
# generated by the build service. If the release string has a non-digit
# suffix, we keep that suffix and strip the rightmost digit component.
# This is used in KOTD builds: 2.1.g1234567 -> 2.g1234567
# In PTF projects, there is no rebuild counter, so we leave the release
# string intact.
%define source_rel %release
%define obsolete_rebuilds() %nil
%if %using_buildservice
%if %using_buildservice && ! 0%{?is_ptf}
%define source_rel %(echo %release | sed -r 's/\\.[0-9]+($|\\.[^.]*[^.0-9][^.]*$)/\\1/')
# If the rebuild counter is > 1, obsolete all previous rebuilds (boo#867595)
%define obsolete_rebuilds() %( %{verbose:set -x} \

19
kernel-syms.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

2
kernel-syms.spec
View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 4.4.1
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif

19
kernel-vanilla.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Feb 11 09:46:23 CET 2016 - jslaby@suse.cz
- rpm/kernel-obs-build.spec.in: do not limit TasksMax
We run with build as PID 1 (boo#965564).
- commit 39b708b
-------------------------------------------------------------------
Wed Feb 10 10:19:40 CET 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Adapt certificate handling for changes in v4.3
- commit 589be33
-------------------------------------------------------------------
Tue Feb 2 17:31:39 CET 2016 - tiwai@suse.de
@ -78,6 +91,12 @@ Tue Jan 26 12:46:26 CET 2016 - jslaby@suse.cz
CVE-2016-0723).
- commit 4ca6fa4
-------------------------------------------------------------------
Tue Jan 26 10:39:45 CET 2016 - mmarek@suse.com
- rpm/kernel-spec-macros: Do not modify the release string in PTFs (bsc#963449)
- commit dc2b096
-------------------------------------------------------------------
Tue Jan 26 07:45:55 CET 2016 - tiwai@suse.de

40
kernel-vanilla.spec
View File

@ -46,7 +46,7 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_KEY CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g2b16688
Release: <RELEASE>.g4dac1be
%else
Release: 0
%endif
@ -474,31 +474,27 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# copy optional module signing files:
# *.x509, *.crt
# - certificates with pubkeys used to verify module and firmware signatures
# at runtime. *.crt files assumed to be in the PEM format.
# signing_key.priv
# - unencrypted private key used to sign modules and firmware during build
# x509.genkey
# - openssl req config to generate a new signing_key.{x509,priv} pair for the
# build
for f in %_sourcedir/*.x509 %_sourcedir/{signing_key.priv,x509.genkey}; do
if test -e "$f"; then
cp "$f" .
fi
done
# copy module signing certificate(s)
found_sigkey=false
for f in %_sourcedir/*.crt; do
if ! test -e "$f"; then
continue
fi
out=${f##*/}
out=${out%.crt}.x509
openssl x509 -inform PEM -in "$f" -outform DER -out "$out"
if test "${f##*/}" = %CONFIG_MODULE_SIG_KEY; then
found_sigkey=true
cp "$f" .
else
cat "$f" >>keyring.crt
fi
done
# Convince kernel/Makefile not to generate a new keypair
touch x509.genkey
touch signing_key.x509
if ! $found_sigkey; then
echo "warning: %CONFIG_MODULE_SIG_KEY not found"
# Let certs/Makefile generate a keypair
../scripts/config --set-str CONFIG_MODULE_SIG_KEY "certs/signing_key.pem"
fi
if test -s keyring.crt; then
../scripts/config --set-str SYSTEM_TRUSTED_KEYS_FILENAME "keyring.crt"
fi
MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

4
source-timestamp
View File

@ -1,3 +1,3 @@
2016-02-04 18:43:46 +0100
GIT Revision: 2b166882bd74568d520cb4afb887bbd3533caabd
2016-02-11 09:48:30 +0100
GIT Revision: 4dac1be16631862650d14a0955360962e33a3fa0
GIT Branch: stable