packaging: add to build with rpi4 kernel 82/229182/4 accepted/tizen/unified/20200401.011627 submit/tizen/20200331.134633
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Mon, 30 Mar 2020 06:16:08 +0000 (15:16 +0900)
committerKonrad Kuchciak <k.kuchciak@samsung.com>
Tue, 31 Mar 2020 11:59:38 +0000 (13:59 +0200)
In tizen, rpi platform image supports both rpi3 and rpi4. So add
to build with rpi4 kernel to support rpi4 kernel.

Additionaly, provide stability-monitor-kernel-module
virtual package instead of bare kernel file.

Change-Id: I708213069744b0f405676b2705b584acfaca0ec1
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Konrad Kuchciak <k.kuchciak@samsung.com>
packaging/stability-monitor-kmod-rpi3.spec

index 68f96b3..1343185 100644 (file)
@@ -1,8 +1,7 @@
 %define KMOD_PATH %{_libdir}/stability-monitor
-%define TSM_PATH %{KMOD_PATH}/proc-tsm.ko
 
 Name:       stability-monitor-kmod-rpi3
-Version:    6.1.1
+Version:    6.2.1
 Release:    0
 License:    GPL-2.0+
 Source0:    %{name}-%{version}.tar.xz
@@ -12,7 +11,8 @@ Group:      System/Monitoring
 ExclusiveArch: armv7l
 BuildRequires: module-init-tools
 BuildRequires: arm-rpi3-linux-kernel-devel
-Provides:   %{TSM_PATH}
+BuildRequires: arm-rpi4-linux-kernel-devel
+Provides:   stability-monitor-kernel-module
 
 %description
 This package provides kernel module for stability monitoring daemon.
@@ -26,8 +26,12 @@ make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi3
 make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi3/
 make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi3 INSTALL_MOD_STRIP=1
 
+make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi4
+make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi4
+make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi4 INSTALL_MOD_STRIP=1
+
 %install
-install -D kernel/proc-tsm.ko %{buildroot}/%TSM_PATH
+mkdir -p %{buildroot}/%{KMOD_PATH}
 pushd lib/modules
 find -name "*.ko" -exec cp -a --parents {} %{buildroot}/%{KMOD_PATH}/ \;
 popd
@@ -36,6 +40,7 @@ install -D config/stability-monitor.conf %{buildroot}/etc/modprobe.d/stability-m
 %clean
 rm -rf %{buildroot}
 make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi3
+make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-arm-rpi4
 rm -rf %{_builddir}/%{Name}-%{version}/lib
 
 %files