From: wchang kim Date: Thu, 9 Jul 2020 11:05:09 +0000 (+0900) Subject: Initialization for tizen 6.0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F238237%2F1;p=tools%2Ftbb.git Initialization for tizen 6.0 Change-Id: I12fadcc5972d864ae7bc29a2f561d1ba42c2a411 --- diff --git a/Config.in b/Config.in index 85d24cf..d600301 100644 --- a/Config.in +++ b/Config.in @@ -8,6 +8,9 @@ config TBB_VERSION choice prompt "Platform Version" +config TBB_INFO_PLATFORM_VERSION_6.0 + bool "tizen-6.0" + config TBB_INFO_PLATFORM_VERSION_5.0 bool "tizen-5.0" @@ -35,6 +38,7 @@ source "preset/Config.in" #if !TBB_SET_no_preset source "domain_api/Config.in" +source "domain_csapi/Config.in" source "domain_feature/Config.in" source "application/Config.in" #endif diff --git a/Makefile b/Makefile index d51c8e6..36c019d 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ TBB_CONFIG = $(CONFIG_DIR)/.config -include $(TBB_CONFIG) export TBB_VERSION := V1.0 -export TBB_PLATFORM_VERSION := 5.0 +export TBB_PLATFORM_VERSION := 6.0 export TBB_SNAPSHOT_ID := latest # This is our default rule, so must come first diff --git a/README.config-sdk.md b/README.config-sdk.md index 1980e6e..7f65b0a 100644 --- a/README.config-sdk.md +++ b/README.config-sdk.md @@ -4,6 +4,7 @@ $ cd config-sdk 2. Make the list file of building-blocks of which the image consists. +You can get the bb list of your image from ./output/info/.bb_list.txt after making a image. ex) network_audio_list.txt tizeniot_list.txt is full list of building-blocks. diff --git a/README.make_tct_plan.md b/README.make_tct_plan.md index ab42502..a4b2fcf 100644 --- a/README.make_tct_plan.md +++ b/README.make_tct_plan.md @@ -5,13 +5,13 @@ 1. Move the directory of make_tct_plan. $ cd make_tct_plan -2. Make each tct-plan - headless, headed and iotbb. -$ ./mk_iotheadless_plan.sh headless_tc_list.txt -$ ./mk_iotheaded_plan.sh headed_tc_list.txt -$ ./mk_iotbb_plan.sh +2. Make a tct-plan - headless, headed and iotbb. +You can get the bb list of your image from ./output/info/.bb_list.txt after making a image. +usage : mk_iotheadless [profile name] +$ ./mk_iot_plan.sh 6.0 bb_list_speaker.txt speaker -3. Copy all output xml files to TCT manager plan directory. -$ cp *.xml /opt/tct/tizen_native_5.0/manager/plan/ +3. Copy output xml file to TCT manager plan directory. +$ cp *.xml /opt/tct/tizen_native_6.0/manager/plan/ diff --git a/board/Config.in b/board/Config.in index a8f9642..0cc449b 100644 --- a/board/Config.in +++ b/board/Config.in @@ -10,6 +10,7 @@ config building-blocks-sub1-Preset_boards-ARTIK530 bool "ARTIK 530 Board" select building-blocks-sub2-Preset_boards-ARTIK530-System select building-blocks-sub2-Preset_boards-ARTIK530-Wifi + select building-blocks-sub2-Preset_boards-ARTIK530-System_Device select TBB_ENABLE_USB_HOST help ARTIK 530 Board @@ -18,6 +19,7 @@ config building-blocks-sub1-Preset_boards-RPI3 bool "RPI3 Board" select building-blocks-sub2-Preset_boards-RPI3-System select building-blocks-sub2-Preset_boards-RPI3-Wifi + select building-blocks-sub2-Preset_boards-RPI3-System_Device select TBB_ENABLE_USB_HOST help RPI3 Board @@ -25,7 +27,6 @@ endchoice config TBB_ENABLE_MM_CONFIG bool - depends on (TBB_SET_MM_CONFIG_ARTIK530 || TBB_SET_MM_CONFIG_RPI3) config gst-omx bool @@ -57,6 +58,7 @@ config TBB_ENABLE_CODEC bool config TBB_ENABLE_GPS + select building-blocks-sub2-domain_API-System-Feedback bool config TBB_ENABLE_HL_DISPLAY_SERVER @@ -112,8 +114,15 @@ bool config TBB_ENABLE_DALi bool + default n select building-blocks-sub2-domain_API-UI-DALi +config TBB_ENABLE_DALi2 + bool + default n + select building-blocks-sub2-domain_API-UI-DALi2 + + config TBB_ENABLE_VULKAN bool @@ -123,10 +132,8 @@ config TBB_ENABLE_IM config TBB_ENABLE_HEADED bool - default y if (TBB_ENABLE_EFL && TBB_ENABLE_RECORDING && TBB_ENABLE_MM_CONFIG && TBB_ENABLE_BLUETOOTH && TBB_ENABLE_CAMERA \ - && TBB_ENABLE_DALi && TBB_ENABLE_IM) - 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) + default y if (TBB_ENABLE_EFL && TBB_ENABLE_RECORDING && TBB_ENABLE_MM_CONFIG && TBB_ENABLE_BLUETOOTH && TBB_ENABLE_CAMERA && (TBB_ENABLE_DALi || TBB_ENABLE_DALi2) && TBB_ENABLE_IM) + default n if !(TBB_ENABLE_EFL && TBB_ENABLE_RECORDING && TBB_ENABLE_MM_CONFIG && TBB_ENABLE_BLUETOOTH && TBB_ENABLE_CAMERA && (TBB_ENABLE_DALi || TBB_ENABLE_DALi2) && TBB_ENABLE_IM) config TBB_ENABLE_ZIGBEE bool diff --git a/board/Config_rpi3.in b/board/Config_rpi3.in index 7e5527b..189f80e 100644 --- a/board/Config_rpi3.in +++ b/board/Config_rpi3.in @@ -36,7 +36,7 @@ config building-blocks-sub2-Preset_boards-RPI3-Audio_Recording config TBB_SET_MM_CONFIG_RPI3 bool "RPI3 Multimedia configuration" select TBB_ENABLE_MM_CONFIG - select gst-omx + select gst-omx if !TBB_INFO_PLATFORM_VERSION_6.0 select mmfw-sysconf-target-rpi3 select libomxil-vc4 help @@ -50,17 +50,38 @@ config libomxil-vc4 bool depends on TBB_SET_MM_CONFIG_RPI3 -config building-blocks-sub2-Preset_boards-RPI3-BLE - bool "RPI3 BLE" +choice +prompt "Bluetooth Configuration" +config bluez-extension-le + bool "RPI3 Bluetooth BLE" + select building-blocks-sub2-Preset_boards-RPI3-BLE select TBB_ENABLE_BLE help - Packages of BLE HAL and Feature for RPI3 + Only enabing BLE -config building-blocks-sub2-Preset_boards-RPI3-Bluetooth - bool "RPI3 Bluetooth" +config bluez-extension-bredr + bool "RPI3 Bluetooth BREDR" + select building-blocks-sub2-Preset_boards-RPI3-Bluetooth select TBB_ENABLE_BLUETOOTH help - Packages of Bluetooth HAL and Feature for RPI3 + Only enabing BREDR + +config TBB_both_BREDR_and_BLE + bool "RPI3 Bluetooth BREDR and BLE" + select building-blocks-sub2-Preset_boards-RPI3-Bluetooth + select building-blocks-sub2-Preset_boards-RPI3-BLE + select TBB_ENABLE_BLUETOOTH + help + RPI3 Bluetooth BREDR and BLE +endchoice + +config building-blocks-sub2-Preset_boards-RPI3-Bluetooth + bool + default n + +config building-blocks-sub2-Preset_boards-RPI3-BLE + bool + default n config building-blocks-sub2-Preset_boards-RPI3-Bluetooth_CallAudio bool "RPI3 Bluetooth Call Audio" @@ -69,7 +90,6 @@ 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 @@ -99,6 +119,13 @@ config building-blocks-sub2-Preset_boards-RPI3-DALi help Packages of DALi HAL and Feature for RPI3 +config building-blocks-sub2-Preset_boards-RPI3-DALi2 + bool "RPI3 DALi2" + select TBB_ENABLE_DALi2 + depends on building-blocks-sub2-Preset_boards-RPI3-Display + help + Packages of DALi2 HAL and Feature for RPI3 + config building-blocks-sub2-Preset_boards-RPI3-EFL bool "RPI3 EFL" select TBB_ENABLE_EFL @@ -114,10 +141,10 @@ config building-blocks-sub2-Preset_boards-RPI3-Feedback Packages of Feedback HAL and Feature for RPI3 config building-blocks-sub2-Preset_boards-RPI3-GPS - bool "RPI3 GPS is not supported" + bool "RPI3 GPS" select TBB_ENABLE_GPS help - RPI3 does not support GPS + Packages of GPS for RPI3 config building-blocks-sub2-Preset_boards-RPI3-IM bool "RPI3 Input Method" @@ -139,8 +166,14 @@ config building-blocks-sub2-Preset_boards-RPI3-Sensor help RPI3 does not support Sensor +config building-blocks-sub2-Preset_boards-RPI3-Power + bool "RPI3 PASS HAL" + help + Packages for PASS HAL for RPI3 + config building-blocks-sub2-Preset_boards-RPI3-System bool "RPI3 System" + select reboot-param-helper help Packages for System HAL and Feature for RPI3 diff --git a/config-sdk/base_url.config b/config-sdk/base_url.config index 6870377..44de4b3 100644 --- a/config-sdk/base_url.config +++ b/config-sdk/base_url.config @@ -1,9 +1,16 @@ -#tizen 5.0 latest or snapshot +#tizen 5.0 branchout #RS_RESOURCE="rs_resource" -#BASE_REPO="http://download.tizen.org/snapshots/tizen/base/latest/" -#PLATFORM_REPO="http://download.tizen.org/snapshots/tizen/unified/latest" +#BASE_REPO="http://download.tizen.org/snapshots/tizen/5.0-base/latest" +#PLATFORM_REPO="http://download.tizen.org/snapshots/tizen/5.0-unified/latest" #tizen 5.5 branchout +#RS_RESOURCE="rs_resource" +#BASE_REPO="http://download.tizen.org/snapshots/tizen/5.5-base/latest" +#PLATFORM_REPO="http://download.tizen.org/snapshots/tizen/5.5-unified/latest" + +#tizen 6.0 latest or snapshot RS_RESOURCE="rs_resource" -BASE_REPO="http://download.tizen.org/snapshots/tizen/5.5-base/latest" -PLATFORM_REPO="http://download.tizen.org/snapshots/tizen/5.5-unified/latest" +BASE_REPO="http://download.tizen.org/snapshots/tizen/base/latest/" +PLATFORM_REPO="http://download.tizen.org/snapshots/tizen/unified/latest" + + diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/description.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/description.xml index db5fa55..5b581a5 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/description.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/description.xml @@ -5,7 +5,7 @@ tizen_iot - 5.0 + 6.0 org.tizen.nativecore.buildArtefactType.app diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/project/tizen-manifest.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/project/tizen-manifest.xml old mode 100644 new mode 100755 index b726d37..58ccef4 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/project/tizen-manifest.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/IoTjsApp/project/tizen-manifest.xml @@ -1,5 +1,5 @@ - + $(appName).png diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/description.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/description.xml index 31acf16..de01500 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/description.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/description.xml @@ -5,7 +5,7 @@ tizen_iot - 5.5 + 6.0 org.tizen.nativecore.buildArtefactType.app diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/inc/main.h b/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/inc/main.h index 9d90e54..d002fc1 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/inc/main.h +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/inc/main.h @@ -1,5 +1,5 @@ -#ifndef __$(appName)_H__ -#define __$(appName)_H__ +#ifndef __$(appNameWithoutHyphen)_H__ +#define __$(appNameWithoutHyphen)_H__ #include @@ -9,4 +9,4 @@ #define LOG_TAG "$(appName)" -#endif /* __$(appName)_H__ */ +#endif /* __$(appNameWithoutHyphen)_H__ */ diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/tizen-manifest.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/tizen-manifest.xml index a32a638..02877a0 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/tizen-manifest.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/ServiceApp/project/tizen-manifest.xml @@ -1,5 +1,5 @@ - + $(appName).png diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/description.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/description.xml index e6eeee3..933a812 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/description.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/description.xml @@ -5,7 +5,7 @@ tizen_iot - 5.5 + 6.0 org.tizen.nativecore.buildArtefactType.sharedLib diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/project/inc/lib.h b/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/project/inc/lib.h index 9679ffb..42801df 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/project/inc/lib.h +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/SharedLibrary/project/inc/lib.h @@ -1,5 +1,5 @@ -#ifndef _$(appNameUpper)_H_ -#define _$(appNameUpper)_H_ +#ifndef _$(appNameWithoutHyphen)_H_ +#define _$(appNameWithoutHyphen)_H_ /** * This header file is included to define _EXPORT_. @@ -17,5 +17,5 @@ EXPORT_API bool tizen$(appName)(void); #ifdef __cplusplus } #endif -#endif // _$(appNameUpper)_H_ +#endif // _$(appNameWithoutHyphen)_H_ diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/description.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/description.xml index 63ae09a..41eefb6 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/description.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/description.xml @@ -5,7 +5,7 @@ tizen_iot - 5.5 + 6.0 org.tizen.nativecore.buildArtefactType.staticLib diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/project/inc/lib.h b/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/project/inc/lib.h index cd8100f..8cb85b6 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/project/inc/lib.h +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/StaticLibrary/project/inc/lib.h @@ -1,5 +1,5 @@ -#ifndef _$(appNameUpper)_H_ -#define _$(appNameUpper)_H_ +#ifndef _$(appNameWithoutHyphen)_H_ +#define _$(appNameWithoutHyphen)_H_ /** * This header file is included to define _EXPORT_. @@ -16,5 +16,5 @@ extern bool tizen$(appName)(void); #ifdef __cplusplus } #endif -#endif // _$(appNameUpper)_H_ +#endif // _$(appNameWithoutHyphen)_H_ diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/description.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/description.xml index b93ea76..856566a 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/description.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/description.xml @@ -5,7 +5,7 @@ tizen_iot - 5.5 + 6.0 org.tizen.nativecore.buildArtefactType.app diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/project/tizen-manifest.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/project/tizen-manifest.xml index 3069820..c892f82 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/project/tizen-manifest.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-edc-ui/project/tizen-manifest.xml @@ -1,5 +1,5 @@ - + $(appName).png diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/description.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/description.xml index 0925dc6..4d823b2 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/description.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/description.xml @@ -5,7 +5,7 @@ tizen_iot - 5.5 + 6.0 org.tizen.nativecore.buildArtefactType.app diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/project/tizen-manifest.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/project/tizen-manifest.xml index 3069820..c892f82 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/project/tizen-manifest.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/basic-ui/project/tizen-manifest.xml @@ -1,5 +1,5 @@ - + $(appName).png diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/description.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/description.xml index 6df516e..64069fe 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/description.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/description.xml @@ -5,7 +5,7 @@ tizen_iot - 5.5 + 6.0 org.tizen.nativecore.buildArtefactType.app diff --git a/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/project/tizen-manifest.xml b/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/project/tizen-manifest.xml index 26b61e4..1562d52 100755 --- a/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/project/tizen-manifest.xml +++ b/config-sdk/extension/core-add-ons/template/samples/Template/Native/things-app/project/tizen-manifest.xml @@ -1,5 +1,5 @@ - + diff --git a/config-sdk/make_extension.sh b/config-sdk/make_extension.sh index 97e9015..8529e60 100755 --- a/config-sdk/make_extension.sh +++ b/config-sdk/make_extension.sh @@ -5,7 +5,7 @@ source base_url.config if [ $# != 3 ] then echo "Usage : make_extension.sh " - echo " format of platform version : 4.0 , 5.0 or 5.5" + echo " format of platform version : 4.0 , 5.0 , 5.5 or 6.0" exit 1 fi @@ -13,7 +13,13 @@ BB_LIST_FILE=$1 EXT_NAME=$2 VERSION=$3 -MAP_BB_RS_FILE_LOC=https://git.tizen.org/cgit/tools/building-blocks/plain/mapping-bb-rs.xml?h=tizen_${VERSION} +if [ $VERSION == "6.0" ] +then + BRANCH="" +else + BRANCH="_$VERSION" +fi +MAP_BB_RS_FILE_LOC=https://git.tizen.org/cgit/tools/building-blocks/plain/mapping-bb-rs.xml?h=tizen${BRANCH} MAP_BB_RS_FILE=mapping-bb-rs.xml download_mapping_file() @@ -94,9 +100,9 @@ CONFIG_FILE=iot_rs_config # input : version, profile make_config_file() { -if [ $1 != "4.0" -a $1 != "5.0" -a $1 != "5.5" ] +if [ $1 != "4.0" -a $1 != "5.0" -a $1 != "5.5" -a $1 != "6.0" ] then - P_VER="5.5" + P_VER="6.0" else P_VER=$1 fi diff --git a/config-sdk/make_rootstrap.sh b/config-sdk/make_rootstrap.sh index a0228f4..85d0bae 100755 --- a/config-sdk/make_rootstrap.sh +++ b/config-sdk/make_rootstrap.sh @@ -8,8 +8,8 @@ SCRIPT_VER="0.0.2" CMD_RS_GEN="${SCRIPT_BASE}/script/rootstrap_gen_1.0.sh" CMD_RS_INFO="${SCRIPT_BASE}/script/rootstrap_info_gen_1.0.sh" CMD_RS_PLUGIN="${SCRIPT_BASE}/script/rootstrap_plugin_gen_1.0.sh" -CMD_API_FILTER="${SCRIPT_BASE}/script/api_filter_5.5.py" -CMD_API_GDBUS_FILTER="${SCRIPT_BASE}/script/api_filter_5.5_gdbus.py" +CMD_API_FILTER="${SCRIPT_BASE}/script/api_filter_6.0.py" +CMD_API_GDBUS_FILTER="${SCRIPT_BASE}/script/api_filter_6.0_gdbus.py" DIR_INFO=".info" DIR_RPM=".rpm" @@ -329,7 +329,7 @@ if [ "$OPT_TARGET" = true ]; then check_error $? "Failed to remove Non-Public EFL API" fi - if [ "$PLATFORM_VERSION" == "3.0" ] || [ "$PLATFORM_VERSION" == "4.0" ] || [ "$PLATFORM_VERSION" == "5.0" ] || [ "$PLATFORM_VERSION" == "5.5" ] + if [ "$PLATFORM_VERSION" == "3.0" ] || [ "$PLATFORM_VERSION" == "4.0" ] || [ "$PLATFORM_VERSION" == "5.0" ] || [ "$PLATFORM_VERSION" == "5.5" ] || [ "$PLATFORM_VERSION" == "6.0" ] then mv ${DIR_TARGET}/usr/include/asm-arm ${DIR_TARGET}/usr/include/asm mv ${DIR_TARGET}/usr/include/base/deprecated/* ${DIR_TARGET}/usr/include/base/ @@ -376,7 +376,7 @@ if [ "$OPT_EMULATOR" = true ]; then check_error $? "Failed to remove Non-Public EFL API" fi - if [ "$PLATFORM_VERSION" == "3.0" ] || [ "$PLATFORM_VERSION" == "4.0" ] || [ "$PLATFORM_VERSION" == "5.0" ] || [ "$PLATFORM_VERSION" == "5.5" ] + if [ "$PLATFORM_VERSION" == "3.0" ] || [ "$PLATFORM_VERSION" == "4.0" ] || [ "$PLATFORM_VERSION" == "5.0" ] || [ "$PLATFORM_VERSION" == "5.5" ] || [ "$PLATFORM_VERSION" == "6.0" ] then mv ${DIR_EMULATOR}/usr/include/asm-x86 ${DIR_EMULATOR}/usr/include/asm mv ${DIR_EMULATOR}/usr/include/base/deprecated/* ${DIR_EMULATOR}/usr/include/base/ diff --git a/config-sdk/package_all.sh b/config-sdk/package_all.sh index 77d719e..41f786a 100755 --- a/config-sdk/package_all.sh +++ b/config-sdk/package_all.sh @@ -12,16 +12,16 @@ source ./extension/version_info if [ $# != 2 ] then echo "Usage : package_all.sh " - echo " format of platform version : 4.0, 5.0 or 5.5" + echo " format of platform version : 4.0, 5.0 , 5.5 or 6.0" exit 1 fi PROFILE=$1 VERSION=$2 -if [ $VERSION != "4.0" -a $VERSION != "5.0" -a $VERSION != "5.5" ] +if [ $VERSION != "4.0" -a $VERSION != "5.0" -a $VERSION != "5.5" -a $VERSION != "6.0" ] then -VERSION="5.5" +VERSION="6.0" fi @@ -148,14 +148,14 @@ function create_rs_pkginfo() fi #pkginfo.manifest - #Package : tizen_network_audio_armv7l-v1.0-5.5-rs-arm.core + #Package : tizen_network_audio_armv7l-v1.0-6.0-rs-arm.core #Version : 0.0.1 - #OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64 + #OS : ubuntu-64, windows-64, macos-64 #Build-host-os : ubuntu-64 #Maintainer : TizenSDK #Attribute : binary #Uncompressed-size : 69284978 - #Description : tizen 5.5 arm rootstrap for native app development + #Description : tizen 6.0 arm rootstrap for native app development echo "Package : ${RS_PACKAGE_NAME}" >> ${OUTPUT_FILE} echo "Version : ${MINOR_VERSION}" >> ${OUTPUT_FILE} @@ -231,14 +231,14 @@ function create_ndcli_pkginfo() echo -n "" > ${OUTPUT_FILE} fi - #Package : tizen_network_audio_armv7l-v1.0-5.5-NativeAppDevelopment-CLI + #Package : tizen_network_audio_armv7l-v1.0-6.0-NativeAppDevelopment-CLI #Label : Native app. development (CLI) #Version : 0.0.1 #OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64 #Build-host-os : ubuntu-64 #Maintainer : TizenSDK #Attribute : root - #Install-dependency : tizen_network_audio_armv7l-v1.0-5.5-rs-arm.core, tizen_network_audio_armv7l-v1.0-5.5-core-add-ons + #Install-dependency : tizen_network_audio_armv7l-v1.0-6.0-rs-arm.core, tizen_network_audio_armv7l-v1.0-6.0-core-add-ons #Source : meta-extension-components #Uncompressed-size : 8192 #C-SelectedGroup : NativeCLI, NativeToolchain-Gcc-6.2 @@ -311,22 +311,22 @@ function create_nd_pkginfo() echo -n "" > ${OUTPUT_FILE} fi - #Package : tizen_network_audio_armv7l-v1.0-5.5-NativeAppDevelopment + #Package : tizen_network_audio_armv7l-v1.0-6.0-NativeAppDevelopment #Label : Native app. development (IDE) #Version : 0.0.1 - #OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64 + #OS : ubuntu-64, windows-64, macos-64 #Build-host-os : ubuntu-64 #Maintainer : TizenSDK #Attribute : root - #Install-dependency : tizen_network_audio_armv7l-v1.0-5.5-rs-arm.core, tizen_network_audio_armv7l-v1.0-5.5-core-add-ons + #Install-dependency : tizen_network_audio_armv7l-v1.0-6.0-rs-arm.core, tizen_network_audio_armv7l-v1.0-6.0-core-add-ons #Source : meta-extension-components #Uncompressed-size : 8192 - #C-SelectedGroup : tizen_network_audio_armv7l-v1.0-5.5-NativeAppDevelopment-CLI, NativeCLI, NativeIDE, NativeToolchain-Gcc-4.9 - #C-ExtName : tizen_network_audio_armv7l-v1.0-5.5 Native app. development - #C-Platform : 5.5 + #C-SelectedGroup : tizen_network_audio_armv7l-v1.0-6.0-NativeAppDevelopment-CLI, NativeCLI, NativeIDE, NativeToolchain-Gcc-4.9 + #C-ExtName : tizen_network_audio_armv7l-v1.0-6.0 Native app. development + #C-Platform : 6.0 #C-ExtProfile : tizen_network_audio_armv7l-v1.0 #C-DevelopEnv : NativeAppDevelopment - #C-ExtPath : platforms/tizen-5.5/tizen_network_audio_armv7l-v1.0 + #C-ExtPath : platforms/tizen-6.0/tizen_network_audio_armv7l-v1.0 #Description : Tizen Custom Platform IDE. echo "Package : ${ND_PACKAGE_NAME}" >> ${OUTPUT_FILE} @@ -355,7 +355,7 @@ function create_nd_pkginfo() # echo "C-ExtProfile : ${PROFILE}-v${MAIN_VERSION}" >> ${OUTPUT_FILE} echo "C-ExtProfile : ${PROFILE}" >> ${OUTPUT_FILE} echo "C-DevelopEnv : NativeAppDevelopment" >> ${OUTPUT_FILE} -# echo "C-ExtPath : platforms/tizen-5.5/${PROFILE}-v${MAIN_VERSION}" >> ${OUTPUT_FILE} +# echo "C-ExtPath : platforms/tizen-6.0/${PROFILE}-v${MAIN_VERSION}" >> ${OUTPUT_FILE} echo "C-ExtPath : platforms/tizen-${VERSION}/${PROFILE}" >> ${OUTPUT_FILE} echo "Description : Tizen Custom Platform IDE." >> ${OUTPUT_FILE} } @@ -402,14 +402,14 @@ function create_base_pkginfo() echo -n "" > ${OUTPUT_FILE} fi - #Package : tizen_network_audio_armv7l-v1.0-5.5 - #Label : tizen_network_audio_armv7l-v1.0-5.5 + #Package : tizen_network_audio_armv7l-v1.0-6.0 + #Label : tizen_network_audio_armv7l-v1.0-6.0 #Version : 0.0.1 #OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64 #Build-host-os : ubuntu-64 #Maintainer : TizenSDK #Attribute : root - #Install-dependency : tizen_network_audio_armv7l-v1.0-5.5-NativeAppDevelopment, tizen_network_audio_armv7l-v1.0-5.5-NativeAppDevelopment-CLI + #Install-dependency : tizen_network_audio_armv7l-v1.0-6.0-NativeAppDevelopment, tizen_network_audio_armv7l-v1.0-6.0-NativeAppDevelopment-CLI #Source : meta-extension-components #Uncompressed-size : 8192 #Description : Tizen Custom Platform. diff --git a/config-sdk/package_rootstrap.sh b/config-sdk/package_rootstrap.sh index e8e442a..ba1c264 100755 --- a/config-sdk/package_rootstrap.sh +++ b/config-sdk/package_rootstrap.sh @@ -12,7 +12,6 @@ DIR_TMP_SDK_PKG=$(pwd)/".temp_sdk_pkg" DIR_OUTPUT=".pkg" #OS_LIST="ubuntu-32 ubuntu-64 windows-32 windows-64 macos-64" -#OS_LIST="ubuntu-32" OS_LIST="ubuntu-64" DIR_INFO=".info" @@ -286,7 +285,7 @@ function create_pkginfo() echo "$ATTR_VERSION : $VAL_VERSION" | tee -a $FILE_PKGINFO if [[ ${VAL_OS} == "all" ]]; then - echo "$ATTR_OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64" | tee -a $FILE_PKGINFO + echo "$ATTR_OS : ubuntu-64, windows-64, macos-64" | tee -a $FILE_PKGINFO else echo "$ATTR_OS : $VAL_OS" | tee -a $FILE_PKGINFO fi @@ -305,7 +304,7 @@ function usage () { echo "$SCRIPT_NAME ($SCRIPT_VER) is script to package rootstrap for SDK" echo "Usage: $SCRIPT_NAME -C [] [