From 2695263acd2c20c16b6b232a417a2d5407285aa2 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Thu, 3 Nov 2022 11:50:57 +0100 Subject: [PATCH] Drop rpi3 package RPI3 support is dropped from Tizen 7.5. Change-Id: I0400c8fb08b1e78a847ca35a2fea151432bc81bb --- conf/tizen-modprobe-rpi3.conf | 1 - conf/tizen-modules-rpi3.conf | 1 - packaging/linux-tizen-modules.spec | 33 +----------------------------- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 conf/tizen-modprobe-rpi3.conf delete mode 100644 conf/tizen-modules-rpi3.conf diff --git a/conf/tizen-modprobe-rpi3.conf b/conf/tizen-modprobe-rpi3.conf deleted file mode 100644 index b65f476..0000000 --- a/conf/tizen-modprobe-rpi3.conf +++ /dev/null @@ -1 +0,0 @@ -options proc-tsm blacklist=System::TEF diff --git a/conf/tizen-modules-rpi3.conf b/conf/tizen-modules-rpi3.conf deleted file mode 100644 index 7c82fcf..0000000 --- a/conf/tizen-modules-rpi3.conf +++ /dev/null @@ -1 +0,0 @@ -logger diff --git a/packaging/linux-tizen-modules.spec b/packaging/linux-tizen-modules.spec index 1ead91f..a15f167 100644 --- a/packaging/linux-tizen-modules.spec +++ b/packaging/linux-tizen-modules.spec @@ -8,7 +8,7 @@ %endif Name: linux-tizen-modules -Version: 7.0.7 +Version: 7.5.0 Release: 0 License: GPL-2.0+ Source0: %{name}-%{version}.tar.xz @@ -18,7 +18,6 @@ Group: System/Kernel ExclusiveArch: %{arm} aarch64 BuildRequires: kmod BuildRequires: linux-tizen-modules-source -BuildRequires: %{buildarch}-rpi3-linux-kernel-devel BuildRequires: %{buildarch}-rpi4-linux-kernel-devel BuildRequires: %{buildarch}-rpi4-rt-linux-kernel-devel %ifarch aarch64 @@ -29,17 +28,6 @@ BuildRequires: kernel-devel-3.10-sc7730 %endif %description -%package rpi3 -Summary: Tizen modules for RaspberryPI 3 -AutoReqProv: no -Requires: %{buildarch}-rpi3-linux-kernel-modules -Requires(post): bash -Requires(post): coreutils -Requires(post): findutils -Requires(post): kmod-compat -Provides: stability-monitor-kernel-module -%description rpi3 - %package rpi4 Summary: Tizen modules for RaspberryPI 4 AutoReqProv: no @@ -113,10 +101,6 @@ make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{build export BUILD_kdbus=n -make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3 -make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3/ -make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3 INSTALL_MOD_STRIP=1 - %ifarch aarch64 make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 @@ -140,11 +124,9 @@ popd # module load config mkdir -p %{buildroot}/%{KMOD_PATH}/modprobe.d -install -m 644 conf/tizen-modprobe-rpi3.conf %{buildroot}/%{KMOD_PATH}/modprobe.d install -m 644 conf/tizen-modprobe-rpi4.conf %{buildroot}/%{KMOD_PATH}/modprobe.d mkdir -p %{buildroot}/%{KMOD_PATH}/modules-load.d -install -m 644 conf/tizen-modules-rpi3.conf %{buildroot}/%{KMOD_PATH}/modules-load.d install -m 644 conf/tizen-modules-rpi4.conf %{buildroot}/%{KMOD_PATH}/modules-load.d %ifarch aarch64 @@ -168,10 +150,6 @@ mv -v %{buildroot}/%{KMOD_PATH}/*3.10* %{buildroot}/%{KMOD_PATH_TM1} rm -rf %{buildroot} rm -rf %{_builddir}/%{name}-%{version}/lib -%post rpi3 -RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) -/sbin/depmod -a $RELEASEVERSION - %post rpi4 RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) /sbin/depmod -a $RELEASEVERSION @@ -188,15 +166,6 @@ RELEASEVERSION=$(basename $(dirname `find $KMOD_PATH_TM1 -name extra | head -1`) /sbin/depmod -b ${KMOD_BASEPATH} -a $RELEASEVERSION %endif -%files rpi3 -%manifest %{name}.manifest -%license COPYING -%{KMOD_PATH}/*rpi3*/extra/proc-tsm.ko -%{KMOD_PATH}/*rpi3*/extra/logger.ko -%{KMOD_PATH}/*rpi3*/extra/zlogger/zlogger.ko -%{KMOD_PATH}/modprobe.d/tizen-modprobe-rpi3.conf -%{KMOD_PATH}/modules-load.d/tizen-modules-rpi3.conf - %files rpi4 %manifest %{name}.manifest %license COPYING -- 2.34.1