From be9a2089caed3fd566097a60b947450bb368a7f6 Mon Sep 17 00:00:00 2001 From: Bitao Hu Date: Fri, 19 Jul 2024 14:29:18 +0800 Subject: [PATCH 1/2] update kmod-i40e.spec Signed-off-by: Bitao Hu --- kmod-i40e.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/kmod-i40e.spec b/kmod-i40e.spec index 562e1a5..29e76d8 100644 --- a/kmod-i40e.spec +++ b/kmod-i40e.spec @@ -1,5 +1,5 @@ %global pkg i40e -%global kernel 5.10.134-17.an8 +%global kernel kernel version %define pkg_version 2.23.17 %define anolis_release 1 @@ -72,10 +72,8 @@ BuildRequires: kmod BuildRequires: make BuildRequires: system-rpm-config -Requires: kernel-uname-r >= %{kernel}.%{_arch} -Requires: kernel-modules-uname-r >= %{kernel}.%{_arch} -Requires: kernel-modules-extra-uname-r >= %{kernel}.%{_arch} -Requires: kernel-modules-internal-uname-r >= %{kernel}.%{_arch} +Provides: kmod-%{pkg}-%{kernel}.%{_arch} = %{version}-%{release} +Obsoletes: kmod-%{pkg}-%{kernel}.%{_arch} < %{version}-%{release} %description This package contains the Intel(R) 40-10 Gigabit Ethernet Connection Network Driver. @@ -84,8 +82,8 @@ This package contains the Intel(R) 40-10 Gigabit Ethernet Connection Network Dri %setup -q -n kmod-%{pkg}-%{pkg_version} %build -make -C src clean -make -C src +make -C src KSRC=/usr/src/kernels/%{kernel}.%{_arch}/ clean +make -C src KSRC=/usr/src/kernels/%{kernel}.%{_arch}/ -j32 %install mkdir -p %{buildroot}/lib/modules/%{kernel}.%{_arch}/extra/drivers/net/ethernet/intel/%{pkg} @@ -258,7 +256,6 @@ do # device entry elif [[ $line == $DEV ]] - echo "wangkaiyuan2" then device=`echo ${line:1:4} | tr "[:upper:]" "[:lower:]"` table_device=0x${line:1:4} @@ -315,7 +312,6 @@ do fi # subsystem entry elif [[ $line == $SUB ]] - echo "wangkaiyuan3" then subven=`echo ${line:2:4} | tr "[:upper:]" "[:lower:]"` subdev=`echo ${line:7:4} | tr "[:upper:]" "[:lower:]"` @@ -424,7 +420,6 @@ exec 6>&- exec 7>&- END -echo "wangkaiyuan2222" mv -f $LD/pci.ids.new %{pciids} if [ "%{pcitable}" != "/dev/null" ]; then -- Gitee From a9ed42cb7f46cc6b9e6fda1203b657ef7ed41f68 Mon Sep 17 00:00:00 2001 From: shengaoya Date: Fri, 19 Jul 2024 02:42:19 -0400 Subject: [PATCH 2/2] update kmod-i40e spec Signed-off-by: shengaoya --- kmod-i40e.spec | 75 +++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 47 deletions(-) diff --git a/kmod-i40e.spec b/kmod-i40e.spec index 29e76d8..b3a9e50 100644 --- a/kmod-i40e.spec +++ b/kmod-i40e.spec @@ -12,50 +12,11 @@ Vendor: Intel Corporation License: GPL-2.0-only ExclusiveOS: linux Group: System Environment/Kernel -Provides: %{pkg} URL: http://support.intel.com -BuildRoot: %{_tmppath}/%{pkg}-%{pkg_version}-root -%global debug_package %{nil} -# macros for finding system files to update at install time (pci.ids, pcitable) -%define find() %(for f in %*; do if [ -e $f ]; then echo $f; break; fi; done) -%define _pciids /usr/share/pci.ids /usr/share/hwdata/pci.ids -%define _pcitable /usr/share/kudzu/pcitable /usr/share/hwdata/pcitable /dev/null -#%define pciids %find %{_pciids} -%define pciids /usr/share/hwdata/pci.ids -%define pcitable %find %{_pcitable} -Requires: kernel, findutils, gawk, bash - -%global __strip /bin/true -%if 0%{?BUILD_KERNEL:1} -%define kernel_ver %{BUILD_KERNEL} -%define check_aux_args_kernel -b %{BUILD_KERNEL} -%else -%define kernel_ver %(uname -r) -%endif - -%if 0%{?KSRC:1} -%define check_aux_args_ksrc -k %{KSRC} -%endif - -%define check_aux_args %check_aux_args_kernel %check_aux_args_ksrc - -%define need_aux_rpm %( [ -L /lib/modules/%kernel_ver/source ] && (rpm -q --whatprovides /lib/modules/%kernel_ver/source/include/linux/auxiliary_bus.h > /dev/null 2>&1 && echo 0 || echo 2) || (rpm -q --whatprovides /lib/modules/%kernel_ver/build/include/linux/auxiliary_bus.h > /dev/null 2>&1 && echo 0 || echo 2) ) - -%if (%need_aux_rpm == 2) -Requires: intel_auxiliary -%endif - -# Check for existence of variable kernel_module_package_buildreqs ... -%if 0%{?!kernel_module_package_buildreqs:1} -# ... and provide a suitable definition if it is not defined -%define kernel_module_package_buildreqs kernel-devel -%endif - -%define kernel_module_package_buildreqs_fixed %(/bin/bash -fc 'if [[ %{kernel_ver} == *uek* ]]; - then echo %kernel_module_package_buildreqs | sed 's/kernel-devel/kernel-uek-devel/g' ; else echo %kernel_module_package_buildreqs ; fi') +Provides: kmod-%{pkg}-%{kernel}.%{_arch} = %{version}-%{release} +Obsoletes: kmod-%{pkg}-%{kernel}.%{_arch} < %{version}-%{release} -BuildRequires: %kernel_module_package_buildreqs_fixed Requires: kernel >= %{kernel} Requires(posttrans): %{_sbindir}/depmod Requires(postun): %{_sbindir}/depmod @@ -65,15 +26,35 @@ Requires(posttrans): %{_bindir}/sort Requires(postun): %{_bindir}/sort BuildRequires: kernel-devel = %{kernel} -BuildRequires: kernel-headers = %{kernel} BuildRequires: elfutils-libelf-devel BuildRequires: gcc BuildRequires: kmod BuildRequires: make BuildRequires: system-rpm-config +BuildRequires: hwdata -Provides: kmod-%{pkg}-%{kernel}.%{_arch} = %{version}-%{release} -Obsoletes: kmod-%{pkg}-%{kernel}.%{_arch} < %{version}-%{release} +%global debug_package %{nil} +# macros for finding system files to update at install time (pci.ids, pcitable) +%define find() %(for f in %*; do if [ -e $f ]; then echo $f; break; fi; done) +%define _pciids /usr/share/pci.ids /usr/share/hwdata/pci.ids +%define _pcitable /usr/share/kudzu/pcitable /usr/share/hwdata/pcitable /dev/null +%define pciids %find %{_pciids} +%define pciids /usr/share/hwdata/pci.ids +%define pcitable %find %{_pcitable} +Requires: findutils, gawk, bash + +%global __strip /bin/true + +%define kernel_ver %{kernel}.%{_arch} + +%define check_aux_args_kernel -b %{kernel}.%{_arch} +%define check_aux_args_ksrc -k /usr/src/kernels/%{kernel}.%{_arch}/ +%define check_aux_args %{check_aux_args_kernel} %{check_aux_args_ksrc} + +%define need_aux_rpm 0 +%if (%need_aux_rpm == 2) +Requires: intel_auxiliary +%endif %description This package contains the Intel(R) 40-10 Gigabit Ethernet Connection Network Driver. @@ -82,8 +63,8 @@ This package contains the Intel(R) 40-10 Gigabit Ethernet Connection Network Dri %setup -q -n kmod-%{pkg}-%{pkg_version} %build -make -C src KSRC=/usr/src/kernels/%{kernel}.%{_arch}/ clean -make -C src KSRC=/usr/src/kernels/%{kernel}.%{_arch}/ -j32 +make -C src clean +make -C src %install mkdir -p %{buildroot}/lib/modules/%{kernel}.%{_arch}/extra/drivers/net/ethernet/intel/%{pkg} @@ -241,7 +222,7 @@ do # add entry to pci.ids exec 0<&3 exec 1>&6 - echo"------------$ids_in-------$VEN--------$vendor" +# echo"------------$ids_in-------$VEN--------$vendor" # while [[ $ids_in != $VEN || # 0x${ids_in:0:4} < $vendor ]] # do -- Gitee