From: Jaehoon Chung Date: Fri, 14 Jul 2023 05:57:50 +0000 (+0900) Subject: packaging: Remove deprecated packages about TM1/TW3 X-Git-Tag: accepted/tizen/unified/riscv/20230718.024914~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ea54b6d59b89e5c0856979dc392fbe2a1856e69;p=platform%2Fkernel%2Flinux-tizen-modules.git packaging: Remove deprecated packages about TM1/TW3 TM1 / TW3 doesn't support anymore since Tizen8.0. So remove those packages from spec file. Change-Id: I709ee51facff7417148d0b2f173b5926f4d7f01c Signed-off-by: Jaehoon Chung --- diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf deleted file mode 100644 index 126c8ea..0000000 --- a/packaging/baselibs.conf +++ /dev/null @@ -1,13 +0,0 @@ -arch aarch64 targets armv7l:aarch64 - -linux-tizen-modules-tw3 - +/ - requires "bash" - requires "coreutils" - requires "findutils" - requires "kmod-compat" - provides "stability-monitor-kernel-module" - post "/bin/cp -r /aarch64/modules/* /lib/modules/" - post "/bin/rm -rf /aarch64" - post "RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`))" - post "/sbin/depmod -a $RELEASEVERSION" diff --git a/packaging/linux-tizen-modules.spec b/packaging/linux-tizen-modules.spec index acfadfe..ec6f48b 100644 --- a/packaging/linux-tizen-modules.spec +++ b/packaging/linux-tizen-modules.spec @@ -1,5 +1,4 @@ %define KMOD_PATH /lib/modules -%define KMOD_PATH_TM1 /boot/kernel/mod_tizen_tm1/lib/modules %ifarch aarch64 %define buildarch arm64 @@ -23,7 +22,6 @@ ExclusiveArch: %{arm} aarch64 riscv64 BuildRequires: kmod BuildRequires: linux-tizen-modules-source %ifarch aarch64 -BuildRequires: kernel-devel-exynos9110-tw3 BuildRequires: %{buildarch}-rpi4-linux-kernel-devel BuildRequires: %{buildarch}-rpi4-rt-linux-kernel-devel %endif @@ -62,26 +60,6 @@ Provides: stability-monitor-kernel-module %description rpi4-rt %endif -%ifarch aarch64 -%package tw3 -Summary: Tizen modules for TW3 -AutoReqProv: no -Provides: stability-monitor-kernel-module -%description tw3 -%endif - -%ifarch %{arm} -%package tm1 -Summary: Tizen modules for TM1 -Requires: linux-3.10-sc7730_tizen_tm1 -AutoReqProv: no -Requires(post): bash -Requires(post): coreutils -Requires(post): findutils -Requires(post): kmod-compat -%description tm1 -%endif - %ifarch riscv64 %package rv64qemu Summary: Tizen modules for RISCV QEMU @@ -136,21 +114,8 @@ make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{build %endif export BUILD_kdbus=n - -%ifarch aarch64 -make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 -make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 -make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 INSTALL_MOD_STRIP=1 -%endif - export BUILD_proc_tsm=n -%ifarch %{arm} -make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-tizen_tm1 -make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-tizen_tm1 -make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-tizen_tm1 INSTALL_MOD_STRIP=1 -%endif - %ifarch riscv64 make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-qemu make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-qemu @@ -177,23 +142,6 @@ mkdir -p %{buildroot}/%{KMOD_PATH}/modules-load.d install -m 644 conf/tizen-modules-rpi4.conf %{buildroot}/%{KMOD_PATH}/modules-load.d %endif -%ifarch aarch64 -mkdir -p %{buildroot}/aarch64/modules -mv %{buildroot}/%{KMOD_PATH}/4.9.59 %{buildroot}/aarch64/modules/ - -mkdir -p %{buildroot}/aarch64/modules/modprobe.d -install -m 644 conf/tizen-modprobe-tw3.conf %{buildroot}/aarch64/modules/modprobe.d - -mkdir -p %{buildroot}/aarch64/modules/modules-load.d -install -m 644 conf/tizen-modules-tw3.conf %{buildroot}/aarch64/modules/modules-load.d -%endif - -%ifarch %{arm} -mkdir -p %{buildroot}/%{KMOD_PATH_TM1}/modules-load.d -install -m 644 conf/tizen-modules-tm1.conf %{buildroot}/%{KMOD_PATH_TM1}/modules-load.d -mv -v %{buildroot}/%{KMOD_PATH}/*3.10* %{buildroot}/%{KMOD_PATH_TM1} -%endif - %clean rm -rf %{buildroot} rm -rf %{_builddir}/%{name}-%{version}/lib @@ -208,14 +156,6 @@ RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) /sbin/depmod -a $RELEASEVERSION %endif -%ifarch %{arm} -%post tm1 -KMOD_PATH_TM1=%{KMOD_PATH_TM1} -KMOD_BASEPATH=${KMOD_PATH_TM1%%%{KMOD_PATH}} -RELEASEVERSION=$(basename $(dirname `find $KMOD_PATH_TM1 -name extra | head -1`)) -/sbin/depmod -b ${KMOD_BASEPATH} -a $RELEASEVERSION -%endif - %ifarch %{arm} aarch64 %files rpi4 %manifest %{name}.manifest @@ -252,26 +192,6 @@ RELEASEVERSION=$(basename $(dirname `find $KMOD_PATH_TM1 -name extra | head -1`) %{KMOD_PATH}/modules-load.d/tizen-modules-rpi4.conf %endif -%ifarch aarch64 -%files tw3 -%manifest %{name}.manifest -%license COPYING -/aarch64/modules/4.9.59/extra/proc-tsm.ko -/aarch64/modules/4.9.59/extra/logger.ko -/aarch64/modules/4.9.59/extra/zlogger/zlogger.ko -/aarch64/modules/modprobe.d/tizen-modprobe-tw3.conf -/aarch64/modules/modules-load.d/tizen-modules-tw3.conf -%endif - -%ifarch %{arm} -%files tm1 -%manifest %{name}.manifest -%license COPYING -%{KMOD_PATH_TM1}/*3.10*/extra/logger.ko -%{KMOD_PATH_TM1}/*3.10*/extra/zlogger/zlogger.ko -%{KMOD_PATH_TM1}/modules-load.d/tizen-modules-tm1.conf -%endif - %ifarch riscv64 %files rv64qemu %manifest %{name}.manifest