From 51853392406a74de164ade7e85d0ad1f52b1a902 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 9 Oct 2023 12:57:32 +0530 Subject: [PATCH] fix depmod for linux-next --- kernel-next-tfg.spec | 9 ++++++--- master.inc | 6 +----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/kernel-next-tfg.spec b/kernel-next-tfg.spec index f84843d..1caf853 100644 --- a/kernel-next-tfg.spec +++ b/kernel-next-tfg.spec @@ -1,11 +1,14 @@ # change version here -%global rel_ver 11 +%global rel_ver 12 +%global major_ver 6 +%global minor_ver 6 +%global patch_ver 0 %global next_snapshot_date 20231006 %global target_config defconfig %global kname next -Version: %{next_snapshot_date} -Release: %{rel_ver}%{?dist} +Version: %{major_ver}.%{minor_ver}.%{patch_ver} +Release: %{next_snapshot_date}.%{rel_ver}%{?dist} Source0: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/snapshot/linux-next-next-%{next_snapshot_date}.tar.gz Source1: master.inc diff --git a/master.inc b/master.inc index 6fb09fd..cb20415 100644 --- a/master.inc +++ b/master.inc @@ -60,7 +60,7 @@ against the kernel package. %prep if [ -f ../SOURCES/linux-%{version}.tar.sign ]; then - gzip --decompress --keep %{SOURCE0} + [ -f ../SOURCES/linux-%{version}.tar ] || gzip --decompress --keep %{SOURCE0} gpg2 --locate-keys torvalds@kernel.org gregkh@kernel.org gpg2 --verify %{SOURCE99} || exit 1 @@ -130,11 +130,7 @@ find arch/%{build_arch}/boot/dts -name '*.dtb' -type f -delete # install modules # '$(mod-fw)' is overridden because there is no reason to install any firmware # since we already have 'linux-firmware' package as the dependency of this package. -%if "%{name}" == "kernel-next-tfg" -%{make} INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT mod-fw= DEPMOD=/doesnt/exist modules_install -%else %{make} INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT mod-fw= modules_install -%endif # install headers %{make} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install