Skip to content

Commit

Permalink
os/: set different docker version from defconfig
Browse files Browse the repository at this point in the history
After this commit docker image version can be configure using defconfig & menuconfig
  • Loading branch information
gSahitya-samsung authored and sunghan-chang committed Apr 18, 2024
1 parent 852193f commit c5aab54
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
6 changes: 6 additions & 0 deletions lib/libxx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ if LIBCXX
config LIBCXX_EXCEPTION
bool "Enable Exception Suppport"
default y
---help---
Enable exception support in libc++.

NOTE: C++ exception support requires toolchain version 10.3.1. If you
are enabling C++ exception then use docker image version 2.0.0. Use
menuconfig (Build Setup -> Docker Image Version) to set CONFIG_DOCKER_VERSION=2.0.0

config LIBCXX_IOSTREAM_BUFSIZE
int "IO Stream Buffer Size"
Expand Down
14 changes: 14 additions & 0 deletions os/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,20 @@ config DEFAULT_SMALL
have already been selected in your configuration file. This applies
only to new settings that require a default value.

config DOCKER_VERSION
string "Docker Image Version"
default "1.5.8"
---help---
This config indicates docker image version. We have developed distinct
version of docker images tailored to each toolchain required by different
chipset's configs. This approach streamlines development by providing
specific environments that align with the chipset's configs.

NOTE: C++ exception support requires toolchain version 10.3.1. If you are
enabling C++ exception then use docker image version 2.0.0.

Possible Versions: Please check https://hub.docker.com/r/tizenrt/tizenrt

choice
prompt "Build Host Platform"
default HOST_LINUX
Expand Down
16 changes: 11 additions & 5 deletions os/dbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,15 @@ fi
# check docker image and pull docker image
function GET_SPECIFIC_DOCKER_IMAGE()
{

unset CONFIG_DOCKER_VERSION
# check existing docker image for specified version
if [ -f ${CONFIGFILE} ]; then
source ${CONFIGFILE}
if [ -n "$CONFIG_DOCKER_VERSION" ]; then
DOCKER_VERSION=${CONFIG_DOCKER_VERSION}
fi
fi
echo "Check Docker Image"
DOCKER_IMAGES=`docker images | grep 'tizenrt' | awk '{print $1":"$2}'`
for im in ${DOCKER_IMAGES}; do
Expand Down Expand Up @@ -450,7 +458,7 @@ function SELECT_DL
function CONFIGURE()
{
${OSDIR}/tools/configure.sh $1 || exit 1
STATUS=CONFIGURED
UPDATE_STATUS
}

function DOWNLOAD()
Expand All @@ -474,6 +482,8 @@ function UPDATE_STATUS()
STATUS=CONFIGURED
fi
fi
GET_SPECIFIC_DOCKER_IMAGE
echo "Docker Image Version : ${DOCKER_IMAGE}:${DOCKER_VERSION}"
}

function BUILD()
Expand Down Expand Up @@ -521,10 +531,6 @@ function MENU()
done
}


GET_SPECIFIC_DOCKER_IMAGE
echo "Docker Image Version : ${DOCKER_IMAGE}:${DOCKER_VERSION}"

UPDATE_STATUS
if [ -z "$1" ]; then
if [ "$STATUS" != "NOT_CONFIGURED" ]; then
Expand Down

0 comments on commit c5aab54

Please sign in to comment.