Skip to content

Commit bfd7e6b

Browse files
authored
[Tizen] Fix SDK installer when more than one CPU is selected (#38098)
1 parent c3a4e1c commit bfd7e6b

File tree

2 files changed

+39
-21
lines changed
  • integrations/docker/images

2 files changed

+39
-21
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
124 : [NXP] Update NXP sdk version
1+
125 : [Tizen] Fix Tizen SDK installer when more than one CPU is selected

integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/install.sh

+38-20
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,24 @@ function install_tizen_sdk_common() {
171171
PKG_ARR=(
172172
"7.0-iot-things-add-ons_*_ubuntu-64.zip")
173173
download "$URL" "${PKG_ARR[@]}"
174+
175+
info "Installing Tizen Studio CLI..."
176+
177+
unzip -o '*.zip'
178+
cp -rf data/* "$TIZEN_SDK_ROOT"
179+
180+
# Cleanup
181+
rm -rf -- *
182+
174183
}
175184

176185
# Function for installing Tizen SDK (arm).
177186
function install_tizen_sdk_arm() {
178187

179-
TIZEN_SDK_SYSROOT="$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core"
188+
SYSROOT="$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core"
180189

181190
# Get toolchain
182-
info "Downloading Tizen toolchain..."
191+
info "Downloading Tizen ARM toolchain..."
183192

184193
# Download
185194
URL="http://download.tizen.org/sdk/tizenstudio/official/binary/"
@@ -189,7 +198,7 @@ function install_tizen_sdk_arm() {
189198
download "$URL" "${PKG_ARR[@]}"
190199

191200
# Get Tizen sysroot
192-
info "Downloading Tizen sysroot..."
201+
info "Downloading Tizen ARM sysroot..."
193202

194203
# Base sysroot
195204
# Different versions of Tizen have different rootstrap versions
@@ -218,7 +227,7 @@ function install_tizen_sdk_arm() {
218227
# Unified packages
219228
URL="http://download.tizen.org/releases/milestone/TIZEN/Tizen-$TIZEN_VERSION/Tizen-$TIZEN_VERSION-Unified/latest/repos/standard/packages/armv7l/"
220229
PKG_ARR=(
221-
'app-core-common-*.rpm'
230+
'app-core-common-*.armv7l.rpm'
222231
'aul-0*.armv7l.rpm'
223232
'aul-devel-*.armv7l.rpm'
224233
'bluetooth-frwk-0*.armv7l.rpm'
@@ -263,31 +272,34 @@ function install_tizen_sdk_arm() {
263272
PKG_ARR=()
264273
download "$URL" "${PKG_ARR[@]}"
265274

266-
# Install all
267-
info "Installing Tizen SDK..."
275+
info "Installing Tizen ARM SDK..."
268276

269277
unzip -o '*.zip'
270278
cp -rf data/* "$TIZEN_SDK_ROOT"
271279

272280
unrpm *.rpm
273-
cp -rf lib usr "$TIZEN_SDK_SYSROOT"
281+
cp -rf lib usr "$SYSROOT"
274282

275283
# Make symbolic links relative
276-
find "$TIZEN_SDK_SYSROOT/usr/lib" -maxdepth 1 -type l | while IFS= read -r LNK; do
284+
find "$SYSROOT/usr/lib" -maxdepth 1 -type l | while IFS= read -r LNK; do
277285
ln -sf "$(basename "$(readlink "$LNK")")" "$LNK"
278286
done
279287

280-
ln -sf ../../lib/libcap.so.2 "$TIZEN_SDK_SYSROOT/usr/lib/libcap.so"
281-
ln -sf openssl3.pc "$TIZEN_SDK_SYSROOT/usr/lib/pkgconfig/openssl.pc"
288+
ln -sf ../../lib/libcap.so.2 "$SYSROOT/usr/lib/libcap.so"
289+
ln -sf openssl3.pc "$SYSROOT/usr/lib/pkgconfig/openssl.pc"
290+
291+
# Cleanup
292+
rm -rf -- *
293+
282294
}
283295

284296
# Function for installing Tizen SDK (arm64).
285297
function install_tizen_sdk_arm64() {
286298

287-
TIZEN_SDK_SYSROOT="$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device64.core"
299+
SYSROOT="$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device64.core"
288300

289301
# Get toolchain
290-
info "Downloading Tizen toolchain..."
302+
info "Downloading Tizen ARM64 toolchain..."
291303

292304
# Download
293305
URL="http://download.tizen.org/sdk/tizenstudio/official/binary/"
@@ -297,7 +309,7 @@ function install_tizen_sdk_arm64() {
297309
download "$URL" "${PKG_ARR[@]}"
298310

299311
# Get Tizen sysroot
300-
info "Downloading Tizen sysroot..."
312+
info "Downloading Tizen ARM64 sysroot..."
301313

302314
# Base sysroot
303315
# Different versions of Tizen have different rootstrap versions
@@ -326,7 +338,7 @@ function install_tizen_sdk_arm64() {
326338
# Unified packages
327339
URL="http://download.tizen.org/releases/milestone/TIZEN/Tizen-$TIZEN_VERSION/Tizen-$TIZEN_VERSION-Unified/latest/repos/standard/packages/aarch64/"
328340
PKG_ARR=(
329-
'app-core-common-*.rpm'
341+
'app-core-common-*.aarch64.rpm'
330342
'aul-0*.aarch64.rpm'
331343
'aul-devel-*.aarch64.rpm'
332344
'bluetooth-frwk-0*.aarch64.rpm'
@@ -372,25 +384,31 @@ function install_tizen_sdk_arm64() {
372384
PKG_ARR=()
373385
download "$URL" "${PKG_ARR[@]}"
374386

375-
# Install all
376-
info "Installing Tizen SDK..."
387+
info "Installing Tizen ARM64 SDK..."
377388

378389
unzip -o '*.zip'
379390
cp -rf data/* "$TIZEN_SDK_ROOT"
380391

392+
info "Installing Tizen ARM64 sysroot..."
393+
381394
unrpm *.rpm
382-
cp -rf lib64 usr "$TIZEN_SDK_SYSROOT"
395+
cp -rf lib64 usr "$SYSROOT"
383396

384397
# Make symbolic links relative
385-
find "$TIZEN_SDK_SYSROOT/usr/lib64" -maxdepth 1 -type l | while IFS= read -r LNK; do
398+
find "$SYSROOT/usr/lib64" -maxdepth 1 -type l | while IFS= read -r LNK; do
386399
ln -sf "$(basename "$(readlink "$LNK")")" "$LNK"
387400
done
388401

389-
ln -sf ../../lib64/libcap.so.2 "$TIZEN_SDK_SYSROOT/usr/lib64/libcap.so"
390-
ln -sf openssl3.pc "$TIZEN_SDK_SYSROOT/usr/lib64/pkgconfig/openssl.pc"
402+
ln -sf ../../lib64/libcap.so.2 "$SYSROOT/usr/lib64/libcap.so"
403+
ln -sf openssl3.pc "$SYSROOT/usr/lib64/pkgconfig/openssl.pc"
404+
405+
# Cleanup
406+
rm -rf -- *
407+
391408
}
392409

393410
function install_tizen_sdk_finalize() {
411+
394412
# Install secret tool or not
395413
if ("$SECRET_TOOL"); then
396414
info "Overriding secret tool..."

0 commit comments

Comments
 (0)