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

commit b077d3a07fb7dc80669cb73be709f09f40beb973

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1515
This commit is contained in:
Kernel Bugs 2021-06-16 08:04:22 +00:00 committed by Git OBS Bridge
parent 244e4677e3
commit e961968afb
41 changed files with 1911 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49c562defbed7739f36ed62610aaeaa3170cbb701573182c6998d64360656634
size 289716
oid sha256:3ed114934b7254a5a7ac9fc86e94dac3a0412c7c3f7989d259ced443f727a7e7
size 289623

58
dtb-aarch64.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

2
dtb-aarch64.spec
View File

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

58
dtb-armv6l.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

2
dtb-armv6l.spec
View File

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

58
dtb-armv7l.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

2
dtb-armv7l.spec
View File

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

58
dtb-riscv64.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

2
dtb-riscv64.spec
View File

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

58
kernel-64kb.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

108
kernel-64kb.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -378,20 +382,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -403,6 +412,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -532,7 +557,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -720,7 +745,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1035,8 +1064,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1133,6 +1166,45 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: Kernel with 64kb PAGE_SIZE - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
This kernel is identical to the default kernel, but is configured with
64kb page size granule. Its main purpose is to serve as compatibility
kernel for systems that were installed when the default kernel was still
configured with 64kb page size granule.
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

98
kernel-binary.spec.in
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -233,20 +237,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -258,6 +267,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -387,7 +412,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -575,7 +600,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -890,8 +919,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -986,6 +1019,43 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: @SUMMARY@ - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
@PROVIDES_OBSOLETES_OPTIONAL@
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
@DESCRIPTION@
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

58
kernel-debug.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

110
kernel-debug.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@ -384,20 +388,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -409,6 +418,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -538,7 +563,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -726,7 +751,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1041,8 +1070,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1141,6 +1174,47 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: A Debug Version of the Kernel - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch ppc64
Provides: kernel-kdump-optional = 2.6.28
Obsoletes: kernel-kdump-optional <= 2.6.28
%endif
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
This kernel has several debug facilities enabled that hurt performance.
Only use this kernel when investigating problems.
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

58
kernel-default.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

129
kernel-default.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@ -427,20 +431,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -452,6 +461,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -581,7 +606,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -769,7 +794,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1084,8 +1113,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1203,6 +1236,66 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: The Standard Kernel - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch %ix86
Provides: kernel-trace-optional = 3.13
Obsoletes: kernel-trace-optional <= 3.13
%endif
%ifarch ppc64
Provides: kernel-kdump-optional = 2.6.28
Obsoletes: kernel-kdump-optional <= 2.6.28
%endif
%ifarch s390x
Provides: kernel-trace-optional = 3.13
Obsoletes: kernel-trace-optional <= 3.13
%endif
%ifarch x86_64
Provides: kernel-trace-optional = 3.13
Obsoletes: kernel-trace-optional <= 3.13
Provides: kernel-bigsmp-optional = 3.1
Obsoletes: kernel-bigsmp-optional <= 3.1
Provides: kernel-desktop-optional = 4.3
Obsoletes: kernel-desktop-optional <= 4.3
Provides: kernel-xen-optional = 4.4
Obsoletes: kernel-xen-optional <= 4.4
Provides: kernel-ec2-optional = 4.4
Obsoletes: kernel-ec2-optional <= 4.4
%endif
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
The standard kernel for both uniprocessor and multiprocessor systems.
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

58
kernel-docs.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

4
kernel-docs.spec
View File

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

58
kernel-kvmsmall.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

112
kernel-kvmsmall.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -382,20 +386,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -407,6 +416,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -536,7 +561,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -724,7 +749,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1039,8 +1068,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1141,6 +1174,49 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: The Small Developer Kernel for KVM - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
This kernel is intended for kernel developers to use in simple virtual
machines. It contains only the device drivers necessary to use a
KVM virtual machine *without* device passthrough enabled. Common
local and network file systems are enabled. All device mapper targets
are enabled. Only the network and graphics drivers for devices that qemu
emulates are enabled. Many subsystems enabled in the default kernel
are entirely disabled. This kernel is meant to be small and to build
very quickly. The configuration may change arbitrarily between builds.
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

58
kernel-lpae.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

106
kernel-lpae.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -376,20 +380,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -401,6 +410,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -530,7 +555,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -718,7 +743,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1033,8 +1062,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1129,6 +1162,43 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: Kernel for LPAE enabled systems - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
The kernel for all 32-bit ARM platforms that support LPAE. This includes all
Cortex A15 based SoCs, like the Exynos5, OMAP5 or Calxeda ECX-2000.
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

58
kernel-obs-build.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

4
kernel-obs-build.spec
View File

@ -45,7 +45,7 @@ BuildRequires: util-linux
%endif
%endif
%endif
BuildRequires: kernel%kernel_flavor-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
BuildRequires: kernel%kernel_flavor-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%if 0%{?rhel_version}
BuildRequires: kernel
@ -66,7 +66,7 @@ License: GPL-2.0
Group: SLES
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif

58
kernel-obs-qa.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

2
kernel-obs-qa.spec
View File

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

58
kernel-pae.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

122
kernel-pae.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@ -404,20 +408,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -429,6 +438,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -558,7 +583,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -746,7 +771,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1061,8 +1090,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1173,6 +1206,59 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: Kernel with PAE Support - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch %ix86
Provides: kernel-vmi-optional = 2.6.38
Obsoletes: kernel-vmi-optional <= 2.6.38
Provides: kernel-desktop-optional = 4.3
Obsoletes: kernel-desktop-optional <= 4.3
Provides: kernel-xen-optional = 4.4
Obsoletes: kernel-xen-optional <= 4.4
Provides: kernel-ec2-optional = 4.4
Obsoletes: kernel-ec2-optional <= 4.4
%endif
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
PAE is not only more physical address space but also important for the
"no execute" feature which disables execution of code that is marked as
non-executable. Therefore, the PAE kernel should be used on any systems
that support it, regardless of the amount of main memory.
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

58
kernel-source.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

4
kernel-source.spec
View File

@ -32,7 +32,7 @@ License: GPL-2.0
Group: Development/Sources
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -43,7 +43,7 @@ BuildRequires: fdupes
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: linux
Provides: multiversion(kernel)
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz

58
kernel-syms.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

4
kernel-syms.spec
View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 5.12.10
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%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-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel

58
kernel-vanilla.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

105
kernel-vanilla.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -375,20 +379,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -400,6 +409,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -529,7 +554,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -717,7 +742,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1032,8 +1061,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1127,6 +1160,42 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: The Standard Kernel - without any SUSE patches - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
The standard kernel - without any SUSE patches
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

58
kernel-zfcpdump.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Jun 15 11:53:57 CEST 2021 - jlee@suse.com
- ACPI: Pass the same capabilities to the _OSC regardless of
the query flag (bsc#1185513).
- commit 7354f79
-------------------------------------------------------------------
Mon Jun 14 15:13:50 CEST 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Fix handling of +arch marker (bsc#1186672)
The previous commit made a module wrongly into Module.optional.
Although it didn't influence on the end result, better to fix it.
Also, add a comment to explain the markers briefly.
- commit 8f79742
-------------------------------------------------------------------
Mon Jun 14 11:34:32 CEST 2021 - schwab@suse.de
- config: riscv64: enable STMMAC_PLATFORM
This also makes DWMAC_DWC_QOS_ETH, DWMAC_GENERIC, DWMAC_INTEL_PLAT visible
which are all enabled.
- commit 617c6b8
-------------------------------------------------------------------
Fri Jun 11 17:28:26 CEST 2021 - tiwai@suse.de
- Add arch-dependent support markers in supported.conf (bsc#1186672)
We may need to put some modules as supported only on specific archs.
This extends the supported.conf syntax to allow to put +arch additionally
after the unsupported marker, then it'll be conditionally supported on
that arch.
- commit 8cbdb41
-------------------------------------------------------------------
Fri Jun 11 16:12:33 CEST 2021 - bwiedemann@suse.de
@ -9820,6 +9854,13 @@ Thu Feb 4 07:01:34 CET 2021 - jslaby@suse.cz
(bsc#333043).
- commit 3527948
-------------------------------------------------------------------
Wed Feb 3 18:54:14 CET 2021 - tiwai@suse.de
- rpm/kernel-binary.spec.in: Correct Supplements in optional subpkg (jsc#SLE-11796)
The product string was changed from openSUSE to Leap.
- commit 3cb7943
-------------------------------------------------------------------
Sun Jan 31 23:32:11 CET 2021 - mkubecek@suse.cz
@ -17162,6 +17203,12 @@ Fri Oct 23 09:52:12 CEST 2020 - tiwai@suse.de
(bsc#1177973).
- commit 3f21462
-------------------------------------------------------------------
Mon Oct 19 16:00:58 CEST 2020 - tiwai@suse.de
- rpm/split-modules: Avoid errors even if Module.* are not present
- commit 752fbc6
-------------------------------------------------------------------
Sun Oct 18 14:37:11 CEST 2020 - mkubecek@suse.cz
@ -17460,6 +17507,17 @@ Wed Oct 14 12:39:26 CEST 2020 - jslaby@suse.cz
linux/font.h (bsc#1012628).
- commit 1dc82dd
-------------------------------------------------------------------
Tue Oct 13 16:51:16 CEST 2020 - tiwai@suse.de
- Add the support for kernel-FLAVOR-optional subpackage (jsc#SLE-11796)
This change allows to create kernel-*-optional subpackage containing
the modules that are not shipped on SLE but only on Leap. Those
modules are marked in the new "-!optional" marker in supported.conf.
Flip split_optional definition in kernel-binaries.spec.in for the
branch that needs the splitting.
- commit 1fa25f8
-------------------------------------------------------------------
Mon Oct 12 00:20:46 CEST 2020 - mkubecek@suse.cz

108
kernel-zfcpdump.spec
View File

@ -54,6 +54,10 @@
%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")
# Split Leap-only modules to kernel-*-optional subpackage?
%define split_optional 0
%if "%CONFIG_MODULES" != "y"
%define klp_symbols 0
%endif
@ -70,7 +74,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 5.12.10
%if 0%{?is_kotd}
Release: <RELEASE>.g332b26c
Release: <RELEASE>.gb077d3a
%else
Release: 0
%endif
@ -181,10 +185,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: kernel-%build_flavor-base-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
Provides: kernel-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
# END COMMON DEPS
Provides: %name-srchash-332b26c88ef69ae154c1a0b22628bd66ddb605e8
Provides: %name-srchash-b077d3a07fb7dc80669cb73be709f09f40beb973
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@ -378,20 +382,25 @@ fi
mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
# The first marker is supposed to be either "+external", "-" or "-!optional",
# where "+external" is for an externally supported module, "-" is for an
# unsuppored module, "-!optional" is for Leap-only unsupported module.
# There can be an optional arch-specific second marker with "+arch" (e.g.
# +arm64), which enforces the module to be supported on the specific arch.
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/\+external / {
print $(NF) " external";
next;
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+external") {
t = " external";
} else if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = " no";
}
/^-/ {
print $(NF) " no";
next;
}
{
print $(NF);
}
' >%kernel_build_dir/Module.supported
}
print $(NF) t;
}' >%kernel_build_dir/Module.supported
subpackages=(
base
%if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
@ -403,6 +412,22 @@ for package in "${subpackages[@]}"; do
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
%if %split_extra && %split_optional
# Module.optional is in a special form, containing guard markers for
# both extra and optional modules, which is processed by split-modules
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '{
t = "";
for (i = 1; i < NF; i++) {
if ($i == "+'%cpu_arch'") {
t = "";
} else if ($i ~ "^-") {
t = $i
}
}
if (t != "") {print t,$(NF);}
}' >%kernel_build_dir/Module.optional
%endif
cd linux-%srcversion
@ -532,7 +557,7 @@ fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' -printf '%%P\n' \
find . ! -type d ! -name 'Module.base' ! -name 'Module.*-kmp' ! -name 'Module.optional' -printf '%%P\n' \
> %my_builddir/obj-files
%build
@ -720,7 +745,11 @@ if test %CONFIG_MODULE_SIG = "y"; then
done
fi
for sub in '' '-extra'; do
for sub in '' '-extra' \
%if %split_extra && %split_optional
'-optional' \
%endif
; do
case "$sub" in
'') base_package=1 ;;
*) base_package=0 ;;
@ -1035,8 +1064,12 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%if %split_extra && %split_optional
add_dirs_to_filelist %my_builddir/optional-modules > %my_builddir/kernel-optional.files
%endif
%if 0%{?sle_version} >= 150000
# By default, loading unsupported modules is disabled on SLE through
@ -1133,6 +1166,45 @@ This package contains additional modules not supported by SUSE.
%defattr(-, root, root)
%endif
%if %split_extra && %split_optional
%package optional
Summary: The IBM System Z zfcpdump Kernel - Optional kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-optional_%_target_cpu = %version-%source_rel
Provides: kernel-optional = %version-%source_rel
Provides: multiversion(kernel)
Requires: %name-extra_%_target_cpu = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%obsolete_rebuilds %name-optional
Supplements: packageand(product(Leap):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description optional
The Linux kernel for booting the zfcpdump process on IBM System Z.
This kernel should only be used by the s390-tools package. This kernel
should not be installed as a regular booting kernel.
This package contains optional modules only for openSUSE Leap.
%source_timestamp
%preun optional -f preun-optional.sh
%postun optional -f postun-optional.sh
%pre optional -f pre-optional.sh
%post optional -f post-optional.sh
%files optional -f kernel-optional.files
%defattr(-, root, root)
%endif
%if "%CONFIG_KMSG_IDS" == "y"
%package man

2
mkspec
View File

@ -160,7 +160,7 @@ for my $flavor (sort keys(%flavor_archs)) {
}
my %obsolete_macros;
for my $subpac ("", "-base", "-extra", "-devel", "-hmac") {
for my $subpac ("", "-base", "-extra", "-devel", "-hmac", "-optional") {
(my $macro = "PROVIDES_OBSOLETES" . uc($subpac)) =~ s/-/_/;
$obsolete_macros{$macro} =
provides_obsoletes($flavor, $subpac, @{$flavor_archs{$flavor}});

4
patches.suse.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48832dd18072cba97b0dfe80648fac19676ac763ab325811dd71adc4567f90f6
size 82626
oid sha256:bc6163bb003d11ec248ec134f5a32ce459ed77e19e1405e9ab2f6a8b83bd83d7
size 83785

1
series.conf
View File

@ -2260,6 +2260,7 @@
patches.suse/acpi_thermal_passive_blacklist.patch
patches.suse/ACPI-PM-s2idle-Add-missing-LPS0-functions-for-AMD.patch
patches.suse/ACPI-idle-override-c-state-latency-when-not-in-confo.patch
patches.suse/ACPI-Pass-the-same-capabilities-to-the-_OSC-regardle.patch
########################################################
# DRM / Graphics

4
source-timestamp
View File

@ -1,3 +1,3 @@
2021-06-14 06:48:46 +0000
GIT Revision: 332b26c88ef69ae154c1a0b22628bd66ddb605e8
2021-06-15 10:38:38 +0000
GIT Revision: b077d3a07fb7dc80669cb73be709f09f40beb973
GIT Branch: stable

68
split-modules
View File

@ -110,7 +110,11 @@ add_dependent_modules()
}
# base
sed 'y/-/_/' <"$opt_builddir/Module.base" | add_dependent_modules >"$tmp/base"
if test -f "$opt_builddir/Module.base"; then
sed 'y/-/_/' <"$opt_builddir/Module.base" | add_dependent_modules >"$tmp/base"
else
touch "$tmp/base"
fi
join -j 1 -o 2.2 "$tmp/base" "$tmp/all" >"$opt_out/base-modules"
# base firmware
@ -123,6 +127,7 @@ fi | sed "s:^:/lib/firmware/$kver/:" >"$opt_out/base-firmware"
# kmps
for f in "$opt_builddir"/Module.*-kmp; do
test -f "$f" || continue
kmp=${f##*/Module.}
sed 'y/-/_/' <"$f" >"$tmp/$kmp"
join -j 1 -o 2.2 "$tmp/$kmp" "$tmp/all" >"$opt_out/$kmp-modules"
@ -146,8 +151,63 @@ fi
join -j 1 -o 2.2 "$tmp/supp-all" "$tmp/all" >"$opt_out/main-modules"
# unsupported
join -j 1 -v 2 -o 2.2 <(sort -u "$tmp/supp-all" "$tmp/kmp-all") "$tmp/all" >"$opt_out/unsupported-modules"
join -j 1 -v 2 -o 2.2 <(sort -u "$tmp/supp-all" "$tmp/kmp-all") "$tmp/all" | sort -u > "$opt_out/unsupported-modules"
# split again to extra and optional
if $opt_extra && test -f "$opt_builddir/Module.optional"; then
declare -A modmarks wcmarks
wcpaths=()
while read mark path; do
path=${path%.xz}
path=${path%.ko}
mod=${path##*/}
modmarks["$mod"]="$mark"
# paths with wildcards need to be verified sequentially, so we keep
# the paths in the array wcpaths and each mark in wcmarks[]
case "$path" in
*[\*\?\[]*)
wcpaths[${#wcpaths[@]}]="$path"
wcmarks["$path"]="$mark";;
esac
done < "$opt_builddir/Module.optional"
while read xpath; do
path=${xpath%.xz}
path=${path%.ko}
mod=${path##*/}
x=${modmarks["$mod"]}
if [ -n "$x" ]; then
test x"$x" = x"-" && echo "$xpath"
continue
fi
# unmatched modules must be handled via wildcard
path=${path#/lib/modules/*/kernel/}
for m in "${wcpaths[@]}"; do
case "$path" in
($m)
test x${wcmarks["$m"]} = x"-" && echo "$xpath"
break;;
esac
done
done < "$opt_out/unsupported-modules" | sort > "$tmp/unsupp-extra"
cat "$tmp/supp-all" "$tmp/kmp-all" "$tmp/unsupp-extra" | \
sed -r 's:[^ ]*/([^/]*)\.ko(.xz)?\>:\1:g; y/-/_/' | sort -u > "$tmp/unsupp-extra-all"
add_dependent_modules "$tmp/unsupp-explain" <"$tmp/unsupp-extra-all" >"$tmp/unsupp-extra-dep"
if ! cmp -s "$tmp/unsupp-extra-all" "$tmp/unsupp-extra-dep"; then
echo "The following optional modules are used by extra modules:" >&2
join -j1 -a2 <(sort "$tmp/unsupp-explain") \
<(join -v2 "$tmp/unsupp-extra-all" "$tmp/unsupp-extra-dep") >&2
echo "Please fix supported.conf." >&2
if ! $opt_ignore_errors; then
exit 1
fi
fi
join -j 1 -v 2 "$tmp/unsupp-extra" "$opt_out/unsupported-modules" > "$opt_out/optional-modules"
mv "$tmp/unsupp-extra" "$opt_out/unsupported-modules"
fi
exit 0