From: wchang kim Date: Fri, 2 Nov 2018 09:00:58 +0000 (+0900) Subject: After tizen 5.0 M2 release, rearrange the tool. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1da134d3c3d462920e49f17d96bd2ddcb6ea7a41;p=tools%2Ftbb.git After tizen 5.0 M2 release, rearrange the tool. Change-Id: Iac40f9724368c0c06d1e13899eb1374751c125fe --- diff --git a/README.config-sdk.md b/README.config-sdk.md index b47b4f4..1980e6e 100644 --- a/README.config-sdk.md +++ b/README.config-sdk.md @@ -7,11 +7,17 @@ $ cd config-sdk ex) network_audio_list.txt tizeniot_list.txt is full list of building-blocks. -3. Build the SDK extension. -Usage : make_extension.sh -$ ./make_extension.sh network_audio_list.txt tznwaudio 5.0 20180509.1 +3. Change configuration file +Please set some variable in base_url.config file. +RS_RESOURCE +BASE_REPO +PLATFORM_REPO -4. Output directory is ./extension +4. Build the SDK extension. +Usage : make_extension.sh +$ ./make_extension.sh network_audio_list.txt tznwaudio 5.0 + +5. Output directory is ./extension Output file is -.zip # How to clean diff --git a/config-sdk/base_url.config b/config-sdk/base_url.config new file mode 100644 index 0000000..6061b3b --- /dev/null +++ b/config-sdk/base_url.config @@ -0,0 +1,9 @@ +#tizen 5.0 latest or snapshot +#RS_RESOURCE="rs_resource" +#BASE_REPO="http://download.tizen.org/snapshots/tizen/base/latest/" +#PLATFORM_REPO="http://download.tizen.org/snapshots/tizen/unified/latest" + +#tizen 5.0 M2 +RS_RESOURCE="rs_resource" +BASE_REPO="http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/" +PLATFORM_REPO="http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/" diff --git a/config-sdk/make_extension.sh b/config-sdk/make_extension.sh index 49404a4..e506384 100755 --- a/config-sdk/make_extension.sh +++ b/config-sdk/make_extension.sh @@ -1,9 +1,10 @@ #!/bin/bash -if [ $# != 4 ] +source base_url.config + +if [ $# != 3 ] then - echo "Usage : make_extension.sh " - echo " format of snapshot id : yyyymmdd.n" + echo "Usage : make_extension.sh " echo " format of platform version : 4.0 or 5.0" exit 1 fi @@ -11,7 +12,6 @@ fi BB_LIST_FILE=$1 EXT_NAME=$2 VERSION=$3 -SNAPSHOT=$4 MAP_BB_RS_FILE_LOC=https://git.tizen.org/cgit/tools/building-blocks/plain/mapping-bb-rs.xml?h=tizen MAP_BB_RS_FILE=mapping-bb-rs.xml @@ -55,14 +55,13 @@ make_rs_list_file() rm -f $TMP_RS_LIST_FILE } -RS_RESOURCE=./rs_resource -RS_TBB=./rs_tbb +RS_TBB="rs_tbb" make_rs_tbb_directory() { ### make directory structure ### rm -rf $RS_TBB - DIR_LIST=`du $RS_RESOURCE | awk '{print $2}' | sed -e 's/rs_resource/rs_tbb/g'` + DIR_LIST=`du $RS_RESOURCE | awk '{print $2}' | sed -e "s/${RS_RESOURCE}/${RS_TBB}/g"` mkdir $RS_TBB for DIRX in $DIR_LIST @@ -81,7 +80,7 @@ make_rs_tbb_directory() then for ITEM in $ORIGIN_LOC do - DEST_LOC=`echo $ITEM | sed -e 's/rs_resource/rs_tbb/g'` + DEST_LOC=`echo $ITEM | sed -e "s/${RS_RESOURCE}/${RS_TBB}/g"` echo "cp -f $ITEM $DEST_LOC" cp -f $ITEM $DEST_LOC done @@ -92,7 +91,7 @@ make_rs_tbb_directory() } CONFIG_FILE=iot_rs_config -# input : version, profile, snapshot +# input : version, profile make_config_file() { if [ $1 != "4.0" -a $1 != "5.0" ] @@ -108,18 +107,15 @@ SNAP=$3 echo "# Rootstrap configraution" > $CONFIG_FILE echo "export PLATFORM_VERSION=\"$P_VER\"" >> $CONFIG_FILE echo "export PLATFORM_PROFILE=\"$PROFILE\"" >> $CONFIG_FILE -if [ $P_VER = "5.0" ] +echo "export BASE_URL_PREFIX=\"${BASE_REPO}\"" >> $CONFIG_FILE +if [ $P_VER = "4.0" ] then -echo "export BASE_URL_PREFIX=\"http://download.tizen.org/snapshots/tizen/base/latest/\"" >> $CONFIG_FILE -echo "export BASE_URL_POSTFIX_TARGET=\"/repos/standard/packages/\"" >> $CONFIG_FILE -echo "export BASE_URL_POSTFIX_EMULATOR=\"/repos/standard/packages/\"" >> $CONFIG_FILE -echo "export SNAPSHOT_URL_PREFIX=\"http://download.tizen.org/snapshots/tizen/unified/tizen-unified_$SNAP/\"" >> $CONFIG_FILE -else -echo "export BASE_URL_PREFIX=\"http://download.tizen.org/snapshots/tizen/4.0-base/latest/\"" >> $CONFIG_FILE echo "export BASE_URL_POSTFIX_TARGET=\"/repos/arm/packages/\"" >> $CONFIG_FILE -echo "export BASE_URL_POSTFIX_EMULATOR=\"/repos/emulator32/packages/\"" >> $CONFIG_FILE -echo "export SNAPSHOT_URL_PREFIX=\"http://download.tizen.org/snapshots/tizen/4.0-unified/tizen-4.0-unified_$SNAP/\"" >> $CONFIG_FILE +else +echo "export BASE_URL_POSTFIX_TARGET=\"/repos/standard/packages/\"" >> $CONFIG_FILE fi +echo "export BASE_URL_POSTFIX_EMULATOR=\"/repos/standard/packages/\"" >> $CONFIG_FILE +echo "export SNAPSHOT_URL_PREFIX=\"${PLATFORM_REPO}/\"" >> $CONFIG_FILE echo "export BASE_PKG_SVR_TARGET=\"\${BASE_URL_PREFIX}\${BASE_URL_POSTFIX_TARGET}\"" >> $CONFIG_FILE echo "export BASE_PKG_SVR_EMULATOR=\"\${BASE_URL_PREFIX}\${BASE_URL_POSTFIX_EMULATOR}\"" >> $CONFIG_FILE @@ -154,7 +150,7 @@ echo "3. Making rs_tbb directory" make_rs_tbb_directory echo "4. Making config file" -make_config_file $VERSION $EXT_NAME $SNAPSHOT +make_config_file $VERSION $EXT_NAME echo "5. Making rootstrap" ./make_rootstrap.sh -C $CONFIG_FILE -c -t ./rs_tbb diff --git a/config-sdk/network_audio_list.txt b/config-sdk/network_audio_list.txt new file mode 100644 index 0000000..a508d61 --- /dev/null +++ b/config-sdk/network_audio_list.txt @@ -0,0 +1,20 @@ +building-blocks-root-Preset_iot_core +building-blocks-sub2-domain_API-AppFramework-Alarm_API +building-blocks-sub2-domain_API-AppFramework-Data_Control_API +building-blocks-sub2-domain_API-AppFramework-Message_Port_API +building-blocks-sub2-domain_API-AppFramework-Notification_API +building-blocks-sub2-domain_API-AppFramework-TPK_Installation +building-blocks-sub2-domain_API-Base-Utils +building-blocks-sub2-domain_API-Multimedia-AudioCore +building-blocks-sub2-domain_API-Multimedia-Configuration +building-blocks-sub2-domain_API-Multimedia-Player +building-blocks-sub2-domain_API-Network-Bluetooth_BREDR +building-blocks-sub2-domain_API-Network-Bluetooth_LE +building-blocks-sub2-domain_API-Network-Bluetooth_Media_Audio +building-blocks-sub2-domain_API-Network-Curl +building-blocks-sub2-domain_API-Network-WiFi +building-blocks-sub2-domain_API-Network-WiFi_Manager +building-blocks-sub2-domain_API-Security-Device_Certificate +building-blocks-sub2-domain_API-System-Storage +building-blocks-sub2-domain_API-UI-Display_Server_Headless +building-blocks-sub2-domain_API-UI-TBM_Surface diff --git a/config-sdk/rs_resource/NativeAPI/capi-base-utils-rs.xml b/config-sdk/rs_resource/NativeAPI/capi-base-utils-rs.xml old mode 100755 new mode 100644 index 99485ba..b56cb1b --- a/config-sdk/rs_resource/NativeAPI/capi-base-utils-rs.xml +++ b/config-sdk/rs_resource/NativeAPI/capi-base-utils-rs.xml @@ -45,6 +45,7 @@ /usr/include/base/utils_i18n_date_interval.h /usr/include/base/utils_i18n_date_interval_format.h /usr/include/base/utils_i18n_simple_date_format.h + /usr/include/base/utils_i18n_loc_disp_names.h /usr/lib/libbase-utils-i18n.so* /usr/include/base diff --git a/config-sdk/rs_resource/NativeAPI/capi-media-controller-rs.xml b/config-sdk/rs_resource/NativeAPI/capi-media-controller-rs.xml index 28c3482..c1cb61d 100644 --- a/config-sdk/rs_resource/NativeAPI/capi-media-controller-rs.xml +++ b/config-sdk/rs_resource/NativeAPI/capi-media-controller-rs.xml @@ -15,6 +15,8 @@ /usr/include/media/media_controller_client.h /usr/include/media/media_controller_server.h /usr/include/media/media_controller_type.h + /usr/include/media/media_controller_playlist.h + /usr/include/media/media_controller_metadata.h /usr/lib/libcapi-media-controller.so* /usr/include/media diff --git a/config-sdk/rs_resource/NativeAPI/capi-network-inm-rs.xml b/config-sdk/rs_resource/NativeAPI/capi-network-inm-rs.xml new file mode 100644 index 0000000..9aa759e --- /dev/null +++ b/config-sdk/rs_resource/NativeAPI/capi-network-inm-rs.xml @@ -0,0 +1,20 @@ + + + taesub.kim@samsung.com + jiung.yu@samsung.com + + + + + + + + + + /usr/include/network/inm.h + /usr/lib/libcapi-network-inm.so* + + /usr/include/network + /usr/lib + libcapi-network-inm.so + diff --git a/config-sdk/rs_resource/NativeAPI/capi-network-zigbee-rs.xml b/config-sdk/rs_resource/NativeAPI/capi-network-zigbee-rs.xml new file mode 100644 index 0000000..ad065c9 --- /dev/null +++ b/config-sdk/rs_resource/NativeAPI/capi-network-zigbee-rs.xml @@ -0,0 +1,22 @@ + + + steve.jun@samsung.com + sareome.kim@samsung.com + + + + + + + + + + /usr/include/network/zigbee.h + /usr/include/network/zigbee-zdo-type.h + /usr/include/network/zigbee-zcl-type.h + /usr/lib/libcapi-network-zigbee.so* + + /usr/include/network + /usr/lib + libcapi-network-zigbee.so + diff --git a/config-sdk/rs_resource/NativeAPI/dali-adaptor-rs.xml b/config-sdk/rs_resource/NativeAPI/dali-adaptor-rs.xml old mode 100755 new mode 100644 diff --git a/config-sdk/rs_resource/NativeAPI/dali-rs.xml b/config-sdk/rs_resource/NativeAPI/dali-rs.xml index 64f47b1..bf880a9 100644 --- a/config-sdk/rs_resource/NativeAPI/dali-rs.xml +++ b/config-sdk/rs_resource/NativeAPI/dali-rs.xml @@ -61,6 +61,7 @@ /usr/include/dali/public-api/events/touch-event.h /usr/include/dali/public-api/events/touch-point.h /usr/include/dali/public-api/events/wheel-event.h + /usr/include/dali/public-api/events/mouse-button.h /usr/include/dali/public-api/images/buffer-image.h /usr/include/dali/public-api/images/encoded-buffer-image.h diff --git a/config-sdk/rs_resource/NativeAPI/dali-toolkit-rs.xml b/config-sdk/rs_resource/NativeAPI/dali-toolkit-rs.xml old mode 100755 new mode 100644 diff --git a/config-sdk/rs_resource/NativeAPI/multi-assistant-rs.xml b/config-sdk/rs_resource/NativeAPI/multi-assistant-rs.xml new file mode 100644 index 0000000..866d624 --- /dev/null +++ b/config-sdk/rs_resource/NativeAPI/multi-assistant-rs.xml @@ -0,0 +1,24 @@ + + + sehwan@samsung.com + wn.jang@samsung.com + sooyeon.kim@samsung.com + stom.hwang@samsung.com + seongrae.jo@samsung.com + + + + + + + + + + /usr/include/multi_assistant.h + /usr/include/multi_assistant_common.h + /usr/lib/libma.so* + + /usr/include + /usr/lib + libma.so + diff --git a/config-sdk/rs_resource/NativeAPI/smartthings-rs.xml b/config-sdk/rs_resource/NativeAPI/smartthings-rs.xml new file mode 100644 index 0000000..c609450 --- /dev/null +++ b/config-sdk/rs_resource/NativeAPI/smartthings-rs.xml @@ -0,0 +1,47 @@ + + + wchang.kim@samsung.com + + + + + + + + + + + + + + + + + + + + /usr/lib/libcapi-network-softap.so + /usr/lib/libconnectivity_abstraction.so + /usr/lib/libmbedtls.so + /usr/lib/liboc.so + /usr/lib/liboc_logger.so + /usr/lib/liboc_logger_core.so + /usr/lib/libocpmapi.so + /usr/lib/libocprovision.so + /usr/lib/liboctbstack.so + /usr/lib/libalarm.so* + /usr/lib/libdevice-certificate-manager.so* + + /usr/lib + libcapi-network-softap.so + libconnectivity_abstraction.so + libmbedtls.so + liboc.so + liboc_logger.so + liboc_logger_core.so + libocpmapi.so + libocprovision.so + liboctbstack.so + libalarm.so + libdevice-certificate-manager.so + diff --git a/config-sdk/rs_resource/NativeAPI/update-control-rs.xml b/config-sdk/rs_resource/NativeAPI/update-control-rs.xml new file mode 100644 index 0000000..9558941 --- /dev/null +++ b/config-sdk/rs_resource/NativeAPI/update-control-rs.xml @@ -0,0 +1,20 @@ + + + knhoon.baik@samsung.com + sunm.lee@samsung.com + + + + + + + + + + /usr/include/system/update_control.h + /usr/lib/libupdate-control.so* + + /usr/include/system + /usr/lib + libupdate-control.so + diff --git a/config-sdk/rs_resource/OSS/SDL2-rs.xml b/config-sdk/rs_resource/OSS/SDL2-rs.xml index e888f75..2e521cf 100644 --- a/config-sdk/rs_resource/OSS/SDL2-rs.xml +++ b/config-sdk/rs_resource/OSS/SDL2-rs.xml @@ -82,6 +82,7 @@ /usr/include/SDL2/SDL_types.h /usr/include/SDL2/SDL_version.h /usr/include/SDL2/SDL_video.h + /usr/include/SDL2/SDL_vulkan.h /usr/lib/libSDL2.so* /usr/lib/libSDL2-2.0.so.0* /usr/lib/libSDL2main.a diff --git a/config-sdk/rs_resource/OSS/baserpm/libcurl-rs.xml b/config-sdk/rs_resource/OSS/baserpm/libcurl-rs.xml old mode 100755 new mode 100644 diff --git a/config-sdk/rs_resource/OSS/baserpm/libicu-rs.xml b/config-sdk/rs_resource/OSS/baserpm/libicu-rs.xml old mode 100755 new mode 100644 index 22b39d3..97aee26 --- a/config-sdk/rs_resource/OSS/baserpm/libicu-rs.xml +++ b/config-sdk/rs_resource/OSS/baserpm/libicu-rs.xml @@ -29,7 +29,7 @@ /usr/lib/libicutu.so* /usr/lib/libicuuc.so* - /usr/include/unicode + /usr/include /usr/lib libicudata.so libicui18n.so diff --git a/config-sdk/rs_resource/OSS/harfbuzz-rs.xml b/config-sdk/rs_resource/OSS/harfbuzz-rs.xml old mode 100755 new mode 100644 diff --git a/config-sdk/tizeniot_list.txt b/config-sdk/tizeniot_list.txt index 5cd0d09..08fcabd 100644 --- a/config-sdk/tizeniot_list.txt +++ b/config-sdk/tizeniot_list.txt @@ -11,6 +11,7 @@ building-blocks-sub2-domain_API-AppFramework-Badge_API building-blocks-sub2-domain_API-AppFramework-Data_Control_API building-blocks-sub2-domain_API-AppFramework-Event_API building-blocks-sub2-domain_API-AppFramework-External_Storage_Installation +building-blocks-sub2-domain_API-AppFramework-Job_Scheduler_API building-blocks-sub2-domain_API-AppFramework-Media_Key_API building-blocks-sub2-domain_API-AppFramework-Message_Port_API building-blocks-sub2-domain_API-AppFramework-Native_EFL_UI_app_model @@ -82,15 +83,18 @@ building-blocks-sub2-domain_API-Network-Connection building-blocks-sub2-domain_API-Network-Curl building-blocks-sub2-domain_API-Network-DNSSD building-blocks-sub2-domain_API-Network-HTTP +building-blocks-sub2-domain_API-Network-INM building-blocks-sub2-domain_API-Network-IoTCon building-blocks-sub2-domain_API-Network-MTP building-blocks-sub2-domain_API-Network-NFC building-blocks-sub2-domain_API-Network-SSDP building-blocks-sub2-domain_API-Network-STC building-blocks-sub2-domain_API-Network-Smartcard +building-blocks-sub2-domain_API-Network-SoftAP building-blocks-sub2-domain_API-Network-VPN_Service building-blocks-sub2-domain_API-Network-WiFi_Direct building-blocks-sub2-domain_API-Network-WiFi_Manager +building-blocks-sub2-domain_API-Network-ZigBee building-blocks-sub2-domain_API-Security-CSR building-blocks-sub2-domain_API-Security-Device_Certificate building-blocks-sub2-domain_API-Security-Device_Policy @@ -101,15 +105,10 @@ building-blocks-sub2-domain_API-Security-YACA building-blocks-sub2-domain_API-Social-Calendar building-blocks-sub2-domain_API-Social-Contacts building-blocks-sub2-domain_API-Social-Phonenumber_utils -building-blocks-sub2-domain_API-System-Device_Battery -building-blocks-sub2-domain_API-System-Device_Callback -building-blocks-sub2-domain_API-System-Device_Display +building-blocks-sub2-domain_API-System-Device building-blocks-sub2-domain_API-System-Device_Haptic -building-blocks-sub2-domain_API-System-Device_IR -building-blocks-sub2-domain_API-System-Device_Led -building-blocks-sub2-domain_API-System-Device_Power building-blocks-sub2-domain_API-System-Feedback -building-blocks-sub2-domain_API-System-Runtime_information +building-blocks-sub2-domain_API-System-Runtime_Information building-blocks-sub2-domain_API-System-Sensor_Listener building-blocks-sub2-domain_API-System-Sensor_Recorder building-blocks-sub2-domain_API-System-Storage @@ -117,12 +116,13 @@ building-blocks-sub2-domain_API-System-System_Information building-blocks-sub2-domain_API-System-System_Settings building-blocks-sub2-domain_API-System-T_Trace building-blocks-sub2-domain_API-System-USB_Host +building-blocks-sub2-domain_API-System-Update_Control building-blocks-sub2-domain_API-System-dlog building-blocks-sub2-domain_API-UI-Cairo building-blocks-sub2-domain_API-UI-Clipboard_History_Manager building-blocks-sub2-domain_API-UI-DALi building-blocks-sub2-domain_API-UI-Display_Server -building-blocks-sub2-domain_API-UI-WidgetViewerDALi +building-blocks-sub2-domain_API-UI-Display_Server_Headless building-blocks-sub2-domain_API-UI-EFL_ELM_Accessbility building-blocks-sub2-domain_API-UI-EFL_Extension building-blocks-sub2-domain_API-UI-EFL_MainLoop @@ -138,10 +138,13 @@ building-blocks-sub2-domain_API-UI-TBM_Surface building-blocks-sub2-domain_API-UI-Tizen_WS_Shell building-blocks-sub2-domain_API-UI-UI_View_Manager building-blocks-sub2-domain_API-UI-Vulkan +building-blocks-sub2-domain_API-UI-WidgetViewerDALi building-blocks-sub2-domain_API-UIX-Input_Method +building-blocks-sub2-domain_API-UIX-Multi_assistant building-blocks-sub2-domain_API-UIX-STT building-blocks-sub2-domain_API-UIX-TTS building-blocks-sub2-domain_API-UIX-Voice_control building-blocks-sub2-domain_API-UIX-Voice_control_elementary building-blocks-sub2-domain_API-Web-WebView building-blocks-sub2-domain_API-Web-json_Glib +building-blocks-sub1-domain_Feature-Smartthings_App diff --git a/domain_feature/Config.in b/domain_feature/Config.in index 968f717..6b5c71c 100644 --- a/domain_feature/Config.in +++ b/domain_feature/Config.in @@ -1,7 +1,7 @@ menu "Tizen Platform Internal Feature Sets" source domain_feature/Config_bootani.in source domain_feature/Config_dotnet.in -source domain_feature/Config_softap.in +source domain_feature/Config_smartthings.in source domain_feature/Config_starter.in source domain_feature/Config_upgrade.in source domain_feature/Config_recovery.in diff --git a/domain_feature/Config_smartthings.in b/domain_feature/Config_smartthings.in new file mode 100644 index 0000000..7c26698 --- /dev/null +++ b/domain_feature/Config_smartthings.in @@ -0,0 +1,4 @@ +config building-blocks-sub1-domain_Feature-Smartthings_App + bool "Smartthing App supoort packages" + help + Tizen block set of packages for supporting to make Smartthings_app diff --git a/domain_feature/Config_softap.in b/domain_feature/Config_softap.in deleted file mode 100644 index d502b61..0000000 --- a/domain_feature/Config_softap.in +++ /dev/null @@ -1,4 +0,0 @@ -config building-blocks-sub1-domain_Feature-SoftAP - bool "SoftAP feature packages" - help - Tizen block set of packages for supporting soft AP