Skip to content

Commit

Permalink
generate kernel-mft rpm instead of default
Browse files Browse the repository at this point in the history
  • Loading branch information
Binu Jose Philip committed Jan 24, 2025
1 parent 04ea467 commit 250638c
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 87 deletions.
2 changes: 1 addition & 1 deletion SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ rm -rf %{buildroot}

%files -n kernel-mft
%defattr(-,root,root,-)
%license %{_datadir}/licenses/kernel-mft/COPYING
%license %{_defaultlicensedir}/kernel-mft/COPYING
/lib/modules/%{KVERSION}/updates/

%changelog
Expand Down
12 changes: 5 additions & 7 deletions SPECS/mft_kernel/mft_kernel.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,22 +208,20 @@ done
find %{buildroot} -type f -name \*.ko -exec %{__strip} -p --strip-debug --discard-locals -R .comment -R .note \{\} \;
%endif

# Install licnse file to %{_defaultlicensedir}/kernel-mft for %files to pickp.
# This is required since %license will install to %{_defaultlicensedir}/%{name}
# and we have a different %{name}.
mkdir -p %{buildroot}/%{_defaultlicensedir}/kernel-mft
cp source/COPYING %{buildroot}/%{_defaultlicensedir}/kernel-mft

%post
/sbin/depmod %{KVERSION}

%postun
/sbin/depmod %{KVERSION}

# Install license file to %{_defaultlicensedir}/kernel-mft for %files to pick-up
# and set license metadata correct
%define licensedir %{_defaultlicensedir}/kernel-mft/

%if "%{KMP}" != "1"
%files -n kernel-mft
%defattr(-,root,root,-)
%{_defaultlicensedir}/kernel-mft/COPYING
%license source/COPYING
/lib/modules/%{KVERSION}/%{install_mod_dir}/
%if %{IS_RHEL_VENDOR}
%if ! 0%{?fedora}
Expand Down
158 changes: 79 additions & 79 deletions cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13110,140 +13110,140 @@
"component": {
"type": "other",
"other": {
"name": "mft_kernel",
"version": "4.30.0",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/kernel-mft-4.30.0.tgz"
"name": "metis",
"version": "5.1.0",
"downloadUrl": "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "mlnx-ethtool",
"version": "6.9",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-ethtool-6.9.tar.gz"
"name": "mft_kernel",
"version": "4.30.0",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/kernel-mft-4.30.0.tgz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "mlnx-iproute2",
"version": "6.10.0",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-iproute2-6.10.0.tar.gz"
"name": "microcode_ctl",
"version": "2.1",
"downloadUrl": "https://releases.pagure.org/microcode_ctl/microcode_ctl-2.1-29.tar.xz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "mlnx-nfsrdma",
"version": "24.10",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-nfsrdma-24.10.tgz"
"name": "microdnf",
"version": "3.5.1",
"downloadUrl": "https://github.com/rpm-software-management/microdnf/archive/v3.5.1/microdnf-3.5.1.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "mlnx-ofa_kernel",
"version": "24.10",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-ofa_kernel-24.10.tgz"
"name": "migrationtools",
"version": "47",
"downloadUrl": "http://www.padl.com/download/MigrationTools-47.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "metis",
"version": "5.1.0",
"downloadUrl": "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz"
"name": "ming",
"version": "0.4.9",
"downloadUrl": "https://github.com/libming/libming/archive/50098023446a5412efcfbd40552821a8cba983a6/ming-50098023446a5412efcfbd40552821a8cba983a6.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "microcode_ctl",
"version": "2.1",
"downloadUrl": "https://releases.pagure.org/microcode_ctl/microcode_ctl-2.1-29.tar.xz"
"name": "minicom",
"version": "2.7.1",
"downloadUrl": "https://alioth.debian.org/frs/download.php/file/4215/minicom-2.7.1.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "microdnf",
"version": "3.5.1",
"downloadUrl": "https://github.com/rpm-software-management/microdnf/archive/v3.5.1/microdnf-3.5.1.tar.gz"
"name": "minizip",
"version": "2.10.1",
"downloadUrl": "https://github.com/nmoinvaz/minizip/archive/2.10.1/minizip-2.10.1.tar.gz"
}
}
},
{
"component": {
"type": "other",
"comment": "Imported as part of the 'xorg-x11-font-utils' package, version 7.5",
"other": {
"name": "migrationtools",
"version": "47",
"downloadUrl": "http://www.padl.com/download/MigrationTools-47.tar.gz"
"name": "mkfontscale",
"version": "1.2.2",
"downloadUrl": "https://www.x.org/pub/individual/app/mkfontscale-1.2.2.tar.xz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "ming",
"version": "0.4.9",
"downloadUrl": "https://github.com/libming/libming/archive/50098023446a5412efcfbd40552821a8cba983a6/ming-50098023446a5412efcfbd40552821a8cba983a6.tar.gz"
"name": "mksh",
"version": "59c",
"downloadUrl": "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "minicom",
"version": "2.7.1",
"downloadUrl": "https://alioth.debian.org/frs/download.php/file/4215/minicom-2.7.1.tar.gz"
"name": "mlnx-ethtool",
"version": "6.9",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-ethtool-6.9.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "minizip",
"version": "2.10.1",
"downloadUrl": "https://github.com/nmoinvaz/minizip/archive/2.10.1/minizip-2.10.1.tar.gz"
"name": "mlnx-iproute2",
"version": "6.10.0",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-iproute2-6.10.0.tar.gz"
}
}
},
{
"component": {
"type": "other",
"comment": "Imported as part of the 'xorg-x11-font-utils' package, version 7.5",
"other": {
"name": "mkfontscale",
"version": "1.2.2",
"downloadUrl": "https://www.x.org/pub/individual/app/mkfontscale-1.2.2.tar.xz"
"name": "mlnx-nfsrdma",
"version": "24.10",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-nfsrdma-24.10.tgz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "mksh",
"version": "59c",
"downloadUrl": "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz"
"name": "mlnx-ofa_kernel",
"version": "24.10",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/mlnx-ofa_kernel-24.10.tgz"
}
}
},
Expand Down Expand Up @@ -13621,19 +13621,19 @@
"component": {
"type": "other",
"other": {
"name": "multiperf",
"version": "3.0",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/multiperf-3.0.tar.gz"
"name": "mtx",
"version": "1.3.12",
"downloadUrl": "http://downloads.sourceforge.net/mtx/mtx-1.3.12.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "mtx",
"version": "1.3.12",
"downloadUrl": "http://downloads.sourceforge.net/mtx/mtx-1.3.12.tar.gz"
"name": "multiperf",
"version": "3.0",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/multiperf-3.0.tar.gz"
}
}
},
Expand Down Expand Up @@ -22918,6 +22918,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "python-iniconfig",
"version": "1.1.1",
"downloadUrl": "https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2/iniconfig-1.1.1.tar.gz"
}
}
},
{
"component": {
"type": "other",
Expand Down Expand Up @@ -22968,16 +22978,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "python-iniconfig",
"version": "1.1.1",
"downloadUrl": "https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2/iniconfig-1.1.1.tar.gz"
}
}
},
{
"component": {
"type": "other",
Expand Down Expand Up @@ -30663,6 +30663,26 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "xpmem",
"version": "2.7.4",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/xpmem-2.7.4.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "xpmem-lib",
"version": "2.7",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/xpmem-lib-2.7.tar.gz"
}
}
},
{
"component": {
"type": "other",
Expand Down Expand Up @@ -30844,26 +30864,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "xpmem-lib",
"version": "2.7",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/xpmem-lib-2.7.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "xpmem",
"version": "2.7.4",
"downloadUrl": "https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/xpmem-2.7.4.tar.gz"
}
}
},
{
"component": {
"type": "other",
Expand Down

0 comments on commit 250638c

Please sign in to comment.