From: sunghan Date: Mon, 28 Aug 2017 05:50:54 +0000 (+0900) Subject: move mkromfsimg.sh script and contents folder to tools/fs folder X-Git-Tag: 1.1_Public_Release~324^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7196a24831673538327a59aafee6773a13c7df57;p=rtos%2Ftinyara.git move mkromfsimg.sh script and contents folder to tools/fs folder The location of them is not correct. ROMFS is not a part of application and external so that we move them to under tools folder. --- diff --git a/build/configs/artik053/README.md b/build/configs/artik053/README.md index d355182..1e50211 100644 --- a/build/configs/artik053/README.md +++ b/build/configs/artik053/README.md @@ -91,7 +91,7 @@ openocd -f artik053.cfg -c ' \ ## ROMFS -Before executing below steps, execute [generic steps](../../../external/contents/README.md), step 1 and step 2. +Before executing below steps, execute [generic steps](../../../tools/fs/README_ROMFS.md), step 1 and step 2. 3. Modify partition configs. Below steps creates ROMFS partition with size 400KB at next of user partition. @@ -110,7 +110,7 @@ Before executing below steps, execute [generic steps](../../../external/contents 4. Build Tizen RT 5. Prepare ROM image ```bash - sh $TIZENRT_BASEDIR/../apps/tools/mkromfsimg.sh + sh $TIZENRT_BASEDIR/../tools/fs/mkromfsimg.sh ``` 6. Modify partition map to *$TIZENRT_BASEDIR/../build/configs/artik053/tools/openocd/partition_map.cfg* ```bash diff --git a/build/configs/sidk_s5jt200/README.md b/build/configs/sidk_s5jt200/README.md index 9941142..da04507 100644 --- a/build/configs/sidk_s5jt200/README.md +++ b/build/configs/sidk_s5jt200/README.md @@ -111,7 +111,7 @@ make download ALL ## ROMFS -Before executing below steps, execute [generic steps](../../../external/contents/README.md), step 1 and step 2. +Before executing below steps, execute [generic steps](../../../tools/fs/README_ROMFS.md), step 1 and step 2. 3. Modify partition configs. Below steps creates ROMFS partition with size 256KB at the end, diff --git a/build/configs/sidk_s5jt200/sidk_s5jt200_download.sh b/build/configs/sidk_s5jt200/sidk_s5jt200_download.sh index 81c3bd2..012a17a 100755 --- a/build/configs/sidk_s5jt200/sidk_s5jt200_download.sh +++ b/build/configs/sidk_s5jt200/sidk_s5jt200_download.sh @@ -34,7 +34,7 @@ OUTPUT_BIN_PATH=${BUILD_DIR_PATH}/output/bin BOARD_DIR_PATH=${BUILD_DIR_PATH}/configs/${BOARD_NAME} OPENOCD_DIR_PATH=${BOARD_DIR_PATH}/tools/openocd FW_DIR_PATH=${BOARD_DIR_PATH}/boot_bin -RESOURCE_DIR_PATH=${OS_DIR_PATH}/../external/contents +RESOURCE_DIR_PATH=${OS_DIR_PATH}/../tools/fs/contents SYSTEM_TYPE=`getconf LONG_BIT` if [ "$SYSTEM_TYPE" = "64" ]; then @@ -54,7 +54,7 @@ prepare_resource() cp -rf ${RESOURCE_DIR_PATH}/* ${OUTPUT_PATH}/res/ # create romfs.img - sh ${OS_DIR_PATH}/../apps/tools/mkromfsimg.sh + sh ${OS_DIR_PATH}/../tools/fs/mkromfsimg.sh fi } diff --git a/docs/HowToUseROMFS.md b/docs/HowToUseROMFS.md index e628ac6..67f9393 100644 --- a/docs/HowToUseROMFS.md +++ b/docs/HowToUseROMFS.md @@ -5,7 +5,7 @@ There are two parts to use ROMFS, generic and board specific. ## 1. Generic This part supports making ROMFS image. -Please find it at [README](../external/contents/README.md) +Please find it at [README](../tools/fs/README_ROMFS.md) ## 2. Board Specific diff --git a/os/tools/mksmartfsimg.sh b/os/tools/mksmartfsimg.sh index f37a169..39d77f9 100755 --- a/os/tools/mksmartfsimg.sh +++ b/os/tools/mksmartfsimg.sh @@ -24,6 +24,7 @@ source .config BOARDNAME=$CONFIG_ARCH_BOARD POSTFIX=_smartfs.bin BINNAME=$BOARDNAME$POSTFIX +CONTENTSDIR=../tools/fs/contents blkcount=8192 @@ -32,8 +33,8 @@ echo "mksmartfsimg.sh : $BINNAME, Target Board: $BOARDNAME" echo " - block count := $blkcount (bs=1024)" echo "=============================================================" -if [ ! -d ../external/contents/$BOARDNAME/mnt ]; then -mkdir ../external/contents/$BOARDNAME/mnt/ +if [ ! -d $CONTENTSDIR/$BOARDNAME/mnt ]; then +mkdir $CONTENTSDIR/$BOARDNAME/mnt/ fi # Making image file @@ -43,12 +44,12 @@ dd if=/dev/zero of=../build/bin/$BINNAME bs=1024 count=$blkcount tools/nxfuse -t smartfs -g 1 -m ../build/bin/$BINNAME # Mounting mnt -tools/nxfuse -t smartfs ../external/contents/$BOARDNAME/mnt ../build/bin/$BINNAME +tools/nxfuse -t smartfs $CONTENTSDIR/$BOARDNAME/mnt ../build/bin/$BINNAME # Copying files to smartfs file system -cp -rf ../external/contents/$BOARDNAME/base-files/* ../external/contents/$BOARDNAME/mnt/ +cp -rf $CONTENTSDIR/$BOARDNAME/base-files/* $CONTENTSDIR/$BOARDNAME/mnt/ # Unmounting sleep 2 -fusermount -u ../external/contents/$BOARDNAME/mnt +fusermount -u $CONTENTSDIR/$BOARDNAME/mnt echo "DONE" diff --git a/external/contents/README.md b/tools/fs/README_ROMFS.md similarity index 88% rename from external/contents/README.md rename to tools/fs/README_ROMFS.md index 854a38e..6063ee4 100644 --- a/external/contents/README.md +++ b/tools/fs/README_ROMFS.md @@ -12,7 +12,7 @@ Select menu. File Systems -> ROMFS to y ``` -2. Put your contents at *external/contents* folder. +2. Put your contents at *tools/fs/contents* folder. After these two steps, board specific steps should be executed. diff --git a/apps/tools/mkromfsimg.sh b/tools/fs/mkromfsimg.sh similarity index 99% rename from apps/tools/mkromfsimg.sh rename to tools/fs/mkromfsimg.sh index ff6549d..017078f 100755 --- a/apps/tools/mkromfsimg.sh +++ b/tools/fs/mkromfsimg.sh @@ -17,7 +17,7 @@ # ########################################################################### ############################################################################ -# apps/tools/mkromfsimg.sh +# tools/fs/mkromfsimg.sh # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt