From 85531506a295895daad881e6447a0885e88a0827 Mon Sep 17 00:00:00 2001 From: Konrad Kuchciak Date: Mon, 30 Mar 2020 15:07:19 +0200 Subject: [PATCH] Depend on kmod virtual package instead of kmod file Change-Id: Ib443acf2a53af1ab89ac50cf9cdb6a532c427105 --- Makefile | 1 - packaging/stability-monitor.spec | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a1c8b47..eafaffa 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,6 @@ CFLAGS = \ -Wall \ -I$(srcdir) \ `pkg-config --cflags $(libs)` \ - -DKMOD_PATH=\"$(KMOD_PATH)\" \ -D_GNU_SOURCE \ -fPIE diff --git a/packaging/stability-monitor.spec b/packaging/stability-monitor.spec index 4f503a6..4e14c69 100644 --- a/packaging/stability-monitor.spec +++ b/packaging/stability-monitor.spec @@ -1,5 +1,3 @@ -%define KMOD_PATH %{_libdir}/stability-monitor/proc-tsm.ko - Name: stability-monitor Version: 6.2.2 Release: 0 @@ -17,7 +15,7 @@ BuildRequires: pkgconfig(crash-service) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(libkmod) ExclusiveArch: armv7l -Requires: %{KMOD_PATH} +Requires: stability-monitor-kernel-module %description This package provides stability monitoring daemon. @@ -34,7 +32,7 @@ Tests for stability monitoring tool cp %{SOURCE1} ./%{name}.manifest %build -make stability-monitor KMOD_PATH=%{KMOD_PATH} +make stability-monitor make -C tests all %install -- 2.34.1