commit b7c376832975e08040a014ab1c36b480f0d3b41b

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1392
This commit is contained in:
Jiri Slaby 2020-11-23 09:11:45 +00:00 committed by Git OBS Bridge
parent afe2158c15
commit a0a35477da
39 changed files with 2137 additions and 237 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -31,7 +31,7 @@
Name: dtb-aarch64
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -31,7 +31,7 @@
Name: dtb-armv6l
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -31,7 +31,7 @@
Name: dtb-armv7l
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -31,7 +31,7 @@
Name: dtb-riscv64
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -392,7 +392,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -554,7 +554,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -651,7 +651,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -674,13 +674,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -689,7 +689,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -759,8 +759,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -794,7 +794,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -822,7 +822,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -866,7 +866,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -907,7 +907,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1124,7 +1124,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1168,7 +1168,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1179,13 +1179,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1228,7 +1228,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -247,7 +247,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@KMPS@
%endif
)
@ -409,7 +409,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -506,7 +506,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -529,13 +529,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -544,7 +544,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -614,8 +614,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -649,7 +649,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -677,7 +677,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -721,7 +721,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -762,7 +762,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -977,7 +977,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1022,7 +1022,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1033,13 +1033,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1082,7 +1082,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
# BEGIN KMP
%package -n @KMP_NAME@-%build_flavor
Summary: @KMP_SUMMARY@

1182
kernel-binary.spec.in.orig Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@ -398,7 +398,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -560,7 +560,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -657,7 +657,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -680,13 +680,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -695,7 +695,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -765,8 +765,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -800,7 +800,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -828,7 +828,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -872,7 +872,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -913,7 +913,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1132,7 +1132,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1180,7 +1180,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1191,13 +1191,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1240,7 +1240,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@ -441,7 +441,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -603,7 +603,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -700,7 +700,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -723,13 +723,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -738,7 +738,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -808,8 +808,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -843,7 +843,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -871,7 +871,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -915,7 +915,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -956,7 +956,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1194,7 +1194,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1262,7 +1262,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1273,13 +1273,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1322,7 +1322,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -33,7 +33,7 @@ License: GPL-2.0
Group: Documentation/Man
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -63,7 +63,7 @@ BuildRequires: texlive-zapfding
%endif
Url: http://www.kernel.org/
Provides: %name = %version-%source_rel
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -396,7 +396,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -558,7 +558,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -655,7 +655,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -678,13 +678,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -693,7 +693,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -763,8 +763,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -798,7 +798,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -826,7 +826,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -870,7 +870,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -911,7 +911,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1132,7 +1132,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1176,7 +1176,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1187,13 +1187,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1236,7 +1236,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -390,7 +390,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -552,7 +552,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -649,7 +649,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -672,13 +672,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -687,7 +687,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -757,8 +757,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -792,7 +792,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -820,7 +820,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -864,7 +864,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -905,7 +905,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1120,7 +1120,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1164,7 +1164,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1175,13 +1175,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1224,7 +1224,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -45,14 +45,14 @@ BuildRequires: util-linux
%endif
%endif
%endif
BuildRequires: kernel%kernel_flavor-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
BuildRequires: kernel%kernel_flavor-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%if 0%{?rhel_version}
BuildRequires: kernel
%define kernel_flavor ""
%endif
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64
ExclusiveArch: aarch64 armv6hl armv7hl ppc64 ppc64le riscv64 s390x x86_64
%if 0%{?suse_version} < 1315
# For SLE 11
BuildRequires: mkinitrd
@ -66,7 +66,7 @@ License: GPL-2.0
Group: SLES
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -28,7 +28,7 @@ BuildRequires: kernel-default
# here as well to avoid that qa and build package build parallel
BuildRequires: kernel-obs-build
BuildRequires: modutils
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64
ExclusiveArch: aarch64 armv6hl armv7hl ppc64 ppc64le riscv64 s390x x86_64
%if 0%{?suse_version} < 1200
# for SLE 11
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -38,7 +38,7 @@ License: GPL-2.0
Group: SLES
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@ -418,7 +418,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -580,7 +580,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -677,7 +677,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -700,13 +700,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -715,7 +715,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -785,8 +785,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -820,7 +820,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -848,7 +848,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -892,7 +892,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -933,7 +933,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1164,7 +1164,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1218,7 +1218,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1229,13 +1229,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1278,7 +1278,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -32,7 +32,7 @@ License: GPL-2.0
Group: Development/Sources
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -43,7 +43,7 @@ BuildRequires: fdupes
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: linux
Provides: multiversion(kernel)
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
@ -200,8 +200,9 @@ echo "Symbol(s): %symbols"
%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108 -a 109 -a 110 -a 111 -a 113 -a 120 -a 121
%build
%install
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src
pushd $RPM_BUILD_ROOT/usr/src
# Unpack the vanilla kernel sources
tar -xf %{S:0}
@ -223,7 +224,7 @@ cd ..
%endif
%if ! %vanilla_only
ln -sf linux%variant linux%variant # dummy symlink
ln -sf . linux%variant # dummy symlink
cd linux-%kernelrelease%variant
%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
@ -232,12 +233,13 @@ rm -f $(find . -name ".gitignore")
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
cd ..
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $RPM_BUILD_ROOT
popd
%install
%if ! %vanilla_only
# Install the documentation and example Kernel Module Package.
DOC=/usr/share/doc/packages/%name-%kernelrelease

View File

@ -200,8 +200,9 @@ echo "Symbol(s): %symbols"
%setup -q -c -T @UNPACK_PATCHES@
%build
%install
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src
pushd $RPM_BUILD_ROOT/usr/src
# Unpack the vanilla kernel sources
tar -xf %{S:0}
@ -223,7 +224,7 @@ cd ..
%endif
%if ! %vanilla_only
ln -sf linux%variant linux%variant # dummy symlink
ln -sf . linux%variant # dummy symlink
cd linux-%kernelrelease%variant
%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
@ -232,12 +233,13 @@ rm -f $(find . -name ".gitignore")
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
cd ..
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $RPM_BUILD_ROOT
popd
%install
%if ! %vanilla_only
# Install the documentation and example Kernel Module Package.
DOC=/usr/share/doc/packages/%name-%kernelrelease

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 5.9.10
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -52,7 +52,7 @@ Requires: kernel-pae-devel = %version-%source_rel
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -389,7 +389,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -551,7 +551,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -648,7 +648,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -671,13 +671,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -686,7 +686,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -756,8 +756,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -791,7 +791,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -819,7 +819,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -863,7 +863,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -904,7 +904,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1118,7 +1118,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1162,7 +1162,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1173,13 +1173,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1222,7 +1222,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz
- rpm/kernel-{binary,source}.spec.in: do not create loop symlinks
(bsc#1179082)
- commit b7c3768
-------------------------------------------------------------------
Mon Nov 23 08:04:01 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using more barewords (bsc#1179014)
%split_extra still contained two.
- commit d9b4c40
-------------------------------------------------------------------
Sun Nov 22 14:01:07 CET 2020 - jslaby@suse.cz
@ -31,6 +45,34 @@ Sun Nov 22 13:58:57 CET 2020 - jslaby@suse.cz
(bsc#1012628).
- commit 18ece1c
-------------------------------------------------------------------
Fri Nov 20 17:08:21 CET 2020 - msuchanek@suse.de
- kernel-source.spec: Fix build with rpm 4.16 (boo#1179015).
RPM_BUILD_ROOT is cleared before %%install. Do the unpack into
RPM_BUILD_ROOT in %%install
- commit 13bd533
-------------------------------------------------------------------
Fri Nov 20 13:32:09 CET 2020 - jslaby@suse.cz
- rpm/kernel-binary.spec.in: avoid using barewords (bsc#1179014)
Author: Dominique Leuenberger <dimstar@opensuse.org>
- commit 21f8205
-------------------------------------------------------------------
Fri Nov 20 12:07:08 CET 2020 - jslaby@suse.cz
- rpm/mkspec: do not build kernel-obs-build on x86_32
We want to use 64bit kernel due to various bugs (bsc#1178762 to name
one).
There is:
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
in Factory's prjconf now. No other actively maintained distro (i.e.
merging packaging branch) builds a x86_32 kernel, hence pushing to
packaging directly.
- commit 8099b4b
-------------------------------------------------------------------
Thu Nov 19 19:00:59 CET 2020 - jslaby@suse.cz

View File

@ -53,8 +53,8 @@
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_extra (%CONFIG_MODULES == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%if %CONFIG_MODULES != "y"
%define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +70,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.9.10
%if 0%{?is_kotd}
Release: <RELEASE>.gf42c89a
Release: <RELEASE>.gb7c3768
%else
Release: 0
%endif
@ -179,10 +179,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: kernel-%build_flavor-base-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
Provides: kernel-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
# END COMMON DEPS
Provides: %name-srchash-f42c89a05f62397cca5ae8c23359cf0051a678d6
Provides: %name-srchash-b7c376832975e08040a014ab1c36b480f0d3b41b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -392,7 +392,7 @@ awk '
' >%kernel_build_dir/Module.supported
subpackages=(
base
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
%endif
)
@ -554,7 +554,7 @@ for f in %_sourcedir/*.crt; do
cat "$f" >>certs/signing_key.pem
done
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -651,7 +651,7 @@ add_vmlinux()
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
mkdir -p %buildroot/usr/share/man/man9
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
@ -674,13 +674,13 @@ add_vmlinux()
# sign the modules, firmware and possibly the kernel in the buildservice
BRP_PESIGN_FILES=""
%if %CONFIG_EFI_STUB == "y"
%if "%CONFIG_EFI_STUB" == "y"
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%ifarch s390x ppc64 ppc64le
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
%endif
%if %CONFIG_MODULE_SIG == "y"
%if "%CONFIG_MODULE_SIG" == "y"
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
%endif
%ifarch %ix86
@ -689,7 +689,7 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
BRP_PESIGN_FILES=""
%endif
export BRP_PESIGN_FILES
%if %{compress_modules} != "none"
%if "%{compress_modules}" != "none"
export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
%endif
@ -759,8 +759,8 @@ done
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
ln -s X$image$suffix %buildroot/boot/$image$suffix
ln -s Xinitrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
@ -794,7 +794,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
ln -s X%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
@ -822,7 +822,7 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %CONFIG_LIVEPATCH_IPA_CLONES == "y"
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/ipa-clones.list >> %my_builddir/livepatch-files.no_dir
@ -866,7 +866,7 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-e \
%endif
%if ! %supported_modules_check
@ -907,7 +907,7 @@ if [ %CONFIG_MODULES = y ]; then
# Check the license in each module
if ! sh %_sourcedir/check-module-license %buildroot; then
echo "Please fix the missing licenses!"
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
exit 1
%endif
fi
@ -1124,7 +1124,7 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%if "%CONFIG_KMSG_IDS" == "y"
%package man
Summary: The collection of man pages generated by the kmsg script
@ -1168,7 +1168,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%if "%CONFIG_MODULES" == "y"
%pre devel -f devel-pre.sh
@ -1179,13 +1179,13 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%if %kmp_target_cpu != %cpu_arch
%if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu
%endif
%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" && %build_default
%if %livepatch == kgraft
%if "%livepatch" != "" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y" && "%variant" == "" && %build_default
%if "%livepatch" == "kgraft"
%define patch_package %{livepatch}-patch
%else
%define patch_package kernel-%{livepatch}
@ -1228,7 +1228,7 @@ symbol resolution.
%files %{livepatch}-devel -f livepatch-files
%endif
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
%package -n cluster-md-kmp-%build_flavor
Summary: Clustering support for MD devices
Group: System/Kernel

4
mkspec
View File

@ -216,8 +216,8 @@ if (!$variant) {
} else {
@default_archs = arch2rpm(@{$flavor_archs{default}});
}
# No kernel-obs-* for 32bit ppc
@default_archs = grep { $_ ne "ppc" } @default_archs;
# No kernel-obs-* for 32bit ppc and x86
@default_archs = grep { $_ ne "ppc" && $_ ne '%ix86' } @default_archs;
my $default_archs = join(" ", @default_archs);
do_spec('obs-build', "kernel-obs-build.spec", %macros,
ARCHS => $default_archs);

View File

@ -1,3 +1,3 @@
2020-11-22 13:01:07 +0000
GIT Revision: f42c89a05f62397cca5ae8c23359cf0051a678d6
2020-11-23 09:08:45 +0000
GIT Revision: b7c376832975e08040a014ab1c36b480f0d3b41b
GIT Branch: stable