Arrange the list of headed image for emulator and common target 79/316879/2 accepted/tizen/unified/20241219.102413 accepted/tizen/unified/x/20241219.100946
authorwchang kim <wchang.kim@samsung.com>
Thu, 19 Dec 2024 04:01:04 +0000 (13:01 +0900)
committerwchang kim <wchang.kim@samsung.com>
Thu, 19 Dec 2024 04:40:20 +0000 (13:40 +0900)
Change-Id: Ib9820dae0b2b8c0ecbf1cb25745a11d5d19a7a9b

packaging/platform-preset-iot-headed-images.inc
packaging/platform-preset-iot.inc

index b535414526c32b576d6b7c69ab502ac800409583..5994379a0cb1b801b0393e9d26c89fac51c0d38c 100644 (file)
@@ -6,10 +6,11 @@
 ################################
 %package root-Preset_img_headed
 Summary:    IOT Headed Images
+Suggests:      %{name}-sub1-Preset_img_headed-pkgs
 %ifarch %{arm} aarch64 riscv64
 Suggests:      %{name}-sub1-Preset_img_headed-common
 %endif
-%ifarch %{ix86} x86_64
+%ifarch x86_64
 Suggests:   %{name}-sub1-Preset_img_headed-emulator
 %endif
 
@@ -18,32 +19,12 @@ __EXPAND__: preset
 The IoT Headed Images.
 %files root-Preset_img_headed
 
-
-%ifarch %{arm} aarch64 riscv64
 #############################
-### IOT Headed COMMON ###
+### IOT Headed pkgs ###
 #############################
-%package sub1-Preset_img_headed-common
-Summary:    IOT Headed COMMON Image
-Requires:   %{name}-root-Preset_iot_headed
+%package sub1-Preset_img_headed-pkgs
+Summary:    IOT Headed packages
 
-### BSP ###
-Requires:      %{name}-sub1-Preset_boards-COMMON
-Requires:      %{name}-sub2-Preset_boards-COMMON-Audio
-Requires:      %{name}-sub2-Preset_boards-COMMON-Audio_Recording
-Requires:      %{name}-sub2-Preset_boards-COMMON-BLE
-Requires:      %{name}-sub2-Preset_boards-COMMON-Bluetooth
-Requires:      %{name}-sub2-Preset_boards-COMMON-Bluetooth_CallAudio
-Requires:      %{name}-sub2-Preset_boards-COMMON-Camera
-Requires:      %{name}-sub2-Preset_boards-COMMON-Codec
-Requires:      %{name}-sub2-Preset_boards-COMMON-DALi2
-Requires:      %{name}-sub2-Preset_boards-COMMON-Display
-Requires:      %{name}-sub2-Preset_boards-COMMON-EFL
-Requires:      %{name}-sub2-Preset_boards-COMMON-IM
-Requires:      %{name}-sub2-Preset_boards-COMMON-Sensor
-Requires:      %{name}-sub2-Preset_boards-COMMON-System
-Requires:      %{name}-sub2-Preset_boards-COMMON-System_Device
-Requires:      %{name}-sub2-Preset_boards-COMMON-WifiDirect
 Requires:      alsa-utils
 Requires:      gstreamer-utils
 Requires:      pulseaudio-utils
@@ -60,7 +41,7 @@ Requires:     download-fonts-service
 Requires:      elementary-tools
 Requires:      sensord-profile_common
 #From TRE-3080
-Requires:      system-plugin-backend-deviced-headed
+Requires:      system-plugin-backend-deviced-headed
 Requires: system-plugin-backend-update-control-generic
 
 ### FEATURE ###
@@ -77,8 +58,8 @@ Requires:     %{name}-sub1-domain_Feature-Diagnostics
 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:    building-blocks-sub1-domain_Feature-Upgrade
+# Requires:    building-blocks-sub1-domain_Feature-Recovery
 Requires:      %{name}-sub1-domain_Feature-WebAPI
 Requires:      webapi-plugins-profile_mobile
 Requires:      webapi-plugins-teec
@@ -86,24 +67,28 @@ Requires:   wrtjs
 Requires:      vc-webview-js
 Requires:      vc-webview
 Requires:      lightweight-web-engine-profile_mobile
-Requires:      %{name}-sub1-domain_Feature-Setup
+# Requires:    building-blocks-sub1-domain_Feature-Setup
 Requires:      crash-worker
 Requires:      glibc-locale
 Requires:      memps
 Requires:      psmisc
 Requires:      tizen-debug
 Requires:      tizen-locale
-Requires:      %{name}-sub2-domain_API-Network-SoftAP
-Requires:      %{name}-sub2-Preset_boards-COMMON-UserAwareness
+# Requires:    building-blocks-sub2-domain_API-Network-SoftAP
 #From TRE-2817
 Requires:      %{name}-sub1-domain_Feature-Esplusplayer
 #From TRE-2902
 Requires:      sessiond
 #From TRE-2935
 Requires:      capi-system-resource-plugin
+#From TRE-2538
+Requires:    libpaho-mqtt-c
+Requires:    paho-mqtt-c
+#From TRE-3011
+Requires: email-service-test
 
 ### PARTITION ###
-Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+# Requires:    building-block-sub1-Preset_partition-3parts_ramdisk_recovery
 
 ### Application ###
 Requires:      ug-bluetooth-efl
@@ -121,37 +106,36 @@ Requires: system-servant-profile_common
 Requires:      org.tizen.powerkey-syspopup.common
 Requires:      org.tizen.system-syspopup.common
 Requires:      org.tizen.system-signal-sender
-Requires:      mtp-responder
+# Requires:    mtp-responder
 Requires:      dummyasm
 Requires:      org.tizen.autofilld
 Requires:      inference-engine-opencv
 Requires:      inference-engine-tflite
 Requires:      inference-engine-mlapi
-Requires:      training-engine-nntrainer
+Requires:   training-engine-nntrainer
 Requires:      askuser-notification
 Requires:      %{name}-sub1-domain_Feature-Power_manager
-Requires:      %{name}-sub2-Preset_boards-COMMON-Feedback
 Requires:      security-config-profile_iot_headed
 Requires:      org.tizen.wifi-direct-popup
 Requires:      ug-setting-wifidirect-efl
-Requires:      firmware-update-system-ui-common
-Requires:      initrd-flash
-Requires:      reboot-param-helper
+# Requires:    firmware-update-system-ui-common
+# Requires:    initrd-flash
+# Requires:    reboot-param-helper
 #TRE-2928
-Requires:   dfs-adaptation
-Requires:   dfs-opencv
+Requires:      dfs-adaptation
+Requires:      dfs-opencv
 #TRE-2932
-Requires:   vision-source
+Requires:      vision-source
 #TRE-2938
-Requires:   vision-source-v4l2
+Requires:      vision-source-v4l2
 %ifarch aarch64
 #TRE-2954
-Requires: Open3D
+Requires:      Open3D
 %endif
 #TRE-3033
-Requires:   gst-plugins-good-v4l2
+Requires:      gst-plugins-good-v4l2
 #TRE-3069
-Requires:   nnstreamer-nntrainer-trainer
+Requires:      nnstreamer-nntrainer-trainer
 #From TRE-3084
 Requires:      cbhm
 
@@ -168,264 +152,154 @@ Requires:       fido_silent
 Requires:      coreclr-diagnostics
 %endif
 
+%description sub1-Preset_img_headed-pkgs
+The packages of Tizen IoT Headed.
+%files sub1-Preset_img_headed-pkgs
+
+
+
+%ifarch %{arm} aarch64 riscv64
+#############################
+### IOT Headed COMMON ###
+#############################
+%package sub1-Preset_img_headed-common
+Summary:    IOT Headed COMMON Image
+Requires:   %{name}-root-Preset_iot_headed
+Requires:      %{name}-sub1-Preset_img_headed-pkgs
+
+### BSP ###
+Requires:      %{name}-sub1-Preset_boards-COMMON
+Requires:      %{name}-sub2-Preset_boards-COMMON-Audio
+Requires:      %{name}-sub2-Preset_boards-COMMON-Audio_Recording
+Requires:      %{name}-sub2-Preset_boards-COMMON-BLE
+Requires:      %{name}-sub2-Preset_boards-COMMON-Bluetooth
+Requires:      %{name}-sub2-Preset_boards-COMMON-Bluetooth_CallAudio
+Requires:      %{name}-sub2-Preset_boards-COMMON-Camera
+Requires:      %{name}-sub2-Preset_boards-COMMON-Codec
+Requires:      %{name}-sub2-Preset_boards-COMMON-DALi2
+Requires:      %{name}-sub2-Preset_boards-COMMON-Display
+Requires:      %{name}-sub2-Preset_boards-COMMON-EFL
+Requires:      %{name}-sub2-Preset_boards-COMMON-IM
+Requires:      %{name}-sub2-Preset_boards-COMMON-Sensor
+Requires:      %{name}-sub2-Preset_boards-COMMON-System
+Requires:      %{name}-sub2-Preset_boards-COMMON-System_Device
+Requires:      %{name}-sub2-Preset_boards-COMMON-WifiDirect
+Requires:      %{name}-sub2-Preset_boards-COMMON-UserAwareness
+Requires:      %{name}-sub2-Preset_boards-COMMON-Feedback
+
+Requires:      %{name}-sub1-domain_Feature-Upgrade
+Requires:      %{name}-sub1-domain_Feature-Recovery
+Requires:      %{name}-sub1-domain_Feature-Setup
+Requires:      %{name}-sub2-domain_API-Network-SoftAP
+
+Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+
+Requires:      mtp-responder
+Requires:      firmware-update-system-ui-common
+Requires:      initrd-flash
+Requires:      reboot-param-helper
+
 ### Will be removed ###
 Conflicts:     %{name}-sub1-Preset_img_headless-common
 Conflicts:     %{name}-sub1-Preset_img_headed-emulator
 
 %description sub1-Preset_img_headed-common
-The packages of Tizen IoT Headed for COMMON.
+The packages of Tizen IoT Headed for COMMON target.
 %files sub1-Preset_img_headed-common
 
 %endif
 
-%ifarch %{ix86} x86_64
+%ifarch x86_64
 ###########################
 ### IOT Headed Emulator ###
 ###########################
 %package sub1-Preset_img_headed-emulator
 Summary:    IOT Headed Emulator Image
 Requires:   %{name}-root-Preset_iot_headed
+Requires:      %{name}-sub1-Preset_img_headed-pkgs
+
 ## BSP
 Requires:      %{name}-sub1-Preset_boards-EMUL
-### Multimedia
 Requires:      %{name}-sub2-Preset_boards-EMUL-Audio
 Requires:      %{name}-sub2-Preset_boards-EMUL-Audio_Recording
-Requires:      alsa-utils
-Requires:      gstreamer-utils
-Requires:      pulseaudio-utils
-Requires:      libmm-display
-Requires:      %{name}-sub2-Preset_boards-EMUL-Camera
-Requires:      %{name}-sub2-Preset_boards-EMUL-Codec
-#From TRE-2253
-Requires:      inference-engine-opencv
-Requires:      inference-engine-tflite
-Requires:      capi-media-player-utils
-Requires:      capi-media-transporter-tool
-Requires:      libspeex
-Requires:      GraphicsMagick-c++
-#From TRE-2817
-Requires:      %{name}-sub1-domain_Feature-Esplusplayer
-#From TRE-2927
-Requires:   inference-engine-mlapi
-#From TRE-2956
-Requires:   training-engine-nntrainer
-#From TRE-3075
-Requires:   gst-plugins-good-v4l2
-
-### Network
 Requires:      %{name}-sub2-Preset_boards-EMUL-BLE
 Requires:      %{name}-sub2-Preset_boards-EMUL-Bluetooth
 Requires:      %{name}-sub2-Preset_boards-EMUL-Bluetooth_CallAudio
-Requires:      bluetooth-frwk-plugin-headed
-Requires:      bluetooth-share
-Requires:      org.tizen.bt-syspopup
-Requires:      org.tizen.bt-syspopup-profile_common
-Requires:      capi-network-bluetooth-test
-Requires:      %{name}-sub2-Preset_boards-EMUL-WifiDirect
-Requires:      ug-bluetooth-efl
-Requires:      wifi-efl-ug
-Requires:      %{name}-sub2-Preset_boards-EMUL-Telephony
-Requires:      %{name}-sub2-domain_API-Messaging-Messages
-Requires:      %{name}-sub2-Preset_boards-EMUL-NFC
-Requires:      stc-manager-plugin-appstatus
-Requires:      stc-manager-plugin-exception
-Requires:      stc-manager-plugin-monitor
-Requires:      stc-manager-plugin-procfs
-Requires:      call-manager
-Requires:      libcurl-extension-dlp
-Requires:      net-config-plugin-headed
-Requires:      ug-bluetooth-efl-extension-emulator
-Requires:      ug-setting-mobileap-efl
-Requires:      capi-network-wifi
-Requires:      %{name}-sub2-Preset_boards-EMUL-UserAwareness
-
-### UI_FW
+Requires:      %{name}-sub2-Preset_boards-EMUL-Camera
+Requires:      %{name}-sub2-Preset_boards-EMUL-Codec
 Requires:      %{name}-sub2-Preset_boards-EMUL-DALi2
-Requires:      dali2-toolkit-resources_720x1280
 Requires:      %{name}-sub2-Preset_boards-EMUL-Display
 Requires:      %{name}-sub2-Preset_boards-EMUL-EFL
-Requires:      download-fonts-service
-Requires:      elementary-tools
-Requires:      %{name}-sub2-domain_API-UI-FontConfig
-#From TRE-2077
-Requires:    elm-sharp-theme-common
-Requires:      thorvg
-Requires:      ui-viewmgr
-Requires:      vulkan-wsi-tizen
-Requires:      SDL2_ttf
-#From TRE-3084
-Requires:      cbhm
-
-### UIX
 Requires:      %{name}-sub2-Preset_boards-EMUL-IM
-#From TRE-2064
-Requires:       org.tizen.autofill-setting-mobile
-#From TRE-2067
-Requires:       capi-ui-autofill-manager
-#From TRE-2069
-Requires:    capi-ui-autofill
-Requires:    capi-ui-autofill-common
-Requires:    capi-ui-autofill-service
-#From TRE-2072
-Requires:    autofill-config-mobile
-#From TRE-2076
-Requires:    org.tizen.autofilld
-Requires:      smartreply-service
-
-### Service FW
 Requires:      %{name}-sub2-Preset_boards-EMUL-Sensor
-Requires:    dummyasm
-Requires:      %{name}-sub2-Preset_boards-EMUL-GPS
-
-### System
 Requires:      %{name}-sub2-Preset_boards-EMUL-System
 Requires:      %{name}-sub2-Preset_boards-EMUL-System_Device
-#From TRE-2273
-Requires:    system-servant
-Requires:    system-servant-profile_common
-#From TRE-2437
-Requires:    org.tizen.powerkey-syspopup.common
-Requires:    org.tizen.system-syspopup.common
-Requires:    org.tizen.system-signal-sender
-#From TRE-3080
-Requires:      system-plugin-backend-deviced-headed
-Requires: system-plugin-backend-update-control-generic
-
-
-## Partition
-# Requires:    building-block-sub1-Preset_partition-3parts_ramdisk_recovery
-
-
-## Feature
-Requires:      %{name}-sub1-domain_Feature-BootAni
-Requires:      %{name}-sub1-domain_Feature-ISU
-
-### C# Support
-%if %{dotnet_feature} == "on"
-Requires:      %{name}-sub1-domain_Feature-DotNET
-Requires:      dali2-csharp-binder
-Requires:      dali2-csharp-binder-scene3d
-#From TRE-2449
-Requires:    dali2-csharp-binder-profile_common
-#From TRE-2957
-Requires:       org.tizen.cssetting-autofill
-Requires:      opentk
-%endif
-
-Requires:      %{name}-sub1-domain_Feature-Starter
-Requires:      %{name}-sub1-feature_App-IoT_Headed_Ref_image
-
-### Web API
-Requires:      %{name}-sub1-domain_Feature-WebAPI
-Requires:      webapi-plugins-profile_mobile
-Requires:      webapi-plugins-teec
-Requires:      webapi-plugins-mobile-extension-emulator
-#From TRE-2016
-Requires:    wrtjs
-Requires:      vc-webview-js
-Requires:      vc-webview
-Requires:      lightweight-web-engine-profile_mobile
-
-#From TRE-2330
-Requires:       %{name}-sub1-domain_Feature-Diagnostics
-
-## building-blocks-sub1-domain_Feature-Tool_And_Locale
-Requires:      memps
-Requires:      psmisc
-Requires:      tizen-debug
-Requires:      tizen-locale
-## Applications
-## building-blocks-sub1-feature_App-IoT_Headed_Ref
-Requires:      org.tizen.bluetooth-share-ui
-
-
-#From TRE-1861
-# Requires:    mtp-responder
-#From TRE-2277
-Requires:    askuser-notification
-#From TRE-2358
-Requires:      %{name}-sub1-domain_Feature-Power_manager
-#From TRE-2359
+Requires:      %{name}-sub2-Preset_boards-EMUL-WifiDirect
+Requires:      %{name}-sub2-Preset_boards-EMUL-Telephony
+Requires:      %{name}-sub2-Preset_boards-EMUL-NFC
+Requires:      %{name}-sub2-Preset_boards-EMUL-UserAwareness
+Requires:      %{name}-sub2-Preset_boards-EMUL-GPS
 Requires:      %{name}-sub2-Preset_boards-EMUL-Power
-#From TRE-2397
 Requires:      %{name}-sub2-Preset_boards-EMUL-Feedback
-#From TRE-2461
-Requires:   security-config-profile_iot_headed
-#From TRE-2481
-Requires:    org.tizen.wifi-direct-popup
-Requires:    ug-setting-wifidirect-efl
-
-#Sync with Mobile
-Requires:      freealut
-Requires:      e-mod-tizen-effect
-Requires:      org.tizen.app-selector-profile_mobile
-Requires:      org.tizen.net-popup
-Requires:      org.tizen.fido-syspopup
-Requires:      fido-asm
-Requires:      fido_bt_roaming_agent
-Requires:      fido_silent
-%if %{dotnet_feature} == "on"
-Requires:      coreclr-diagnostics
-%endif
-
-### AppFW
-Requires:      amd-mod-cooldown
-Requires:      amd-mod-loader-manager
-Requires:      app-defined-loader
-Requires:      watch-holder
-Requires:      watch-holder-base
-
-### Security
-Requires:      cert-checker
-Requires:      dpm-application
-Requires:      dpm-auth
-Requires:      dpm-bluetooth
-Requires:      dpm-browser
-Requires:      dpm-email
-Requires:      dpm-location
-Requires:      dpm-media
-Requires:      dpm-security
-Requires:      dpm-storage
-Requires:      dpm-telephony
-Requires:      dpm-usb
-Requires:      dpm-wifi
-Requires:      dpm-zone
-Requires:      drm-service-core-tizen
-Requires:      key-manager-pam-plugin
-Requires:      keyutils
-Requires:      libauth-fw-client-admin
-Requires:      libcynara-monitor
-Requires:      ode-dummy-ksp
-Requires:      privilege-checker
-
 
+##### Emulator #####
+Requires:      webapi-plugins-mobile-extension-emulator
+Requires:      call-manager
+Requires:      net-config-plugin-headed
 #### gdb & etc
 Requires:      gdb
 Requires:      boost-date-time
 Requires:      db4
-%ifnarch %{ix86}
 Requires:      liblsan
-%endif
 Requires:      libpciaccess
 Requires:      lrzsz
 Requires:      python
 Requires:      strace
-%ifarch %{ix86}
-Requires:      swap-manager
-Requires:      swap-modules-emulator32
-Requires:      swap-probe
-Requires:      swap-probe-elf
-%endif
 Requires:      xz
 
-
-### Not Support for emulator
-# Requires:    building-blocks-sub1-domain_Feature-Setup
-# Requires:    building-blocks-sub1-domain_Feature-Recovery
-# Requires:    building-blocks-sub1-domain_Feature-Upgrade
-#From TRE-2524
-# Requires:    firmware-update-system-ui-common
-
+##### Check #####
+# Requires:    libspeex
+# Requires:    GraphicsMagick-c++
+# Requires:    thorvg
+# Requires:    ui-viewmgr
+# Requires:    vulkan-wsi-tizen
+# Requires:    SDL2_ttf
+# Requires:    smartreply-service
+# Requires:    amd-mod-cooldown
+# Requires:    amd-mod-loader-manager
+# Requires:    app-defined-loader
+# Requires:    watch-holder
+# Requires:    watch-holder-base
+# Requires:    cert-checker
+# Requires:    dpm-application
+# Requires:    dpm-auth
+# Requires:    dpm-bluetooth
+# Requires:    dpm-browser
+# Requires:    dpm-email
+# Requires:    dpm-location
+# Requires:    dpm-media
+# Requires:    dpm-security
+# Requires:    dpm-storage
+# Requires:    dpm-telephony
+# Requires:    dpm-usb
+# Requires:    dpm-wifi
+# Requires:    dpm-zone
+# Requires:    drm-service-core-tizen
+# Requires:    key-manager-pam-plugin
+# Requires:    keyutils
+# Requires:    libauth-fw-client-admin
+# Requires:    libcynara-monitor
+# Requires:    ode-dummy-ksp
+# Requires:    privilege-checker
+# Requires:    capi-network-wifi
+# Requires:    building-blocks-sub2-domain_API-Messaging-Messages
+# Requires:    stc-manager-plugin-appstatus
+# Requires:    stc-manager-plugin-exception
+# Requires:    stc-manager-plugin-monitor
+# Requires:    stc-manager-plugin-procfs
+# Requires:    libcurl-extension-dlp
+# Requires:    ug-bluetooth-efl-extension-emulator
+# Requires:    ug-setting-mobileap-efl
 
 Conflicts:     %{name}-sub1-Preset_img_headed-common
 Conflicts:     %{name}-sub1-Preset_img_headless-common
index 180e20b06c6cedadc8a5cbf101a3f0077a3d4fdc..eb132444b9a33bee0cace6562b82f7ab7254dc72 100644 (file)
@@ -317,12 +317,6 @@ Requires:  %{name}-sub2-domain_CSAPI-UIX-VoiceControl
 Requires:      %{name}-sub2-domain_CSAPI-UIX-VoiceControlManager
 Requires:      %{name}-sub2-domain_CSAPI-UIX-Nlp
 %endif
-#From TRE-2538
-Requires:    libpaho-mqtt-c
-Requires:    paho-mqtt-c
-#From TRE-3011
-Requires: email-service-test
-
 %description root-Preset_iot_headed
 The packages of Tizen IoT Headed Common.
 %files root-Preset_iot_headed