commit 8e322687563b4f32152f1ecf8f339370ceee76a0

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=860
This commit is contained in:
Michal Suchanek 2018-05-24 06:03:09 +00:00 committed by Git OBS Bridge
parent 9111c9d75e
commit 49c2c83044
41 changed files with 1688 additions and 164 deletions

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -31,7 +31,7 @@
Name: dtb-aarch64
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -99,6 +99,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -31,7 +31,7 @@
Name: dtb-armv6l
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -99,6 +99,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -31,7 +31,7 @@
Name: dtb-armv7l
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -99,6 +99,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -220,6 +221,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -300,6 +302,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -486,6 +489,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -564,7 +585,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -597,6 +618,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -785,7 +807,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -981,6 +1003,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1067,8 +1094,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1203,19 +1230,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1230,7 +1253,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,8 +165,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = @COMMIT_FULL@
Provides: kernel-%build_flavor-base-srchash = @COMMIT_FULL@
Provides: kernel-srchash = @COMMIT_FULL@
# END COMMON DEPS
Provides: %name-srchash = @COMMIT_FULL@
@PROVIDES_OBSOLETES@
@ -357,6 +358,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -435,7 +454,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -468,6 +487,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -656,7 +676,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -852,6 +872,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1007,19 +1032,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1034,7 +1055,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@ -228,6 +229,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -308,6 +310,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -492,6 +495,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -570,7 +591,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -603,6 +624,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -791,7 +813,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -987,6 +1009,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1073,8 +1100,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%ifarch ppc64
Provides: kernel-kdump-base = 2.6.28
@ -1217,19 +1244,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1244,7 +1267,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@ -272,6 +273,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -352,6 +354,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -535,6 +538,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -613,7 +634,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -646,6 +667,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -834,7 +856,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -1030,6 +1052,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1116,8 +1143,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%ifarch %ix86
Provides: kernel-trace-base = 3.13
@ -1318,19 +1345,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1345,7 +1368,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -33,7 +33,7 @@ License: GPL-2.0
Group: Documentation/Man
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -43,10 +43,10 @@ BuildRequires: xmlto
%endif
%if %build_pdf || %build_html
# ReST handling
BuildRequires: ImageMagick
BuildRequires: graphviz
BuildRequires: graphviz-gd
BuildRequires: graphviz-gnome
BuildRequires: ImageMagick
BuildRequires: python3-Sphinx
BuildRequires: texlive-anyfontsize
%if %build_pdf
@ -63,7 +63,7 @@ BuildRequires: texlive-zapfding
%endif
Url: http://www.kernel.org/
Provides: %name = %version-%source_rel
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
@ -117,6 +117,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -183,6 +184,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102

View File

@ -43,10 +43,10 @@ BuildRequires: xmlto
%endif
%if %build_pdf || %build_html
# ReST handling
BuildRequires: ImageMagick
BuildRequires: graphviz
BuildRequires: graphviz-gd
BuildRequires: graphviz-gnome
BuildRequires: ImageMagick
BuildRequires: python3-Sphinx
BuildRequires: texlive-anyfontsize
%if %build_pdf

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -220,6 +221,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -300,6 +302,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -490,6 +493,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -568,7 +589,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -601,6 +622,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -789,7 +811,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -985,6 +1007,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1071,8 +1098,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1215,19 +1242,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1242,7 +1265,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -220,6 +221,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -300,6 +302,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -484,6 +487,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -562,7 +583,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -595,6 +616,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -783,7 +805,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -979,6 +1001,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1065,8 +1092,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1197,19 +1224,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1224,7 +1247,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -45,7 +45,7 @@ BuildRequires: util-linux
%endif
%endif
%endif
BuildRequires: kernel%kernel_flavor-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
BuildRequires: kernel%kernel_flavor-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%if 0%{?rhel_version}
BuildRequires: kernel
@ -66,7 +66,7 @@ License: GPL-2.0
Group: SLES
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

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

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@ -242,6 +243,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -322,6 +324,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -512,6 +515,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -590,7 +611,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -623,6 +644,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -811,7 +833,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -1007,6 +1029,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1093,8 +1120,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%ifarch %ix86
Provides: kernel-vmi-base = 2.6.38
@ -1267,19 +1294,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1294,7 +1317,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -32,7 +32,7 @@ License: GPL-2.0
Group: Development/Sources
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -43,7 +43,7 @@ BuildRequires: fdupes
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: linux
Provides: multiversion(kernel)
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
@ -97,6 +97,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2

View File

@ -97,6 +97,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 4.16.11
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -55,7 +55,7 @@ Requires: kernel-zfcpdump-devel = %version-%source_rel
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -220,6 +221,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -300,6 +302,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -485,6 +488,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -563,7 +584,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -596,6 +617,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -784,7 +806,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -980,6 +1002,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1066,8 +1093,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1200,19 +1227,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1227,7 +1250,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -220,6 +221,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -300,6 +302,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -483,6 +486,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -561,7 +582,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -594,6 +615,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -782,7 +804,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -978,6 +1000,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1064,8 +1091,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1194,19 +1221,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1221,7 +1244,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -288,6 +288,12 @@ Sun May 20 20:45:26 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 68e48d7
-------------------------------------------------------------------
Thu May 17 15:32:20 CEST 2018 - msuchanek@suse.de
- kernel-{binary,docs}.spec sort dependencies.
- commit d2ab971
-------------------------------------------------------------------
Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
@ -407,6 +413,20 @@ Wed May 16 12:28:23 CEST 2018 - jslaby@suse.cz
(bnc#1012628).
- commit 4f45b1e
-------------------------------------------------------------------
Wed May 16 12:09:13 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: Fix building non-x86 KMPs
- commit 8631d05
-------------------------------------------------------------------
Mon May 14 21:10:40 CEST 2018 - msuchanek@suse.de
- macros.kernel-source: ignore errors when using make to print kernel release
There is no way to handle the errors anyway and including the error into
package version does not give good results.
- commit 282e9a6
-------------------------------------------------------------------
Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
@ -414,6 +434,13 @@ Mon May 14 20:57:03 CEST 2018 - palcantara@suse.de
(bsc#1091442).
- commit c6f0d32
-------------------------------------------------------------------
Fri May 11 17:30:49 CEST 2018 - msuchanek@suse.de
- Revert "kernel-binary: do not package extract-cert when not signing modules"
This reverts commit 10a8bc496a553b8069d490a8ae7508bdb19f58d9.
- commit 1f7acca
-------------------------------------------------------------------
Wed May 9 11:59:30 CEST 2018 - jslaby@suse.cz
@ -686,6 +713,19 @@ Wed May 2 21:21:16 CEST 2018 - jslaby@suse.cz
- sparc64: Fix mistake in oradax license text (bnc#1012628).
- commit 938738d
-------------------------------------------------------------------
Wed May 2 15:13:49 CEST 2018 - msuchanek@suse.de
- kernel-binary: also default klp_symbols to 0 here.
- commit e35f14a
-------------------------------------------------------------------
Wed May 2 14:55:25 CEST 2018 - msuchanek@suse.de
- klp_symbols: make --klp-symbols argument semantic sane
It selects build of klp symbols and defaults to off
- commit 0e53042
-------------------------------------------------------------------
Wed May 2 09:13:10 CEST 2018 - jslaby@suse.cz
@ -819,6 +859,12 @@ Mon Apr 30 22:33:51 CEST 2018 - jslaby@suse.cz
_desktops_ (bnc#1012628).
- commit 566acbc
-------------------------------------------------------------------
Fri Apr 27 08:43:38 CEST 2018 - msuchanek@suse.de
- kernel-binary: only install modules.fips on modular kernels.
- commit 2cb2bec
-------------------------------------------------------------------
Thu Apr 26 18:54:45 CEST 2018 - jslaby@suse.cz
@ -880,12 +926,32 @@ Wed Apr 25 15:25:17 CEST 2018 - tiwai@suse.de
(bsc#1090458).
- commit 3f3a85c
-------------------------------------------------------------------
Tue Apr 24 19:54:23 CEST 2018 - msuchanek@suse.de
- split-modules: use MAKE_ARGS
- commit d8fe174
-------------------------------------------------------------------
Tue Apr 24 17:45:15 CEST 2018 - mcgrof@suse.com
- xfs: set format back to extents if xfs_bmap_extents_to_btree (bsc#1090717, CVE-2018-10323).
- commit ddcd6f2
-------------------------------------------------------------------
Tue Apr 24 16:27:11 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass MAKE_ARGS to install script as well.
- commit ce62ae7
-------------------------------------------------------------------
Tue Apr 24 13:58:15 CEST 2018 - msuchanek@suse.de
- kernel-binary: pass ARCH= to kernel build
Recent kernel does not save CONFIG_64BIT so it has to be specified by
arch.
- commit fb21b73
-------------------------------------------------------------------
Tue Apr 24 13:57:55 CEST 2018 - tiwai@suse.de
@ -11054,6 +11120,12 @@ Thu Aug 10 17:07:43 CEST 2017 - msuchanek@suse.de
- Refresh vanilla config.
- commit ae18928
-------------------------------------------------------------------
Thu Aug 10 15:54:22 CEST 2017 - msuchanek@suse.de
- rpm/modules.fips include module list from dracut
- commit f70bab5
-------------------------------------------------------------------
Wed Aug 9 10:35:04 CEST 2017 - ohering@suse.de

View File

@ -60,7 +60,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.16.11
%if 0%{?is_kotd}
Release: <RELEASE>.gf86282c
Release: <RELEASE>.g8e32268
%else
Release: 0
%endif
@ -74,7 +74,8 @@ BuildRequires: flex
# does not expand %%(...)
%if "%build_flavor" == "syzkaller"
# Needed by scripts/gcc-plugin.sh
BuildRequires: gcc-c++ gcc-devel
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
@ -164,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
# END COMMON DEPS
Provides: %name-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: %name-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -220,6 +221,7 @@ Source74: mkspec-dtb
Source75: release-projects
Source76: check-module-license
Source77: klp-symbols
Source78: modules.fips
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -300,6 +302,7 @@ NoSource: 74
NoSource: 75
NoSource: 76
NoSource: 77
NoSource: 78
NoSource: 100
NoSource: 101
NoSource: 102
@ -486,6 +489,24 @@ fi
--disable CONFIG_DEBUG_INFO
%endif
case %cpu_arch in
ppc*)
MAKE_ARGS="$MAKE_ARGS ARCH=powerpc"
;;
s390x)
MAKE_ARGS="$MAKE_ARGS ARCH=s390"
;;
arm64)
MAKE_ARGS="$MAKE_ARGS ARCH=arm64"
;;
armv*)
MAKE_ARGS="$MAKE_ARGS ARCH=arm"
;;
*)
MAKE_ARGS="$MAKE_ARGS ARCH=%cpu_arch"
;;
esac
makeoutputsync=
if make --output-sync --help >/dev/null 2>&1 ; then
makeoutputsync=--output-sync
@ -564,7 +585,7 @@ while true; do
done
# Generate list of symbols that are used to create kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list
%endif
@ -597,6 +618,7 @@ export STRIP_KEEP_SYMTAB='*/vmlinux-*'
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@ -785,7 +807,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# List of symbols that are used to generate kernel livepatches
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
%endif
@ -981,6 +1003,11 @@ for f in %my_builddir/*-kmp-modules; do
add_dirs_to_filelist "$f" >"$f2"
done
if [ %CONFIG_MODULES = y ]; then
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
fi
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
@ -1067,8 +1094,8 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = f86282c36e93ea7ebdb1860fafa7c3830196564b
Provides: kernel-%build_flavor-base-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
Provides: kernel-srchash = 8e322687563b4f32152f1ecf8f339370ceee76a0
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1203,19 +1230,15 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if %CONFIG_MODULE_SIG != "y"
# avoid unnecessary libopenssl dependency (bsc#1080250)
%exclude /usr/src/linux-*/*/*/scripts/extract-cert
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%package livepatch
Summary: Metapackage to pull in matching kernel-livepatch package
Group: System/Kernel
Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
@ -1230,7 +1253,7 @@ static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if ! 0%{?skip_klp_symbols:1}
%if 0%{?klp_symbols}
%package livepatch-devel
Summary: Kernel symbols file used during livepatch development

View File

@ -16,7 +16,7 @@
(*) \
[ -z "%{-X}" -a -n "$flavors" ] && continue ;; \
esac \
krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \
krel=$(make -si -C /usr/src/linux-obj/%_target_cpu/$flavor/ kernelrelease 2>/dev/null) \
kver=${krel%%-*} \
flavors_to_build="$flavors_to_build $flavor" \
echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name} -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-f} %{-p} %{-b} %{-c:-c} $flavor $kver" \

65
modules.fips Normal file
View File

@ -0,0 +1,65 @@
ablk_helper
aes_s390
af_alg
algif_hash
ansi_cprng
anubis
arc4
authenc
blowfish_common
blowfish_generic
blowfish_x86_64
camellia_generic
camellia_x86_64
cast5_generic
cast6_generic
cast_common
cbc
ccm
cmac
cryptd
crypto_user
ctr
cts
deflate
des_generic
des_s390
drbg
ecb
fcrypt
gcm
gf128mul
ghash_generic
ghash_s390
glue_helper
khazad
lrw
md4
michael_mic
pcbc
rmd128
rmd160
rmd256
rmd320
salsa20_generic
salsa20_x86_64
seed
serpent_generic
serpent_sse2_x86_64
sha1_s390
sha256_s390
sha3_generic
sha512_generic
sha512_s390
sha512_ssse3
tcrypt
tea
tgr192
twofish_common
twofish_generic
twofish_x86_64
twofish_x86_64_3way
vmac
wp512
xcbc
xts

View File

@ -1,3 +1,3 @@
2018-05-22 21:50:37 +0200
GIT Revision: f86282c36e93ea7ebdb1860fafa7c3830196564b
2018-05-23 08:16:41 +0200
GIT Revision: 8e322687563b4f32152f1ecf8f339370ceee76a0
GIT Branch: stable

View File

@ -106,7 +106,7 @@ endif
add_dependent_modules()
{
xargs -r make EXPLAIN=$1 -rRs -C "$tmp/empty" -f "$tmp/dep" | sort -u
xargs -r make $MAKE_ARGS EXPLAIN=$1 -rRs -C "$tmp/empty" -f "$tmp/dep" | sort -u
}
# base
@ -114,7 +114,7 @@ sed 'y/-/_/' <"$opt_builddir/Module.base" | add_dependent_modules >"$tmp/base"
join -j 1 -o 2.2 "$tmp/base" "$tmp/all" >"$opt_out/base-modules"
# base firmware
kver=$(make -s -C "$opt_builddir" kernelrelease)
kver=$(make $MAKE_ARGS -s -C "$opt_builddir" kernelrelease)
if test -d "$opt_dir/lib/firmware/$kver"; then
join <(/sbin/modinfo -F firmware \
$(sed "s:^:$opt_dir:" "$opt_out/base-modules") | sort) \