Skip to content

Commit 4287f5e

Browse files
chalamalasettychalamalasetty
authored
Update MOFED signed SPECS to avoid stripping signatures off OOT kernel modules by os_install_post macro (#12192)
1 parent 6c2da43 commit 4287f5e

File tree

9 files changed

+179
-75
lines changed

9 files changed

+179
-75
lines changed

‎SPECS-SIGNED/fwctl-signed/fwctl-signed.spec

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
# SOFTWARE.
3131
#
3232

33+
%global debug_package %{nil}
34+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
35+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
36+
3337
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
3438
%global target_azurelinux_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
3539
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
@@ -72,15 +76,24 @@ fwctl signed kernel modules
7276
%prep
7377

7478
%build
79+
mkdir rpm_contents
80+
pushd rpm_contents
81+
82+
# This spec's whole purpose is to inject the signed modules
83+
rpm2cpio %{SOURCE0} | cpio -idmv
84+
85+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/updates/fwctl/fwctl.ko
86+
cp -rf %{SOURCE2} ./lib/modules/%{KVERSION}/updates/fwctl/mlx5/mlx5_fwctl.ko
87+
88+
popd
7589

7690
%install
77-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
91+
pushd rpm_contents
7892

79-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/fwctl/fwctl.ko
80-
cp -r %{SOURCE2} %{buildroot}/lib/modules/%{KVERSION}/updates/fwctl/mlx5/mlx5_fwctl.ko
93+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
94+
cp -rp ./. %{buildroot}/
8195

82-
%clean
83-
rm -rf %{buildroot}
96+
popd
8497

8598
%post
8699
if [ $1 -ge 1 ]; then # 1 : This package is being installed or reinstalled

‎SPECS-SIGNED/iser-signed/iser-signed.spec

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
#
2727
#
2828

29+
%global debug_package %{nil}
30+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
31+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
32+
2933
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
3034
%global target_azurelinux_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
3135
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
@@ -67,15 +71,21 @@ iser signed kernel modules
6771
%prep
6872

6973
%build
74+
mkdir rpm_contents
75+
pushd rpm_contents
7076

77+
rpm2cpio %{SOURCE0} | cpio -idmv
78+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/updates/iser/ib_iser.ko
79+
popd
7180

7281
%install
73-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
82+
pushd rpm_contents
83+
84+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
85+
cp -rp ./. %{buildroot}/
7486

75-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/iser/ib_iser.ko
87+
popd
7688

77-
%clean
78-
rm -rf %{buildroot}
7989

8090
%post
8191
if [ $1 -ge 1 ]; then # 1 : This package is being installed or reinstalled

‎SPECS-SIGNED/isert-signed/isert-signed.spec

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
#
2727
#
2828

29+
%global debug_package %{nil}
30+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
31+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
32+
2933
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
3034
%global target_azurelinux_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
3135
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
@@ -67,14 +71,20 @@ isert signed kernel modules
6771
%prep
6872

6973
%build
74+
mkdir rpm_contents
75+
pushd rpm_contents
76+
77+
rpm2cpio %{SOURCE0} | cpio -idmv
78+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/updates/isert/ib_isert.ko
79+
popd
7080

7181
%install
72-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
82+
pushd rpm_contents
7383

74-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/isert/ib_isert.ko
84+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
85+
cp -rp ./. %{buildroot}/
7586

76-
%clean
77-
rm -rf %{buildroot}
87+
popd
7888

7989
%post
8090
if [ $1 -ge 1 ]; then # 1 : This package is being installed or reinstalled

‎SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
2424
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525

26+
%global debug_package %{nil}
27+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
28+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
29+
2630
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
2731
%global target_azurelinux_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
2832
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
@@ -66,19 +70,25 @@ Requires: kmod
6670
KNEM is a Linux kernel module enabling high-performance intra-node MPI communication for large messages. KNEM offers support for asynchronous and vectorial data transfers as well as offloading memory copies on to Intel I/OAT hardware.
6771
See http://knem.gitlabpages.inria.fr for details.
6872

69-
%global debug_package %{nil}
70-
7173
%prep
7274

7375
%build
76+
mkdir rpm_contents
77+
pushd rpm_contents
78+
79+
# This spec's whole purpose is to inject the signed modules
80+
rpm2cpio %{SOURCE0} | cpio -idmv
81+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/extra/knem/knem.ko
82+
popd
7483

7584
%install
76-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
85+
pushd rpm_contents
86+
87+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
88+
cp -rp ./. %{buildroot}/
7789

78-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/extra/knem/knem.ko
90+
popd
7991

80-
%clean
81-
rm -rf %{buildroot}
8292

8393
%post
8494
depmod %{KVERSION} -a

‎SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
%global debug_package %{nil}
3+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
4+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
5+
26
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
37
%global target_azurelinux_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
48
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
@@ -37,21 +41,26 @@ Provides: kernel-mft = %{version}-%{release}
3741
%description
3842
mft kernel module(s)
3943

40-
%global debug_package %{nil}
41-
4244
%prep
4345

4446
%build
47+
mkdir rpm_contents
48+
pushd rpm_contents
49+
50+
# This spec's whole purpose is to inject the signed modules
51+
rpm2cpio %{SOURCE0} | cpio -idmv
52+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/updates/mst_pci.ko
53+
cp -rf %{SOURCE2} ./lib/modules/%{KVERSION}/updates/mst_pciconf.ko
4554

55+
popd
4656

4757
%install
48-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
58+
pushd rpm_contents
4959

50-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/mst_pci.ko
51-
cp -r %{SOURCE2} %{buildroot}/lib/modules/%{KVERSION}/updates/mst_pciconf.ko
60+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
61+
cp -rp ./. %{buildroot}/
5262

53-
%clean
54-
rm -rf %{buildroot}
63+
popd
5564

5665
%post
5766
/sbin/depmod %{KVERSION}

‎SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
#
2727
#
2828

29+
%global debug_package %{nil}
30+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
31+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
32+
2933
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
3034
%global target_azurelinux_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
3135
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
@@ -71,17 +75,25 @@ mellanox rdma signed kernel modules
7175
%prep
7276

7377
%build
78+
mkdir rpm_contents
79+
pushd rpm_contents
80+
81+
# This spec's whole purpose is to inject the signed modules
82+
rpm2cpio %{SOURCE0} | cpio -idmv
83+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/updates/mlnx-nfsrdma/rpcrdma.ko
84+
cp -rf %{SOURCE2} ./lib/modules/%{KVERSION}/updates/mlnx-nfsrdma/svcrdma.ko
85+
cp -rf %{SOURCE3} ./lib/modules/%{KVERSION}/updates/mlnx-nfsrdma/xprtrdma.ko
7486

87+
popd
7588

7689
%install
77-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
90+
pushd rpm_contents
91+
92+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
93+
cp -rp ./. %{buildroot}/
7894

79-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/mlnx-nfsrdma/rpcrdma.ko
80-
cp -r %{SOURCE2} %{buildroot}/lib/modules/%{KVERSION}/updates/mlnx-nfsrdma/svcrdma.ko
81-
cp -r %{SOURCE3} %{buildroot}/lib/modules/%{KVERSION}/updates/mlnx-nfsrdma/xprtrdma.ko
95+
popd
8296

83-
%clean
84-
rm -rf %{buildroot}
8597

8698
%post
8799
if [ $1 -ge 1 ]; then # This package is being installed or reinstalled

‎SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
#
2727
#
2828

29+
%global debug_package %{nil}
30+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
31+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
32+
2933
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
3034
%global target_azurelinux_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
3135
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
@@ -121,42 +125,52 @@ The driver sources are located at: http://www.mellanox.com/downloads/
121125
%prep
122126

123127
%build
128+
mkdir rpm_contents
129+
pushd rpm_contents
130+
131+
# This spec's whole purpose is to inject the signed modules
132+
rpm2cpio %{SOURCE0} | cpio -idmv
133+
134+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/updates/compat/mlx_compat.ko
135+
cp -rf %{SOURCE2} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_cm.ko
136+
cp -rf %{SOURCE3} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_core.ko
137+
cp -rf %{SOURCE4} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_ucm.ko
138+
cp -rf %{SOURCE5} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_umad.ko
139+
cp -rf %{SOURCE6} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_uverbs.ko
140+
cp -rf %{SOURCE7} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/iw_cm.ko
141+
cp -rf %{SOURCE8} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/rdma_cm.ko
142+
cp -rf %{SOURCE9} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/core/rdma_ucm.ko
143+
cp -rf %{SOURCE10} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/bnxt_re/bnxt_re.ko
144+
cp -rf %{SOURCE11} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/efa/efa.ko
145+
cp -rf %{SOURCE12} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/mlx4/mlx4_ib.ko
146+
cp -rf %{SOURCE13} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/mlx5/mlx5_ib.ko
147+
cp -rf %{SOURCE14} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/sw/rxe/rdma_rxe.ko
148+
cp -rf %{SOURCE15} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/ipoib/ib_ipoib.ko
149+
cp -rf %{SOURCE16} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/iser/ib_iser.ko
150+
cp -rf %{SOURCE17} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/isert/ib_isert.ko
151+
cp -rf %{SOURCE18} ./lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/srp/ib_srp.ko
152+
cp -rf %{SOURCE19} ./lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
153+
cp -rf %{SOURCE20} ./lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxfw/mlxfw.ko
154+
cp -rf %{SOURCE21} ./lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
155+
cp -rf %{SOURCE22} ./lib/modules/%{KVERSION}/updates/drivers/nvme/host/nvme-rdma.ko
156+
cp -rf %{SOURCE23} ./lib/modules/%{KVERSION}/updates/drivers/nvme/target/nvmet-rdma.ko
157+
cp -rf %{SOURCE24} ./lib/modules/%{KVERSION}/updates/net/mlxdevm/mlxdevm.ko
158+
cp -rf %{SOURCE25} ./lib/modules/%{KVERSION}/updates/net/smc/smc.ko
159+
cp -rf %{SOURCE26} ./lib/modules/%{KVERSION}/updates/net/smc/smc_diag.ko
160+
cp -rf %{SOURCE27} ./lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/rpcrdma.ko
161+
cp -rf %{SOURCE28} ./lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/svcrdma.ko
162+
cp -rf %{SOURCE29} ./lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/xprtrdma.ko
163+
164+
popd
124165

125166
%install
126-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
127-
128-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/compat/mlx_compat.ko
129-
cp -r %{SOURCE2} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_cm.ko
130-
cp -r %{SOURCE3} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_core.ko
131-
cp -r %{SOURCE4} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_ucm.ko
132-
cp -r %{SOURCE5} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_umad.ko
133-
cp -r %{SOURCE6} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/ib_uverbs.ko
134-
cp -r %{SOURCE7} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/iw_cm.ko
135-
cp -r %{SOURCE8} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/rdma_cm.ko
136-
cp -r %{SOURCE9} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/core/rdma_ucm.ko
137-
cp -r %{SOURCE10} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/bnxt_re/bnxt_re.ko
138-
cp -r %{SOURCE11} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/efa/efa.ko
139-
cp -r %{SOURCE12} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/mlx4/mlx4_ib.ko
140-
cp -r %{SOURCE13} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/hw/mlx5/mlx5_ib.ko
141-
cp -r %{SOURCE14} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/sw/rxe/rdma_rxe.ko
142-
cp -r %{SOURCE15} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/ipoib/ib_ipoib.ko
143-
cp -r %{SOURCE16} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/iser/ib_iser.ko
144-
cp -r %{SOURCE17} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/isert/ib_isert.ko
145-
cp -r %{SOURCE18} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/srp/ib_srp.ko
146-
cp -r %{SOURCE19} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
147-
cp -r %{SOURCE20} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxfw/mlxfw.ko
148-
cp -r %{SOURCE21} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
149-
cp -r %{SOURCE22} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/host/nvme-rdma.ko
150-
cp -r %{SOURCE23} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/target/nvmet-rdma.ko
151-
cp -r %{SOURCE24} %{buildroot}/lib/modules/%{KVERSION}/updates/net/mlxdevm/mlxdevm.ko
152-
cp -r %{SOURCE25} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc.ko
153-
cp -r %{SOURCE26} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc_diag.ko
154-
cp -r %{SOURCE27} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/rpcrdma.ko
155-
cp -r %{SOURCE28} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/svcrdma.ko
156-
cp -r %{SOURCE29} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/xprtrdma.ko
157-
158-
%clean
159-
rm -rf %{buildroot}
167+
pushd rpm_contents
168+
169+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
170+
cp -rp ./. %{buildroot}/
171+
172+
popd
173+
160174

161175
%post
162176
/sbin/depmod %{KVERSION}

‎SPECS-SIGNED/srp-signed/srp-signed.spec

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
#
2727
#
2828

29+
%global debug_package %{nil}
30+
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
31+
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
32+
2933
%if 0%{azl}
3034
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
3135
%else
@@ -68,15 +72,24 @@ srp kernel modules
6872
%prep
6973

7074
%build
75+
mkdir rpm_contents
76+
pushd rpm_contents
77+
78+
# This spec's whole purpose is to inject the signed modules
79+
rpm2cpio %{SOURCE0} | cpio -idmv
80+
81+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/updates/srp/ib_srp.ko
82+
cp -rf %{SOURCE2} ./lib/modules/%{KVERSION}/updates/srp/scsi/scsi_transport_srp.ko
83+
84+
popd
7185

7286
%install
73-
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
87+
pushd rpm_contents
7488

75-
cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/srp/ib_srp.ko
76-
cp -r %{SOURCE2} %{buildroot}/lib/modules/%{KVERSION}/updates/srp/scsi/scsi_transport_srp.ko
89+
# Don't use * wildcard. It does not copy over hidden files in the root folder...
90+
cp -rp ./. %{buildroot}/
7791

78-
%clean
79-
rm -rf %{buildroot}
92+
popd
8093

8194
%files
8295
%defattr(-,root,root,-)

0 commit comments

Comments
 (0)