From 171b30b6b256a4b1b390a323dc6ad5a9106831c2 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Tue, 19 Sep 2023 15:47:06 +0200 Subject: Fix: move sub1-domain_Feature-ISU dep from per-board to common profile Iot Headed and IoT Headless images are built using building-blocks-sub1-Preset_img_headed-common and not headed-rpi3, etc. packages. This commit ensures ISU feature is available in tizen.org's headed & headless images. Change-Id: I2d532eeaf8b6b6f4f2488a279d94e4f8a2f91382 --- packaging/platform-preset-iot-headed-images.inc | 3 +-- packaging/platform-preset-iot-headless-images.inc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc index a452922..95a23d3 100644 --- a/packaging/platform-preset-iot-headed-images.inc +++ b/packaging/platform-preset-iot-headed-images.inc @@ -77,7 +77,6 @@ Requires: dali-csharp-binder Requires: dali2-csharp-binder Requires: %{name}-sub1-domain_Feature-Starter Requires: %{name}-sub1-feature_App-IoT_Headed_Ref_image -Requires: %{name}-sub1-domain_Feature-ISU Requires: %{name}-sub1-domain_Feature-Upgrade Requires: %{name}-sub1-domain_Feature-Recovery Requires: %{name}-sub1-domain_Feature-WebAPI @@ -231,6 +230,7 @@ Requires: dali-csharp-binder Requires: dali2-csharp-binder Requires: %{name}-sub1-domain_Feature-Starter Requires: %{name}-sub1-feature_App-IoT_Headed_Ref_image +Requires: %{name}-sub1-domain_Feature-ISU Requires: %{name}-sub1-domain_Feature-Upgrade Requires: %{name}-sub1-domain_Feature-Recovery Requires: %{name}-sub1-domain_Feature-WebAPI @@ -366,7 +366,6 @@ Requires: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs %endif ## Feature Requires: %{name}-sub1-domain_Feature-BootAni -Requires: %{name}-sub1-domain_Feature-ISU %if %{dotnet_feature} == "on" Requires: %{name}-sub1-domain_Feature-DotNET %endif diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc index 51b825f..ba9df40 100644 --- a/packaging/platform-preset-iot-headless-images.inc +++ b/packaging/platform-preset-iot-headless-images.inc @@ -115,6 +115,7 @@ Requires: %{name}-sub2-domain_API-Multimedia-Player Requires: %{name}-sub2-domain_API-Network-Bluetooth_Media_Audio Requires: %{name}-sub2-domain_API-Network-Curl Requires: %{name}-sub1-domain_Feature-Diagnostics +Requires: %{name}-sub1-domain_Feature-ISU Requires: %{name}-sub1-domain_Feature-Upgrade Requires: %{name}-sub1-domain_Feature-Setup Requires: tar @@ -181,7 +182,6 @@ Requires: %{name}-sub2-domain_API-Network-Curl #From TRE-2330 Requires: %{name}-sub1-domain_Feature-Diagnostics -Requires: %{name}-sub1-domain_Feature-ISU Requires: %{name}-sub1-domain_Feature-Upgrade Requires: %{name}-sub1-domain_Feature-Setup Requires: tar -- cgit v1.2.3