Move kernel module to separate spec

Change-Id: Ie6408e9bb06399f9ce9cc99f78668f5c443e1c06

diff --git a/kernel/Makefile b/kernel/Makefile
index cc873547f93f9e0b6ecd20ffc4fca816ffcc5fe4..99f0f73e1351f7fb395f8595492e5c0dc43c0878 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,4 +1,3 @@
-KERNELDIR = /boot/kernel/devel/kernel-devel-arm-rpi3/
 PWD := $(shell pwd)
 LD = ld
 

diff --git a/packaging/stability-monitor-kmod-rpi3.spec b/packaging/stability-monitor-kmod-rpi3.spec
new file mode 100644 (file)
index 0000000..8c7bbe1
--- /dev/null
+++ b/packaging/stability-monitor-kmod-rpi3.spec
@@ -0,0 +1,27 @@
+%define KMOD_PATH %{_libdir}/stability-monitor/proc-tsm.ko
+
+Name:       stability-monitor-kmod-rpi3
+Version:    0.0.1
+Release:    0
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.xz
+Summary:    Stability monitoring kernel module
+Group:      System/Monitoring
+ExclusiveArch: armv7l
+BuildRequires: arm-rpi3-linux-kernel-devel
+
+%description
+This package provides kernel module for stability monitoring daemon.
+
+%prep
+%setup -q
+
+%build
+make -C kernel KMOD_PATH=%KMOD_PATH KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi3/
+
+%install
+install -D kernel/proc-tsm.ko %{buildroot}/%KMOD_PATH
+
+%files
+%license COPYING
+%KMOD_PATH

diff --git a/packaging/stability-monitor.spec b/packaging/stability-monitor.spec
index cc3d46b417ff293a59807271314966e4891d2d38..4b4a67b51799191e73b2677ab9803159ad74120f 100644 (file)
--- a/packaging/stability-monitor.spec
+++ b/packaging/stability-monitor.spec
@@ -1,3 +1,5 @@
+%define KMOD_PATH %{_libdir}/stability-monitor/proc-tsm.ko
+
 Name:       stability-monitor
 Version:    0.0.1
 Release:    0
@@ -11,36 +13,29 @@ BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(pkgmgr-info)
 ExclusiveArch: armv7l
-BuildRequires: arm-rpi3-linux-kernel-devel
+Requires:    %{KMOD_PATH}
 
 %description
 This package provides stability monitoring daemon.
 
 %package tests
 Summary:    Stability monitor tests/specification
+Requires:   %{name} = %{version}
 
 %description tests
 Tests for stability monitoring tool
 
 %prep
 %setup -q
-%define KMOD_PATH /%{_libdir}/modules/linux/kernel/drivers/misc/stability-monitor/proc-tsm.ko
 
 %build
-make stability-monitor KMOD_PATH=%KMOD_PATH
-
-cd kernel
-make clean
-make all
-
-cd ../tests
-make all
+make stability-monitor KMOD_PATH=%{KMOD_PATH}
+make -C tests all
 
 %install
 make install INSTALL_PREFIX=%{buildroot}/%{_sbindir}
 install -D config/default.conf %{buildroot}/%{_libdir}/stability-monitor/default.conf
 install -D config/10-example.conf %{buildroot}/%{_sysconfdir}/stability-monitor.d/10-example.conf
-install -D kernel/proc-tsm.ko %{buildroot}/%KMOD_PATH
 
 install -D config/stability-monitor.service %{buildroot}/%{_unitdir}/stability-monitor.service
 mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants
@@ -59,7 +54,6 @@ install -D tests/config.json          %{buildroot}/etc/stability-monitor.d/test-
 %{_sbindir}/stability-monitor
 %{_libdir}/stability-monitor/default.conf
 %{_sysconfdir}/stability-monitor.d/10-example.conf
-%KMOD_PATH
 %{_unitdir}/stability-monitor.service
 %{_unitdir}/multi-user.target.wants/stability-monitor.service