From 1fc6192a402c601495af0dc3528d85756e388b24 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 14 Nov 2025 23:39:08 +0100 Subject: [PATCH 1/2] Revert "Extend kmod_sign macros according to kernel-srpm-macros (#210)" This reverts commit 032bc1bd7fc11f45868942530fef716fbe8ac67b. --- build_node/builders/base_rpm_builder.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build_node/builders/base_rpm_builder.py b/build_node/builders/base_rpm_builder.py index 462fef8..1db0cc3 100644 --- a/build_node/builders/base_rpm_builder.py +++ b/build_node/builders/base_rpm_builder.py @@ -62,16 +62,11 @@ %__brp_kmod_sign %{expand:[ ! -d "$RPM_BUILD_ROOT/lib/modules/" ] || find "$RPM_BUILD_ROOT/lib/modules/" -type f -name '*.ko' -print -exec /usr/local/bin/modsign %{modsign_os} {} \\\;} %__brp_kmod_post_sign_process %{expand:[ ! -d "$RPM_BUILD_ROOT/lib/modules/" ] || find "$RPM_BUILD_ROOT/lib/modules/" -type f -name '*.ko.*' -print -exec rm -f {} \\\;} %__spec_install_post \\ - %{?__brp_kmod_set_exec_bit} \\ %{?__debug_package:%{__debug_install_post}} \\ %{__arch_install_post} \\ %{__os_install_post} \\ - %{?__brp_kmod_pre_sign_process} \\ %{__brp_kmod_sign} \\ %{__brp_kmod_post_sign_process} \\ - %{?__brp_kmod_compress} \\ - %{?__brp_kmod_post_compress_process} \\ - %{?__brp_kmod_restore_perms} \\ %{nil} """ MODSIGN_MACROS_PATH = 'etc/rpm/macros.modsign' From 02ad2ac20c7d37eb1fd8c2538da65edd4d044dff Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 14 Nov 2025 23:40:57 +0100 Subject: [PATCH 2/2] Remove %__kmod_brps_added from macros.modsign to not break %kernel_module_package macro --- build_node/builders/base_rpm_builder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/build_node/builders/base_rpm_builder.py b/build_node/builders/base_rpm_builder.py index 1db0cc3..29e3c7d 100644 --- a/build_node/builders/base_rpm_builder.py +++ b/build_node/builders/base_rpm_builder.py @@ -58,7 +58,6 @@ # 'r' modifier and the number of slashes is intentional, modify very carefully # or don't touch this at all MODSIGN_CONTENT = r""" -%__kmod_brps_added 1 %__brp_kmod_sign %{expand:[ ! -d "$RPM_BUILD_ROOT/lib/modules/" ] || find "$RPM_BUILD_ROOT/lib/modules/" -type f -name '*.ko' -print -exec /usr/local/bin/modsign %{modsign_os} {} \\\;} %__brp_kmod_post_sign_process %{expand:[ ! -d "$RPM_BUILD_ROOT/lib/modules/" ] || find "$RPM_BUILD_ROOT/lib/modules/" -type f -name '*.ko.*' -print -exec rm -f {} \\\;} %__spec_install_post \\