From: Marek Szyprowski Date: Tue, 15 Oct 2024 06:19:38 +0000 (+0200) Subject: packaging: disable building of unused -rt packages X-Git-Tag: accepted/tizen/unified/x/20241104.122241^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_unified_x;p=platform%2Fkernel%2Flinux-amlogic.git packaging: disable building of unused -rt packages Signed-off-by: Marek Szyprowski Change-Id: I5b601613be1b92a1721e903bd22c2c5144d52df9 --- diff --git a/packaging/linux-amlogic.spec b/packaging/linux-amlogic.spec index f787679e7dba..8e62baab5942 100644 --- a/packaging/linux-amlogic.spec +++ b/packaging/linux-amlogic.spec @@ -11,12 +11,10 @@ %define CHIPSET amlogic %define TARGET_ODROIDS odroid -%define TARGET_ODROIDS_RT odroid_rt %define ODROIDS_DT_PREFIX meson64_odroid %define TARGET_VIMS kvim -%define TARGET_VIMS_RT kvim_rt %define VIMS_DT_PREFIX kvim -%define TARGETS %{TARGET_ODROIDS} %{TARGET_VIMS} %{TARGET_ODROIDS_RT} %{TARGET_VIMS_RT} +%define TARGETS %{TARGET_ODROIDS} %{TARGET_VIMS} Name: linux-amlogic Summary: The Linux Kernel for amlogic boards @@ -71,16 +69,6 @@ Provides: linux-amlogic-odroid = %{version}_%{CHIPSET}_odroid %description -n linux-kernel-amlogic-odroid This package contains the Tizen Linux kernel for amlogic odroid boards -%package -n linux-kernel-amlogic-odroid-rt -License: GPL-2.0 -Summary: Tizen kernel for amlogic odroid boards -Group: System/Kernel -Provides: linux-amlogic-odroid = %{version}_%{CHIPSET}_odroid - -%description -n linux-kernel-amlogic-odroid-rt -This package contains the Tizen Linux kernel for amlogic odroid boards -with the PREEMPT_RT patch applied and enabled. - %package -n linux-kernel-modules-amlogic-odroid Summary: Kernel modules for amlogic odroid boards Group: System/Kernel @@ -89,15 +77,6 @@ Provides: linux-kernel-modules-amlogic-odroid = %{version}_%{CHIPSET}_odroid %description -n linux-kernel-modules-amlogic-odroid Kernel-modules includes the loadable kernel modules(.ko files) for amlogic odroid -%package -n linux-kernel-modules-amlogic-odroid-rt -Summary: Kernel modules for amlogic odroid boards -Group: System/Kernel -Provides: linux-kernel-modules-amlogic-odroid = %{version}_%{CHIPSET}_odroid - -%description -n linux-kernel-modules-amlogic-odroid-rt -Kernel-modules includes the loadable kernel modules(.ko files) for amlogic odroid -with the PREEMPT_RT patch applied and enabled. - %package -n linux-kernel-devel-amlogic-odroid License: GPL-2.0 Summary: Linux support kernel map and etc for other packages @@ -107,15 +86,6 @@ Provides: linux-kernel-devel-amlogic-odroid = %{version}_%{CHIPSET}_odroid %description -n linux-kernel-devel-amlogic-odroid This package provides kernel map and etc information. -%package -n linux-kernel-devel-amlogic-odroid-rt -License: GPL-2.0 -Summary: Linux support kernel map and etc for other packages -Group: System/Kernel -Provides: linux-kernel-devel-amlogic-odroid = %{version}_%{CHIPSET}_odroid - -%description -n linux-kernel-devel-amlogic-odroid-rt -This package provides kernel map and etc information. - %package -n linux-kernel-firmware-amlogic-odroid License: GPL-2.0 Summary: firmware files for the amlogic Odroid Linux kernel @@ -133,16 +103,6 @@ Provides: linux-amlogic-kvim = %{version}_%{CHIPSET}_kvim %description -n linux-kernel-amlogic-kvim This package contains the Tizen Linux kernel for amlogic khadas vim3/vim3l boards -%package -n linux-kernel-amlogic-kvim-rt -License: GPL-2.0 -Summary: Tizen kernel for amlogic kadas vim3/vim3l boards -Group: System/Kernel -Provides: linux-amlogic-kvim = %{version}_%{CHIPSET}_kvim - -%description -n linux-kernel-amlogic-kvim-rt -This package contains the Tizen Linux kernel for amlogic khadas vim3/vim3l boards -with the PREEMPT_RT patch applied and enabled. - %package -n linux-kernel-modules-amlogic-kvim Summary: Kernel modules for amlogic khadas vim3/vim3l boards Group: System/Kernel @@ -151,15 +111,6 @@ Provides: linux-kernel-modules-amlogic-kvim = %{version}_%{CHIPSET}_kvim %description -n linux-kernel-modules-amlogic-kvim Kernel-modules includes the loadable kernel modules(.ko files) for amlogic khadas vim3/vim3l -%package -n linux-kernel-modules-amlogic-kvim-rt -Summary: Kernel modules for amlogic khadas vim3/vim3l boards -Group: System/Kernel -Provides: linux-kernel-modules-amlogic-kvim = %{version}_%{CHIPSET}_kvim - -%description -n linux-kernel-modules-amlogic-kvim-rt -Kernel-modules includes the loadable kernel modules(.ko files) for amlogic khadas vim3/vim3l -with the PREEMPT_RT patch applied and enabled. - %package -n linux-kernel-devel-amlogic-kvim License: GPL-2.0 Summary: Linux support kernel map and etc for other packages @@ -168,15 +119,6 @@ Provides: linux-kernel-devel-amlogic-kvim = %{version}_%{CHIPSET}_kvim %description -n linux-kernel-devel-amlogic-kvim This package provides kernel map and etc information. - -%package -n linux-kernel-devel-amlogic-kvim-rt -License: GPL-2.0 -Summary: Linux support kernel map and etc for other packages -Group: System/Kernel -Provides: linux-kernel-devel-amlogic-kvim = %{version}_%{CHIPSET}_kvim - -%description -n linux-kernel-devel-amlogic-kvim-rt -This package provides kernel map and etc information. %endif %package -n linux-kernel-perf @@ -215,16 +157,6 @@ for target_board in %{TARGETS}; do CONFIG_NAME=kvims DT_PREFIX=%{VIMS_DT_PREFIX} ;; - %{TARGET_ODROIDS_RT}) - cat _localversion-rt > %{_builddir}/build/${target_board}/localversion-rt - CONFIG_NAME=odroidg12_rt - DT_PREFIX=%{ODROIDS_DT_PREFIX} - ;; - %{TARGET_VIMS_RT}) - cat _localversion-rt > %{_builddir}/build/${target_board}/localversion-rt - CONFIG_NAME=kvims_rt - DT_PREFIX=%{VIMS_DT_PREFIX} - ;; esac # Set defconfig file @@ -262,12 +194,6 @@ for target_board in %{TARGETS}; do %{TARGET_VIMS}) DT_PREFIX=%{VIMS_DT_PREFIX} ;; - %{TARGET_ODROIDS_RT}) - DT_PREFIX=%{ODROIDS_DT_PREFIX} - ;; - %{TARGET_VIMS_RT}) - DT_PREFIX=%{VIMS_DT_PREFIX} - ;; esac mkdir -p %{buildroot}/boot/${target_board}/kernel/devel/ @@ -336,23 +262,12 @@ rm -rf %{_builddir}/lib /boot/%{ODROIDS_DT_PREFIX}*.dtb /boot/%{TARGET_ODROIDS}/%{KERNEL_IMAGE} -%files -n linux-kernel-amlogic-odroid-rt -%license COPYING -/boot/%{ODROIDS_DT_PREFIX}*.dtb -/boot/%{TARGET_ODROIDS_RT}/%{KERNEL_IMAGE} - %files -n linux-kernel-modules-amlogic-odroid /lib/modules/*%{TARGET_ODROIDS}/* -%files -n linux-kernel-modules-amlogic-odroid-rt -/lib/modules/*%{TARGET_ODROIDS_RT}/* - %files -n linux-kernel-devel-amlogic-odroid /boot/%{TARGET_ODROIDS}/kernel/* -%files -n linux-kernel-devel-amlogic-odroid-rt -/boot/%{TARGET_ODROIDS_RT}/kernel/* - %files -n linux-kernel-firmware-amlogic-odroid /lib/firmware/* @@ -361,22 +276,11 @@ rm -rf %{_builddir}/lib /boot/%{VIMS_DT_PREFIX}*.dtb /boot/%{TARGET_VIMS}/%{KERNEL_IMAGE} -%files -n linux-kernel-amlogic-kvim-rt -%license COPYING -/boot/%{VIMS_DT_PREFIX}*.dtb -/boot/%{TARGET_VIMS_RT}/%{KERNEL_IMAGE} - %files -n linux-kernel-modules-amlogic-kvim /lib/modules/*%{TARGET_VIMS}/* -%files -n linux-kernel-modules-amlogic-kvim-rt -/lib/modules/*%{TARGET_VIMS_RT}/* - %files -n linux-kernel-devel-amlogic-kvim /boot/%{TARGET_VIMS}/kernel/* - -%files -n linux-kernel-devel-amlogic-kvim-rt -/boot/%{TARGET_VIMS_RT}/kernel/* %endif %files -n linux-kernel-perf