From: wchang kim Date: Thu, 22 Nov 2018 02:18:13 +0000 (+0900) Subject: Apply new building-blocks for tizen_5.0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F193560%2F1;p=tools%2Ftbb.git Apply new building-blocks for tizen_5.0 Change-Id: Iee8ac63ac4da3b5606f7ae11c544c11e40b491cb --- diff --git a/board/Config.in b/board/Config.in index a86a4ae..a8f9642 100644 --- a/board/Config.in +++ b/board/Config.in @@ -128,6 +128,10 @@ config TBB_ENABLE_HEADED default n if !(TBB_ENABLE_EFL && TBB_ENABLE_RECORDING && TBB_ENABLE_MM_CONFIG && TBB_ENABLE_BLUETOOTH && TBB_ENABLE_CAMERA \ && TBB_ENABLE_DALi && TBB_ENABLE_IM) +config TBB_ENABLE_ZIGBEE +bool +select building-blocks-sub2-domain_API-Network-ZigBee + if building-blocks-sub1-Preset_boards-ARTIK530 source "board/Config_artik530.in" endif diff --git a/board/Config_artik530.in b/board/Config_artik530.in index baf74c9..96117fa 100644 --- a/board/Config_artik530.in +++ b/board/Config_artik530.in @@ -69,6 +69,7 @@ config building-blocks-sub2-Preset_boards-ARTIK530-Bluetooth_CallAudio help Packages of Bluetooth Call Audio features for ARTIK530 + config building-blocks-sub2-Preset_boards-ARTIK530-Camera bool "ARTIK 530 Camera" select TBB_ENABLE_CAMERA @@ -76,6 +77,13 @@ config building-blocks-sub2-Preset_boards-ARTIK530-Camera help Packages of Camera HAL and Feature for ARTIK530 +config building-blocks-sub2-Preset_boards-ARTIK530-Camera_Headless + bool "ARTIK 530 Camera Headless" + select TBB_ENABLE_CAMERA + depends on building-blocks-sub2-Preset_boards-ARTIK530-Display_Headless + help + Packages of Camera HAL and Feature for ARTIK530 + config building-blocks-sub2-Preset_boards-ARTIK530-Codec bool "ARTIK 530 Codec" select TBB_ENABLE_CODEC @@ -160,4 +168,10 @@ config building-blocks-sub2-Preset_boards-ARTIK530-WifiDirect select TBB_ENABLE_WIFI_DIRECT help Packages of WifiDirect HAL and Feature for ARTIK530 + +config building-blocks-sub2-Preset_boards-ARTIK530-ZigBee + bool "ARTIK 530 ZigBee" + select TBB_ENABLE_ZIGBEE + help + Packages of ZigBee HAL and Feature for ARTIK530 endmenu diff --git a/board/Config_rpi3.in b/board/Config_rpi3.in index fd2b5c9..7e5527b 100644 --- a/board/Config_rpi3.in +++ b/board/Config_rpi3.in @@ -69,6 +69,7 @@ config building-blocks-sub2-Preset_boards-RPI3-Bluetooth_CallAudio help Packages of Bluetooth Call Audio features for RPI3 + config building-blocks-sub2-Preset_boards-RPI3-Camera bool "RPI3 Camera" select TBB_ENABLE_CAMERA @@ -76,6 +77,13 @@ config building-blocks-sub2-Preset_boards-RPI3-Camera help Packages of Camera HAL and Feature for RPI3 +config building-blocks-sub2-Preset_boards-RPI3-Camera_Headless + bool "RPI3 Camera Headless" + select TBB_ENABLE_CAMERA + depends on building-blocks-sub2-Preset_boards-RPI3-Display_Headless + help + Packages of Camera HAL and Feature for RPI3 + config building-blocks-sub2-Preset_boards-RPI3-Codec bool "RPI3 Codec" select TBB_ENABLE_CODEC diff --git a/domain_api/Config_network.in b/domain_api/Config_network.in index fd83894..f1053ea 100644 --- a/domain_api/Config_network.in +++ b/domain_api/Config_network.in @@ -85,6 +85,14 @@ config building-blocks-sub2-domain_API-Network-HTTP Tizen block set of packages for API sets of domain API-Network-HTTP. To use this feature, either Data Network or Wi-Fi connection is required. +config building-blocks-sub2-domain_API-Network-INM + bool "INM" + select building-blocks-sub2-domain_API-Network-WiFi_Manager + help + Intelligent Network Monitoring. + Tizen block set of packages for API sets of domain API-Network-INM. + To use this feature, either Data Network or Wi-Fi connection is required. + config building-blocks-sub2-domain_API-Network-MTP bool "MTP" help @@ -155,6 +163,12 @@ config building-blocks-sub2-domain_API-Network-WiFi_Manager help Tizen block set of packages for API sets of domain API-Network-WiFi_Manager. +config building-blocks-sub2-domain_API-Network-ZigBee + bool "ZigBee" + depends on TBB_ENABLE_ZIGBEE + help + Enabling ZigBee Manager and provide to user ZigBee API. + config net-config-plugin-headed bool default y if(TBB_ENABLE_WIFI && TBB_ENABLE_EFL) diff --git a/domain_api/Config_system.in b/domain_api/Config_system.in index 2f01321..8b3aa10 100644 --- a/domain_api/Config_system.in +++ b/domain_api/Config_system.in @@ -55,18 +55,21 @@ config TBB_SET_no_runtime_info help No Selection Runtime Information -config building-blocks-sub2-domain_API-System-Runtime_information - bool "Runtime Information" +config building-blocks-sub1-domain_Feature-Resource_manager + bool "Runtime Information(Full Featured)" + select building-blocks-sub2-domain_API-System-Runtime_Information help Runtime Information with full feature -config building-blocks-sub2-domain_API-System-Runtime_information_Light +config building-blocks-sub1-domain_Feature-Resource_manager_Light bool "Runtime Information with light feature" + select building-blocks-sub2-domain_API-System-Runtime_Information help Runtime Information with light feature -config building-blocks-sub2-domain_API-System-Runtime_information_Headless +config building-blocks-sub1-domain_Feature-Resource_manager_Headless bool "Runtime Information for Headless device" + select building-blocks-sub2-domain_API-System-Runtime_Information help Runtime Information for Headless device @@ -114,6 +117,11 @@ config building-blocks-sub2-domain_API-System-USB_Host help Tizen block set of packages for Group of sub domain USB_Host +config building-blocks-sub2-domain_API-System-Update_Control + bool "Update Control" + help + Tizen block set of packages for Group of sub domain Update_Control + config building-blocks-sub2-domain_API-System-dlog bool default y diff --git a/domain_api/Config_uix.in b/domain_api/Config_uix.in index a7acf1c..a23b82b 100644 --- a/domain_api/Config_uix.in +++ b/domain_api/Config_uix.in @@ -7,6 +7,13 @@ config building-blocks-sub2-domain_API-UIX-Input_Method This block supports Input Method API for starting IME application lifecycle, methods to interact with current UI state of IME, and getting attributesevents. And a user can manage the installed IMEs in the system. +config building-blocks-sub2-domain_API-UIX-Multi_assistant + bool "Multi Assistant" + select building-blocks-sub2-domain_API-Multimedia-Audio_IO + depends on TBB_ENABLE_RECORDING + help + Multi assistant supports various AI assistants on the same time for giving a better usability and provides common interface for making an assistant of multi-assistant framework. + config building-blocks-sub2-domain_API-UIX-STT bool "STT" select building-blocks-sub2-domain_API-AppFramework-TPK_Installation diff --git a/support/scripts/make_image.sh b/support/scripts/make_image.sh index 92ed585..c08e615 100755 --- a/support/scripts/make_image.sh +++ b/support/scripts/make_image.sh @@ -7,6 +7,8 @@ # echo "Please execute this program with sudo" # return 1 #fi +LAST_P_VER="5.5" +P_VER_LIST="4.0 5.0 5.5" if [ "x$TOPDIR" = "x" ] then @@ -50,17 +52,25 @@ S_VER=$TBB_INFO_SNAPSHOT_ID P_VER=$TBB_INFO_PLATFORM_VERSION P_VER=$P_VER- -echo $P_VER | grep -q "4.0-$" -if [ $? != 0 ] +echo $P_VER | grep -q "${LAST_P_VER}-$" +if [ $? = 0 ] then - echo $P_VER | grep -q "5.0-$" - if [ $? != 0 ] + P_VER="" +else + VALID="0" + for PV in $P_VER_LIST + do + if [ "${PV}-" = "${P_VER}" ] + then + VALID="1" + break + fi + done + if [ $VALID = "0" ] then echo "Invalid platform version : $P_VER" - echo "format is 4.0 or 5.0" + echo -n "format : $P_VER_LIST" exit 2 - else - P_VER="" fi fi @@ -164,7 +174,7 @@ fi ########## function : downlading & update partition ########## PART_FILE=common-3parts-ramdisk-recovery -PART_LOC=https://git.tizen.org/cgit/profile/common/meta/plain/partitions/common-3parts-ramdisk-recovery?h=tizen_4.0 +PART_LOC=https://git.tizen.org/cgit/profile/common/meta/plain/partitions/common-3parts-ramdisk-recovery?h=tizen_5.0 download_update_partition() { if [ ! -e $DOWNDIR/$PART_FILE ] then diff --git a/support/scripts/mk_config_from_xml.sh b/support/scripts/mk_config_from_xml.sh index 316327d..ffcc369 100755 --- a/support/scripts/mk_config_from_xml.sh +++ b/support/scripts/mk_config_from_xml.sh @@ -1,5 +1,7 @@ #!/bin/bash +LATEST_P_VER="5.5" + print_usage() { echo "Usage : mk_config_from_xml.sh " @@ -24,7 +26,7 @@ then source $INFO_DIR/.info_list.txt fi -if [ $TBB_INFO_PLATFORM_VERSION = "5.0" ] +if [ $TBB_INFO_PLATFORM_VERSION = $LATEST_P_VER ] then P_VER="" else