From 3948210eed321f57c829dc998b51a64347c29f66 Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Tue, 28 Feb 2023 12:16:14 +0100 Subject: [PATCH] [Tizen] Update SDK version to Tizen 7.0 (#25338) * [Tizen] Update SDK version to Tizen 7.0 * Bump version in chip-build-vscode container * Install capi-network-bluetooth from snapshots --- .../images/chip-build-tizen-qemu/Dockerfile | 15 ++++++--- .../docker/images/chip-build-tizen/Dockerfile | 2 +- .../tizen-sdk-installer/install.sh | 31 ++++++++++++------- .../images/chip-build-vscode/Dockerfile | 2 +- integrations/docker/images/chip-build/version | 2 +- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/integrations/docker/images/chip-build-tizen-qemu/Dockerfile b/integrations/docker/images/chip-build-tizen-qemu/Dockerfile index fb88bf618fd50c..1c0ae65f843da5 100644 --- a/integrations/docker/images/chip-build-tizen-qemu/Dockerfile +++ b/integrations/docker/images/chip-build-tizen-qemu/Dockerfile @@ -16,6 +16,8 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ bc \ genisoimage \ + libgmp-dev \ + libmpc-dev \ qemu-system-arm \ # Cleanup && apt-get clean \ @@ -32,13 +34,14 @@ COPY files/0001-smack-add-permissive-mode.patch $TIZEN_SDK_ROOT/files/ RUN set -x \ && mkdir -p /tmp/workdir && cd /tmp/workdir \ # Download Linux rpi4 kernel - && wget --progress=dot:giga -r -nd --no-parent -A 'rpi4-linux-kernel-*.src.rpm' \ - http://download.tizen.org/snapshots/tizen/$TIZEN_VERSION-unified/latest/repos/standard/source/ \ + && wget --progress=dot:giga -r -nd --no-parent -e robots=off -A 'rpi4-linux-kernel-*.src.rpm' \ + http://download.tizen.org/snapshots/TIZEN/Tizen-$TIZEN_VERSION/Tizen-$TIZEN_VERSION-Unified/latest/repos/standard/source/ \ # Prepare kernel source (Linux kernel + Tizen patchset) && unrpm rpi4-linux-kernel-*.src.rpm \ + && rm rpi4-linux-kernel-*.src.rpm \ && tar -xJf linux-kernel-*.tar.xz \ && rm linux-kernel-*.tar.xz \ - && cd linux-kernel-* \ + && cd *linux-kernel-* \ && zcat ../*-to-*.diff.gz | patch -p1 \ && patch -p1 < $TIZEN_SDK_ROOT/files/0001-smack-add-permissive-mode.patch \ # Compile @@ -66,8 +69,8 @@ RUN set -x \ && mkdir -p /tmp/workdir && cd /tmp/workdir \ && SYSTEMD_SYSTEM=/usr/lib/systemd/system \ # Download Tizen images - && wget --progress=dot:giga -r -nd --no-parent -A 'tizen-*.tar.gz' \ - http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/tizen-headless-armv7l/ \ + && wget --progress=dot:giga -r -nd --no-parent -e robots=off -A 'tizen-*.tar.gz' \ + http://download.tizen.org/snapshots/TIZEN/Tizen-$TIZEN_VERSION/Tizen-$TIZEN_VERSION-Unified/latest/images/standard/tizen-headless-armv7l/ \ # Unpack && tar -xzf tizen-*.tar.gz \ && mv system-data.img $TIZEN_IOT_IMAGE_DATA \ @@ -80,6 +83,8 @@ RUN set -x \ && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda glob copy-in \ $TIZEN_SDK_TOOLCHAIN/arm-tizen-linux-gnueabi/lib/libasan.so.* \ $TIZEN_SDK_TOOLCHAIN/arm-tizen-linux-gnueabi/lib/libubsan.so.* \ + $TIZEN_SDK_SYSROOT/usr/lib/libbluetooth-api.so.* \ + $TIZEN_SDK_SYSROOT/usr/lib/libcapi-network-bluetooth.so.* \ $TIZEN_SDK_SYSROOT/usr/lib/libcapi-network-thread.so.* \ $TIZEN_SDK_SYSROOT/usr/lib/libnsd-dns-sd.so.* \ /usr/lib/ \ diff --git a/integrations/docker/images/chip-build-tizen/Dockerfile b/integrations/docker/images/chip-build-tizen/Dockerfile index f0334106b6cbbe..dfa4ddfb37f915 100644 --- a/integrations/docker/images/chip-build-tizen/Dockerfile +++ b/integrations/docker/images/chip-build-tizen/Dockerfile @@ -30,7 +30,7 @@ RUN set -x \ # ------------------------------------------------------------------------------ # Install tizen -ENV TIZEN_VERSION 6.0 +ENV TIZEN_VERSION 7.0 ENV TIZEN_SDK_ROOT /opt/tizen-sdk COPY tizen-sdk-installer $TIZEN_SDK_ROOT/files/installer diff --git a/integrations/docker/images/chip-build-tizen/tizen-sdk-installer/install.sh b/integrations/docker/images/chip-build-tizen/tizen-sdk-installer/install.sh index 99fd9c3334d153..d072e936b14a64 100755 --- a/integrations/docker/images/chip-build-tizen/tizen-sdk-installer/install.sh +++ b/integrations/docker/images/chip-build-tizen/tizen-sdk-installer/install.sh @@ -20,8 +20,8 @@ set -e # Default settings options TIZEN_SDK_ROOT=/opt/tizen-sdk -TIZEN_SDK_DATA_PATH=~/tizen-sdk-data -TIZEN_VERSION=6.0 +TIZEN_SDK_DATA_PATH=$HOME/tizen-sdk-data +TIZEN_VERSION=7.0 SECRET_TOOL=false SCRIPT_NAME=$(basename -- "$(readlink -f "${BASH_SOURCE:?}")") @@ -41,7 +41,7 @@ fi # Help display function function show_help() { echo "Usage: $SCRIPT_NAME [ options .. ]" - echo "Example: $SCRIPT_NAME --tizen-sdk-path ~/tizen-sdk --tizen-version 6.0 --install-dependencies" + echo "Example: $SCRIPT_NAME --tizen-sdk-path ~/tizen-sdk --tizen-version 7.0 --install-dependencies" echo echo "Options:" echo " -h, --help Display this information" @@ -92,7 +92,7 @@ function download() { for PKG in "${@:2}"; do PKGS+=("-A" "$PKG") done - wget -r -nd --no-parent --progress=dot:mega "${PKGS[@]}" "$1" + wget -r -nd --no-parent -e robots=off --progress=dot:mega "${PKGS[@]}" "$1" # Check if the files have been downloaded for PKG in "${@:2}"; do @@ -143,10 +143,10 @@ function install_tizen_sdk() { # Download URL="http://download.tizen.org/sdk/tizenstudio/official/binary/" PKG_ARR=( - 'certificate-encryptor_1.0.7_ubuntu-64.zip' + 'certificate-encryptor_1.0.10_ubuntu-64.zip' 'certificate-generator_0.1.3_ubuntu-64.zip' - 'new-common-cli_2.5.7_ubuntu-64.zip' - 'new-native-cli_2.5.7_ubuntu-64.zip' + 'new-common-cli_2.5.64_ubuntu-64.zip' + 'new-native-cli_2.5.64_ubuntu-64.zip' 'sdb_4.2.23_ubuntu-64.zip') download "$URL" "${PKG_ARR[@]}" @@ -172,7 +172,7 @@ function install_tizen_sdk() { download "$URL" "${PKG_ARR[@]}" # Base packages - URL="http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/armv7l/" + URL="http://download.tizen.org/releases/milestone/TIZEN/Tizen-$TIZEN_VERSION/Tizen-$TIZEN_VERSION-Base/latest/repos/standard/packages/armv7l/" PKG_ARR=( 'iniparser-*.armv7l.rpm' 'libblkid-devel-*.armv7l.rpm' @@ -189,8 +189,9 @@ function install_tizen_sdk() { download "$URL" "${PKG_ARR[@]}" # Unified packages - URL="http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/armv7l/" + URL="http://download.tizen.org/releases/milestone/TIZEN/Tizen-$TIZEN_VERSION/Tizen-$TIZEN_VERSION-Unified/latest/repos/standard/packages/armv7l/" PKG_ARR=( + 'app-core-common-*.rpm' 'aul-0*.armv7l.rpm' 'aul-devel-*.armv7l.rpm' 'bundle-0*.armv7l.rpm' @@ -201,6 +202,8 @@ function install_tizen_sdk() { 'dbus-devel-*.armv7l.rpm' 'dbus-libs-1*.armv7l.rpm' 'glib2-devel-2*.armv7l.rpm' + 'hal-api-common-*.armv7l.rpm' + 'hal-api-sensor-*.armv7l.rpm' 'json-glib-devel-*.armv7l.rpm' 'libcynara-client-*.armv7l.rpm' 'libcynara-commons-*.armv7l.rpm' @@ -212,15 +215,21 @@ function install_tizen_sdk() { 'parcel-0*.armv7l.rpm' 'parcel-devel-*.armv7l.rpm' 'pkgmgr-info-*.armv7l.rpm' + 'sensord-devel-*.armv7l.rpm' + 'sensord-dummy-*.armv7l.rpm' 'vconf-compat-*.armv7l.rpm' 'vconf-internal-keys-devel-*.armv7l.rpm') download "$URL" "${PKG_ARR[@]}" # Unified packages (snapshots) - URL="http://download.tizen.org/snapshots/tizen/unified/latest/repos/standard/packages/armv7l/" + URL="http://download.tizen.org/snapshots/TIZEN/Tizen/Tizen-Unified/latest/repos/standard/packages/armv7l/" PKG_ARR=( + 'bluetooth-frwk-0*.armv7l.rpm' + 'capi-network-bluetooth-0*.armv7l.rpm' + 'capi-network-bluetooth-devel-*.armv7l.rpm' 'capi-network-nsd-*.armv7l.rpm' 'capi-network-thread-*.armv7l.rpm' + 'capi-system-resource-1*.armv7l.rpm' 'libnsd-dns-sd-*.armv7l.rpm') download "$URL" "${PKG_ARR[@]}" @@ -258,7 +267,7 @@ function install_tizen_sdk() { # Information on necessary environment variables warning "Before proceeding with Matter export environment variables as follows:" echo -n "$COLOR_YELLOW" - echo "export TIZEN_VESRSION=\"$TIZEN_VERSION\"" + echo "export TIZEN_VERSION=\"$TIZEN_VERSION\"" echo "export TIZEN_SDK_ROOT=\"$(realpath "$TIZEN_SDK_ROOT")\"" echo "export TIZEN_SDK_TOOLCHAIN=\"\$TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2\"" echo "export TIZEN_SDK_SYSROOT=\"\$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core\"" diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index 213e93d04465d2..3c7f3e5bdd7e7a 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -118,7 +118,7 @@ ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.13.0 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb -ENV TIZEN_VERSION 6.0 +ENV TIZEN_VERSION 7.0 ENV TIZEN_SDK_ROOT /opt/tizen-sdk ENV TIZEN_SDK_TOOLCHAIN $TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2 ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index e60589f4fac21d..f3c882f289ca7a 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.6.42 Version bump reason: [Java] download and install kotlin compiler +0.6.43 Version bump reason: Update Tizen SDK version to 7.0