From 7b036009d562ef4c2fd6dbf1de1c52dc7adbbd60 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Wed, 4 Oct 2023 12:16:17 +0530 Subject: [PATCH] no need for the temp workaround --- kernel-next-tfg.spec | 3 --- master.inc | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kernel-next-tfg.spec b/kernel-next-tfg.spec index c37a933..0331afd 100644 --- a/kernel-next-tfg.spec +++ b/kernel-next-tfg.spec @@ -2,9 +2,6 @@ %global rel_ver 1 %global next_snapshot_date 20231003 %global target_config defconfig -# TODO: these are temporary, until 'stable' is 6.6 -%global major_ver 6 -%global minor_ver 6 Name: kernel-next-tfg Version: %{next_snapshot_date} diff --git a/master.inc b/master.inc index 061819b..1c1bce2 100644 --- a/master.inc +++ b/master.inc @@ -139,11 +139,11 @@ ln -fns /usr/src/kernels/%{KVERREL} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/sourc # install actual Linux src to /usr/src/kernels/%{KVERREL} mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL} -%if %{major_ver} > 6 && %{minor_ver} > 5 -%{make} run-command KBUILD_RUN_COMMAND='${RPM_BUILD_DIR}/%{src_dir}/scripts/package/install-extmod-build $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}' -%else -touch $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}/MAYBE_THIS_WORKS -%endif +if [ -f scripts/package/install-extmod-build ]; then + %{make} run-command KBUILD_RUN_COMMAND='${RPM_BUILD_DIR}/%{src_dir}/scripts/package/install-extmod-build $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}' +else + touch $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}/MAYBE_THIS_WORKS +fi %clean rm -rf $RPM_BUILD_ROOT