From 06faf751b9858a7821d8c91c402750f875cc4e3ad00c4eaacbb6a74a1e5b5736 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 13 Oct 2020 11:23:49 +0000 Subject: [PATCH] Accepting request 841422 from home:favogt:branches:Kernel:stable - Create the list of crypto modules dynamically, supersedes hardcoded list of crc32 implementations (boo#1177577) ~0.7MiB (~2.5%) bigger, IMO worth it. OBS-URL: https://build.opensuse.org/request/show/841422 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-default-base?expand=0&rev=37 --- kernel-default-base.changes | 6 ++++++ kernel-default-base.spec | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel-default-base.changes b/kernel-default-base.changes index e05aedf..11851be 100644 --- a/kernel-default-base.changes +++ b/kernel-default-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 13 07:19:13 UTC 2020 - Fabian Vogt + +- Create the list of crypto modules dynamically, supersedes hardcoded + list of crc32 implementations (boo#1177577) + ------------------------------------------------------------------- Mon Oct 5 11:17:52 UTC 2020 - Fabian Vogt diff --git a/kernel-default-base.spec b/kernel-default-base.spec index 76f61be..135b19b 100644 --- a/kernel-default-base.spec +++ b/kernel-default-base.spec @@ -56,11 +56,12 @@ ebt_.* ebtable_.* ebtables ip6table_.* ip6_tables ip6t_.* ip_.* ipt_.* iptable_. nf_.* nfnetlink.* nft_.* tun veth xfrm.*_tunnel xfrm_.* x_tables xt_.* tcp_diag \ vxlan -%define crc32_modules crc32c_generic crc32c-intel crc32c-vpmsum crc32-vx_s390 crc32-arm-ce +%define crypto_modules \ +%(rpm -ql %{kernel_package_name} | grep -E 'kernel/crypto/|kernel/arch/.*/crypto/' | xargs basename -a | cut -d. -f1) %define modules %usb_modules %net_drivers %scsi_modules %block_drivers \ %hyperv_modules %virtio_modules %vmware_modules %xen_modules \ - %networking %filesystems %misc_modules %crc32_modules + %networking %filesystems %misc_modules %crypto_modules # Reasonable defaults that might be overriden if needed %define kernel_package_name kernel-%build_flavor @@ -72,6 +73,9 @@ vxlan Name: %package_name BuildRequires: %kernel_package_name BuildRequires: %kernel_package_name-devel +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: grep BuildRequires: kernel-subpackage-macros Summary: %summary License: GPL-2.0-only