April 2023 - kernel - Fedora Mailing-Lists

[OS-BUILD PATCHv2] kernel.spec: Fix UKI naming to comply with BLS

by Philipp Rudo (via Email Bridge)

From: Philipp Rudo <prudo(a)redhat.com> kernel.spec: Fix UKI naming to comply with BLS The Boot Loader Specification (BLS) [1] suggests that type #2 entries (UKIs) shall have the same names like type #1 entries with the exception of the suffix being .efi instead of .conf. In particular this means that the name for installed UKIs should be <entry-token-or-machine-id>-<version>.efi. The same naming convention is used by kernel-installs 90-uki-copy.install [2] in systemd v253. Adjust the workaround to install UKIs in the kernel.spec to follow the same naming convention in order to prevent breaking user space tools that rely on it. [1] https://uapi-group.org/specifications/specs/boot_loader_specification/ [2] https://github.com/systemd/systemd/blob/v253/src/kernel-install/90-uki-co... Signed-off-by: Philipp Rudo <prudo(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -3033,10 +3033,12 @@ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+% %define kernel_uki_virt_scripts() \ %{expand:%%posttrans %{?1:%{1}-}uki-virt}\ mkdir -p /boot/efi/EFI/Linux\ -cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +entry_token=$(kernel-install inspect | grep KERNEL_INSTALL_ENTRY_TOKEN: | cut -d ' ' -f2)\ +cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/${entry_token}-%{KVERREL}%{?1:+%{1}}.efi\ %{nil}\ %{expand:%%postun %{?1:%{1}-}uki-virt}\ -rm -f /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +entry_token=$(kernel-install inspect | grep KERNEL_INSTALL_ENTRY_TOKEN: | cut -d ' ' -f2)\ +rm -f /boot/efi/EFI/Linux/${entry_token}-%{KVERREL}%{?1:+%{1}}.efi\ %{nil} # @@ -3320,7 +3322,7 @@ fi %if %{with_efiuki}\ %{expand:%%files %{?3:%{3}-}uki-virt}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi\ -%ghost /%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}-virt.efi\ +%ghost /%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:*}-%{KVERREL}%{?3:+%{3}}.efi\ %endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2391

1 year

2
2
0 / 0

[OS-BUILD PATCH 0/0] Support querying tags as well as building stable rc and next releases

by Thorsten Leemhuis (via Email Bridge)

From: Thorsten Leemhuis on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2275 NOTE: Truncated patchset since committer email 'fedora(a)leemhuis.info' does not match the submitter's GitLab public email address 'linux(a)leemhuis.info'. These are a few changes I developed for supporting my kernel vanilla builds (https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories ) that IMHO are worth integrating upstream. Signed-off-by: Thorsten Leemhuis <fedora(a)leemhuis.info> --- redhat/Makefile | 41 ++++++++++++++++++++++++++++++++++++----- redhat/kernel.spec.template | 3 +++ 2 files changed, 39 insertions(+), 5 deletions(-)

1 year

2
4
0 / 0

[OS-BUILD PATCH] Fix up the RHEL configs for xtables and ipset

by Justin M. Forbes (via Email Bridge)

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Fix up the RHEL configs for xtables and ipset At some point, we had an MR which disabled xtables and ipset. This put configs to turn them off in the ark/generic directory. Quite a bit later, it was decided to rever that change, and MR2267 was created to do that. In the meantime, the ark directory was renamed to rhel. As that MR was deleting files in ark, and they had already been deleted, this was not raised as a problem, but we did not get the desired result because those files do still exist in the rhel directory. This change simply deletes the files in the rhel/generic directory making things work as MR2267 intended. Link:https://gitlab.com/cki-project/kernel-ark/-/issues/105 Cc: Phil Sutter <psutter(a)redhat.com> Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/rhel/generic/CONFIG_BRIDGE_NETFILTER b/redhat/configs/rhel/generic/CONFIG_BRIDGE_NETFILTER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_BRIDGE_NETFILTER +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BRIDGE_NETFILTER is not set diff --git a/redhat/configs/rhel/generic/CONFIG_BRIDGE_NF_EBTABLES b/redhat/configs/rhel/generic/CONFIG_BRIDGE_NF_EBTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_BRIDGE_NF_EBTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_BRIDGE_NF_EBTABLES is not set diff --git a/redhat/configs/rhel/generic/CONFIG_IP6_NF_IPTABLES b/redhat/configs/rhel/generic/CONFIG_IP6_NF_IPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_IP6_NF_IPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP6_NF_IPTABLES is not set diff --git a/redhat/configs/rhel/generic/CONFIG_IP_NF_ARPTABLES b/redhat/configs/rhel/generic/CONFIG_IP_NF_ARPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_IP_NF_ARPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_NF_ARPTABLES is not set diff --git a/redhat/configs/rhel/generic/CONFIG_IP_NF_IPTABLES b/redhat/configs/rhel/generic/CONFIG_IP_NF_IPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_IP_NF_IPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_NF_IPTABLES is not set diff --git a/redhat/configs/rhel/generic/CONFIG_IP_SET b/redhat/configs/rhel/generic/CONFIG_IP_SET deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_IP_SET +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_SET is not set diff --git a/redhat/configs/rhel/generic/CONFIG_NETFILTER_XTABLES b/redhat/configs/rhel/generic/CONFIG_NETFILTER_XTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_NETFILTER_XTABLES +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NETFILTER_XTABLES is not set diff --git a/redhat/configs/rhel/generic/CONFIG_NFT_COMPAT b/redhat/configs/rhel/generic/CONFIG_NFT_COMPAT deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_NFT_COMPAT +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_NFT_COMPAT is not set diff --git a/redhat/configs/rhel/generic/CONFIG_NF_CONNTRACK_LABELS b/redhat/configs/rhel/generic/CONFIG_NF_CONNTRACK_LABELS deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_NF_CONNTRACK_LABELS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NF_CONNTRACK_LABELS=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2402

1 year

1
0
0 / 0

[OS-BUILD PATCH] redhat/configs: Enable CONFIG_INIT_STACK_ALL_ZERO for RHEL

by Josh Poimboeuf (via Email Bridge)

From: Josh Poimboeuf <jpoimboe(a)redhat.com> redhat/configs: Enable CONFIG_INIT_STACK_ALL_ZERO for RHEL CONFIG_INIT_STACK_ALL_ZERO is a hardening feature which is "intended to eliminate all classes of uninitialized stack variable exploits and information exposures." Recent internal benchmark testing has shown negligible performance impact. It's already enabled for Fedora. Enable it for RHEL. Signed-off-by: Josh Poimboeuf <jpoimboe(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_INIT_STACK_ALL_ZERO b/redhat/configs/common/generic/CONFIG_INIT_STACK_ALL_ZERO rename from redhat/configs/fedora/generic/CONFIG_INIT_STACK_ALL_ZERO rename to redhat/configs/common/generic/CONFIG_INIT_STACK_ALL_ZERO index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_INIT_STACK_ALL_ZERO +++ b/redhat/configs/common/generic/CONFIG_INIT_STACK_ALL_ZERO diff --git a/redhat/configs/fedora/generic/CONFIG_INIT_STACK_NONE b/redhat/configs/common/generic/CONFIG_INIT_STACK_NONE rename from redhat/configs/fedora/generic/CONFIG_INIT_STACK_NONE rename to redhat/configs/common/generic/CONFIG_INIT_STACK_NONE index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_INIT_STACK_NONE +++ b/redhat/configs/common/generic/CONFIG_INIT_STACK_NONE diff --git a/redhat/configs/rhel/generic/CONFIG_INIT_STACK_ALL_ZERO b/redhat/configs/rhel/generic/CONFIG_INIT_STACK_ALL_ZERO deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_INIT_STACK_ALL_ZERO +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_INIT_STACK_ALL_ZERO is not set diff --git a/redhat/configs/rhel/generic/CONFIG_INIT_STACK_NONE b/redhat/configs/rhel/generic/CONFIG_INIT_STACK_NONE deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_INIT_STACK_NONE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_INIT_STACK_NONE=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2400

1 year

1
0
0 / 0

[OS-BUILD PATCH] RHMAINTAINERS: Update for Apr 14 2023

by Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava <prarit(a)redhat.com> RHMAINTAINERS: Update for Apr 14 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -81,7 +81,7 @@ F: redhat/ X: redhat/configs/ CentOS Stream 9 Kernel Maintainer -M: Herton R. Krzesinski <herton(a)redhat.com> +M: Jan Stancek <jstancek(a)redhat.com> S: Supported F: Makefile.rhelver T: git https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git @@ -91,6 +91,16 @@ M: Luis Claudio Goncalves <lgoncalv(a)redhat.com> S: Supported F: Makefile.rhelver +RHEL 9.2 Kernel Maintainer +M: Herton R. Krzesinski <herton(a)redhat.com> +S: Supported +F: Makefile.rhelver + +RHEL 9.2 Real Time Kernel Maintainer +M: Luis Claudio Goncalves <lgoncalv(a)redhat.com> +S: Supported +F: Makefile.rhelver + RHEL 9.1 Kernel Maintainer M: Patrick Talbert <ptalbert(a)redhat.com> S: Supported @@ -1180,7 +1190,6 @@ F: mm/hwpoison-inject.c Hyper-V CORE AND DRIVERS M: Cathy Avery <cavery(a)redhat.com> -M: Mohammed Gamal <mgamal(a)redhat.com> M: Vitaly Kuznetsov <vkuznets(a)redhat.com> S: Supported F: Documentation/networking/device_drivers/microsoft/netvsc.txt @@ -2108,7 +2117,6 @@ F: fs/nfsd/ NITRO ENCLAVES (NE) M: Cathy Avery <cavery(a)redhat.com> -M: Mohammed Gamal <mgamal(a)redhat.com> M: Vitaly Kuznetsov <vkuznets(a)redhat.com> S: Supported F: Documentation/virt/ne_overview.rst @@ -2985,7 +2993,6 @@ F: include/uapi/linux/virtio_input.h VIRTUALIZATION SUPPORT DRIVERS M: Vitaly Kuznetsov <vkuznets(a)redhat.com> M: Cathy Avery <cavery(a)redhat.com> -M: Mohammed Gamal <mgamal(a)redhat.com> S: Supported F: drivers/virt/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2399

1 year

1
0
0 / 0

❌ FAIL: Test report for 6.2.11-200.fc37 (kernel-fedora)

by cki-project＠redhat.com

Hi, we tested your kernel and here are the results: Overall result: FAILED Merge: OK Compile: OK Test: FAILED Kernel information: Brew / Koji Task ID: 99900740 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/84657 One or more kernel tests failed: Unrecognized or new issues: s390x - Storage - block zstd smoke test Logs: https://datawarehouse.cki-project.org/kcidb/tests/7815596 We also see the following known issues which are not related to your changes: Issue: Storage blktests - blk: scsi/007: Reading from scsi_debug failed URL: https://bugzilla.redhat.com/show_bug.cgi?id=2027550 Affected tests: aarch64 - Storage - blktests - blk Issue: avc: denied { name_bind } for pid=897864 comm="rpcbind" src=63924 scontext=system_u:system_r:rpcbind_t:s0 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=udp_socket permissive=1 URL: https://bugzilla.redhat.com/show_bug.cgi?id=1983604#c3 Affected tests: x86_64 - xfstests - nfsv4.2 Issue: (kernel-fedora) Storage - blktests - nvmeof-mp: FAIL: Configured NVMe target driver URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issue... Affected tests: ppc64le - Storage - blktests - nvmeof-mp Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://bugzilla.redhat.com/1758147 Affected tests: s390x - NFS Connectathon If you find a failure unrelated to your changes, please ask the test maintainer to review it. This will prevent the failures from being incorrectly reported in the future. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________

1 year

1
0
0 / 0

[OS-BUILD PATCH] redhat/configs: Enable CONFIG_X86_KERNEL_IBT for Fedora and ARK

by Josh Poimboeuf (via Email Bridge)

From: Josh Poimboeuf <jpoimboe(a)redhat.com> redhat/configs: Enable CONFIG_X86_KERNEL_IBT for Fedora and ARK Kernel IBT is a nice kernel hardening feature with virtually no performance impact. Since commit 4fd5f70ce14d ("x86/Kconfig: Enable kernel IBT by default"), its now enabled by default upstream. Enable it in Fedora and ARK as well. Signed-off-by: Josh Poimboeuf <jpoimboe(a)redhat.com> diff --git a/redhat/configs/common/generic/x86/CONFIG_X86_KERNEL_IBT b/redhat/configs/common/generic/x86/CONFIG_X86_KERNEL_IBT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/CONFIG_X86_KERNEL_IBT +++ b/redhat/configs/common/generic/x86/CONFIG_X86_KERNEL_IBT @@ -1 +1 @@ -# CONFIG_X86_KERNEL_IBT is not set +CONFIG_X86_KERNEL_IBT=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2346

1 year

4
10
0 / 0

[OS-BUILD PATCH] kernel.spec: gcov: make gcov subpackages per variant

by Jan Stancek (via Email Bridge)

From: Jan Stancek <jstancek(a)redhat.com> kernel.spec: gcov: make gcov subpackages per variant There is currently only one gcov subpackage, but builds can contain multiple kernel variants, which creates confusion which one is "gcov enabled". Modify spec file so that gcov subpackage is created for each kernel variant. During build, gcc creates gcno files (gcov notes), which we package into -gcov subpackage. kernel exposes gcda (count data) via sysfs. To make it easy to pair gcno and gcda, kernel also creates symlinks in sysfs for gcno files. These symlinks use absolute paths based on builddir. This creates a problem when we build multiple variants in same directory, because gcno from all variants are mixed together (or overwritten). Make build directory name unique so that we can package and install gcov for more than one variant. Signed-off-by: Jan Stancek <jstancek(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1164,12 +1164,12 @@ Kernel sample programs and selftests. # with_selftests %endif -%if %{with_gcov} -%package gcov -Summary: gcov graph and source files for coverage data collection. -%description gcov -kernel-gcov includes the gcov graph and source files for gcov coverage collection. -%endif +%define kernel_gcov_package() \ +%package %{?1:%{1}-}gcov\ +Summary: gcov graph and source files for coverage data collection.\ +%description %{?1:%{1}-}gcov\ +%{?1:%{1}-}gcov includes the gcov graph and source files for gcov coverage collection.\ +%{nil} %package -n %{package_name}-abi-stablelists Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists @@ -1409,6 +1409,9 @@ Provides: installonlypkg(kernel)\ Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ %endif\ +%if %{with_gcov}\ +%{expand:%%kernel_gcov_package %{?1:%{1}}}\ +%endif\ %{nil} # @@ -1775,6 +1778,17 @@ BuildKernel() { CopyKernel=cp fi +%if %{with_gcov} + # Make build directory unique for each variant, so that gcno symlinks + # are also unique for each variant. + if [ -n "$Variant" ]; then + ln -s $(pwd) ../linux-%{KVERREL}-${Variant} + fi + echo "GCOV - continuing build in: $(pwd)" + pushd ../linux-%{KVERREL}${Variant:+-${Variant}} + pwd > ../kernel${Variant:+-${Variant}}-gcov.list +%endif + InitBuildVars $Variant echo BUILDING A KERNEL FOR ${Variant} %{_target_cpu}... @@ -2403,6 +2417,9 @@ BuildKernel() { fi %endif +%if %{with_gcov} + popd +%endif } ### @@ -3268,13 +3285,6 @@ fi %files %endif -%if %{with_gcov} -%ifnarch %nobuildarches noarch -%files gcov -%{_builddir} -%endif -%endif - # This is %%{image_install_path} on an arch where that includes ELF files, # or empty otherwise. %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}} @@ -3349,6 +3359,11 @@ fi %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ %endif\ +%if %{with_gcov}\ +%ifnarch %nobuildarches noarch\ +%{expand:%%files -f kernel-%{?3:%{3}-}gcov.list %{?3:%{3}-}gcov}\ +%endif\ +%endif\ %endif\ %{nil} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2398

1 year

2
2
0 / 0

[OS-BUILD PATCHv2] Revert "redhat: configs: Disable xtables and ipset"

by Phil Sutter (via Email Bridge)

From: Phil Sutter <psutter(a)redhat.com> Revert "redhat: configs: Disable xtables and ipset" This reverts commit ebafea5303ae22b582590917be79c10f073d76fe. It seems kernel-ark config is used for libvirt testing with upstream kernels. Libvirt still requires iptables, though. So revert this for now. Contrary to reverted commit ebafea5303ae2, it is not sufficient to remove the disabling config snippets as the respective enabling ones have been moved from 'common' space to 'fedora'. Move them back. Add the restored modules to kernel-modules-extra package instead of kernel-modules-core. Signed-off-by: Phil Sutter <psutter(a)redhat.com> diff --git a/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER b/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BRIDGE_NETFILTER is not set diff --git a/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES b/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_BRIDGE_NF_EBTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES b/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP6_NF_IPTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES b/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_NF_ARPTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES b/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_NF_IPTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP_SET b/redhat/configs/ark/generic/CONFIG_IP_SET deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP_SET +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_SET is not set diff --git a/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES b/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NETFILTER_XTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_NFT_COMPAT b/redhat/configs/ark/generic/CONFIG_NFT_COMPAT deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_NFT_COMPAT +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_NFT_COMPAT is not set diff --git a/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS b/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NF_CONNTRACK_LABELS=y diff --git a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER b/redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER rename from redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER rename to redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER +++ b/redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER diff --git a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES b/redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES rename from redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES rename to redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES +++ b/redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES b/redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES rename from redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES rename to redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES +++ b/redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES b/redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES rename from redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES rename to redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES +++ b/redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES b/redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES rename from redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES rename to redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES +++ b/redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP_SET b/redhat/configs/common/generic/CONFIG_IP_SET rename from redhat/configs/fedora/generic/CONFIG_IP_SET rename to redhat/configs/common/generic/CONFIG_IP_SET index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP_SET +++ b/redhat/configs/common/generic/CONFIG_IP_SET diff --git a/redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES b/redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES rename from redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES rename to redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES +++ b/redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_NFT_COMPAT b/redhat/configs/common/generic/CONFIG_NFT_COMPAT rename from redhat/configs/fedora/generic/CONFIG_NFT_COMPAT rename to redhat/configs/common/generic/CONFIG_NFT_COMPAT index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NFT_COMPAT +++ b/redhat/configs/common/generic/CONFIG_NFT_COMPAT diff --git a/redhat/rhel_files/mod-extra.list.rhel b/redhat/rhel_files/mod-extra.list.rhel index blahblah..blahblah 100644 --- a/redhat/rhel_files/mod-extra.list.rhel +++ b/redhat/rhel_files/mod-extra.list.rhel @@ -9,6 +9,9 @@ affs.ko ali-ircc.ko analog.ko appletalk.ko +arptable_filter.ko +arp_tables.ko +arpt_mangle.ko atm.ko avma1_cs.ko avm_cs.ko @@ -23,6 +26,7 @@ baycom_ser_hdx.ko befs.ko bpqether.ko br2684.ko +br_netfilter.ko capi.ko c_can.ko c_can_platform.ko @@ -42,6 +46,27 @@ ds1wm.ko ds2482.ko ds2490.ko dss1_divert.ko +ebt_802_3.ko +ebtable_broute.ko +ebtable_filter.ko +ebtable_nat.ko +ebtables.ko +ebt_among.ko +ebt_arp.ko +ebt_arpreply.ko +ebt_dnat.ko +ebt_ip6.ko +ebt_ip.ko +ebt_limit.ko +ebt_log.ko +ebt_mark.ko +ebt_mark_m.ko +ebt_nflog.ko +ebt_pkttype.ko +ebt_redirect.ko +ebt_snat.ko +ebt_stp.ko +ebt_vlan.ko elsa_cs.ko ems_pci.ko ems_usb.ko @@ -67,7 +92,50 @@ i2400m-usb.ko ieee802154.ko iforce.ko interact.ko +ip6table_filter.ko +ip6table_mangle.ko +ip6table_nat.ko +ip6table_raw.ko +ip6table_security.ko +ip6_tables.ko +ip6t_ah.ko +ip6t_eui64.ko +ip6t_frag.ko +ip6t_hbh.ko +ip6t_ipv6header.ko +ip6t_mh.ko +ip6t_NPT.ko +ip6t_REJECT.ko +ip6t_rpfilter.ko +ip6t_rt.ko ipddp.ko +ip_set_bitmap_ip.ko +ip_set_bitmap_ipmac.ko +ip_set_bitmap_port.ko +ip_set_hash_ip.ko +ip_set_hash_ipmac.ko +ip_set_hash_ipmark.ko +ip_set_hash_ipportip.ko +ip_set_hash_ipport.ko +ip_set_hash_ipportnet.ko +ip_set_hash_mac.ko +ip_set_hash_netiface.ko +ip_set_hash_net.ko +ip_set_hash_netnet.ko +ip_set_hash_netport.ko +ip_set_hash_netportnet.ko +ip_set.ko +ip_set_list_set.ko +iptable_filter.ko +iptable_mangle.ko +iptable_nat.ko +iptable_raw.ko +iptable_security.ko +ip_tables.ko +ipt_ah.ko +ipt_ECN.ko +ipt_REJECT.ko +ipt_rpfilter.ko ipx.ko isdn.ko joydump.ko @@ -97,6 +165,7 @@ ncpfs.ko netjet.ko netrom.ko nfc.ko +nft_compat.ko nilfs2.ko ocfs2_dlmfs.ko ocfs2_dlm.ko @@ -189,5 +258,70 @@ warrior.ko whci.ko wire.ko wwan_hwsim.ko +xt_addrtype.ko +xt_AUDIT.ko +xt_bpf.ko +xt_cgroup.ko +xt_CHECKSUM.ko +xt_CLASSIFY.ko +xt_cluster.ko +xt_comment.ko +xt_connbytes.ko +xt_connlabel.ko +xt_connlimit.ko +xt_connmark.ko +xt_CONNSECMARK.ko +xt_conntrack.ko +xt_cpu.ko +xt_CT.ko +xt_dccp.ko +xt_devgroup.ko +xt_dscp.ko +xt_DSCP.ko +xt_ecn.ko +xt_esp.ko +xt_hashlimit.ko +xt_helper.ko +xt_hl.ko +xt_HL.ko +xt_HMARK.ko +xt_IDLETIMER.ko +xt_iprange.ko +xt_ipvs.ko +xt_length.ko +xt_limit.ko +xt_LOG.ko +xt_mac.ko +xt_mark.ko +xt_MASQUERADE.ko +xt_multiport.ko +xt_nat.ko +xt_NETMAP.ko +xt_NFLOG.ko +xt_NFQUEUE.ko +xt_osf.ko +xt_owner.ko +xt_physdev.ko +xt_pkttype.ko +xt_policy.ko +xt_quota.ko +xt_rateest.ko +xt_RATEEST.ko +xt_realm.ko +xt_recent.ko +xt_REDIRECT.ko +xt_sctp.ko +xt_SECMARK.ko +xt_set.ko +xt_socket.ko +xt_state.ko +xt_statistic.ko +xt_string.ko +xt_tcpmss.ko +xt_TCPMSS.ko +xt_TCPOPTSTRIP.ko +xt_TEE.ko +xt_TPROXY.ko +xt_TRACE.ko yam.ko zhenhua.ko -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2267

1 year

2
1
0 / 0

[OS-BUILD PATCH] kernel.spec: Fix UKI naming to comply with BLS

by Philipp Rudo (via Email Bridge)

From: Philipp Rudo <prudo(a)redhat.com> kernel.spec: Fix UKI naming to comply with BLS The Boot Loader Specification (BLS) [1] suggests that type #2 entries (UKIs) shall have the same names like type #1 entries with the exception of the suffix being .efi instead of .conf. In particular this means that the name for installed UKIs should be <entry-token-or-machine-id>-<version>.efi. The same naming convention is used by kernel-installs 90-uki-copy.install [2] in systemd v253. Adjust the workaround to install UKIs in the kernel.spec to follow the same naming convention in order to prevent breaking user space tools that rely on it. [1] https://uapi-group.org/specifications/specs/boot_loader_specification/ [2] https://github.com/systemd/systemd/blob/v253/src/kernel-install/90-uki-co... Signed-off-by: Philipp Rudo <prudo(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -3033,10 +3033,12 @@ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+% %define kernel_uki_virt_scripts() \ %{expand:%%posttrans %{?1:%{1}-}uki-virt}\ mkdir -p /boot/efi/EFI/Linux\ -cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +entry_token=$(kernel-install inspect | grep KERNEL_INSTALL_ENTRY_TOKEN: | cut -d ' ' -f2)\ +cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/${entry_token}-%{KVERREL}%{?1:+%{1}}.efi\ %{nil}\ %{expand:%%postun %{?1:%{1}-}uki-virt}\ -rm -f /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +entry_token=$(kernel-install inspect | grep KERNEL_INSTALL_ENTRY_TOKEN: | cut -d ' ' -f2)\ +rm -f /boot/efi/EFI/Linux/${entry_token}-%{KVERREL}%{?1:+%{1}}.efi\ %{nil} # -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2391

1 year

3
6
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel April 2023