From 9116ffd90e07304523a3fe110c93392a1eaf1ef2 Mon Sep 17 00:00:00 2001 From: SangYoun Kwak Date: Tue, 18 Jun 2024 16:09:05 +0900 Subject: Remove useless scripts/files There are some scripts/files that useless/meaningless to use in hal rootstrap. These scripts are removed. Change-Id: Iad384436fe0b00bf4a9f71384a992e0e59ad09d3 Signed-off-by: SangYoun Kwak --- generate_rootstrap.sh | 10 +- make_rootstrap.sh | 161 +----------------- make_rootstrap_64.sh | 163 +----------------- rs_resource/OSS/libexif-rs.xml | 31 ---- rs_resource/OSS/tef-rs.xml | 21 --- script/convert32.sh | 10 -- script/convert64.sh | 10 -- script/rootstrap_gen_1.0.sh | 148 +--------------- script/rootstrap_gen_1.0_64.sh | 148 +--------------- script/rootstrap_info_gen_1.0.sh | 229 ------------------------- script/rootstrap_info_gen_1.0_64.sh | 231 ------------------------- script/rootstrap_plugin_gen_1.0.sh | 270 ----------------------------- script/rootstrap_plugin_gen_1.0_64.sh | 311 ---------------------------------- 13 files changed, 17 insertions(+), 1726 deletions(-) delete mode 100644 rs_resource/OSS/libexif-rs.xml delete mode 100644 rs_resource/OSS/tef-rs.xml delete mode 100755 script/rootstrap_info_gen_1.0.sh delete mode 100755 script/rootstrap_info_gen_1.0_64.sh delete mode 100755 script/rootstrap_plugin_gen_1.0.sh delete mode 100755 script/rootstrap_plugin_gen_1.0_64.sh diff --git a/generate_rootstrap.sh b/generate_rootstrap.sh index 60465ba..f4a1441 100755 --- a/generate_rootstrap.sh +++ b/generate_rootstrap.sh @@ -19,7 +19,7 @@ function generate_rootstrap_ix86 { return $? fi - ./make_rootstrap.sh -C rs-config ./rs_resource --clean --emulator -A i686 + ./make_rootstrap.sh -C rs-config ./rs_resource --emulator -A i686 RET=$? if [[ ${RET} -ne 0 ]]; then echo "Failed to create rootstrap." @@ -35,7 +35,7 @@ function generate_rootstrap_x86_64 { return $? fi - ./make_rootstrap_64.sh -C rs-config ./rs_resource --clean --emulator -A x86_64 + ./make_rootstrap_64.sh -C rs-config ./rs_resource --emulator -A x86_64 RET=$? if [[ ${RET} -ne 0 ]]; then echo "Failed to create rootstrap." @@ -51,7 +51,7 @@ function generate_rootstrap_arm { return $? fi - ./make_rootstrap.sh -C rs-config ./rs_resource --clean --target -A arm + ./make_rootstrap.sh -C rs-config ./rs_resource --target -A arm RET=$? if [[ ${RET} -ne 0 ]]; then echo "Failed to create rootstrap." @@ -67,7 +67,7 @@ function generate_rootstrap_aarch64 { return $? fi - ./make_rootstrap_64.sh -C rs-config ./rs_resource --clean --target -A aarch64 + ./make_rootstrap_64.sh -C rs-config ./rs_resource --target -A aarch64 RET=$? if [[ ${RET} -ne 0 ]]; then echo "Failed to create rootstrap." @@ -83,7 +83,7 @@ function generate_rootstrap_riscv64 { return $? fi - ./make_rootstrap_64.sh -C rs-config ./rs_resource --clean --target -A riscv64 + ./make_rootstrap_64.sh -C rs-config ./rs_resource --target -A riscv64 RET=$? if [[ ${RET} -ne 0 ]]; then echo "Failed to create rootstrap." diff --git a/make_rootstrap.sh b/make_rootstrap.sh index c36ce6e..c2af8b9 100755 --- a/make_rootstrap.sh +++ b/make_rootstrap.sh @@ -1,36 +1,14 @@ #!/bin/bash -DEBUG_MODE=1 - SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})" SCRIPT_FULLPATH="$(readlink -f ${BASH_SOURCE[0]})" SCRIPT_BASE="$(dirname ${SCRIPT_FULLPATH})" SCRIPT_VER="0.0.2" CMD_RS_GEN="${SCRIPT_BASE}/script/rootstrap_gen_1.0.sh" -CMD_RS_INFO="${SCRIPT_BASE}/script/rootstrap_info_gen_1.0.sh" -CMD_RS_PLUGIN="${SCRIPT_BASE}/script/rootstrap_plugin_gen_1.0.sh" CMD_API_FILTER="${SCRIPT_BASE}/script/api_filter.py" CMD_API_GDBUS_FILTER="${SCRIPT_BASE}/script/api_filter_gdbus.py" -DIR_INFO=".info" -DIR_RPM=".rpm" -DIR_PLUGIN=".plugin" -DIR_TMP=".tmp" -DIR_EMULATOR=".emulator" -DIR_TARGET=".target" -DIR_ZIP=".zip" - -PRIVATE_STRING="" - -LOGFILE="rs.log" - -if [ -e ${LOGFILE} ]; then - rm ${LOGFILE}; -fi - -touch ${LOGFILE} - ############################################################################### # function log ############################################################################### @@ -54,16 +32,6 @@ function check_error() fi } -############################################################################### -# function remove_dir -# $@ : Files -# Example : remove_dir test_dir test_file -############################################################################### -function remove_dir () { - echo "remove dir : $@" - rm -rf $@ >/dev/null 2>&1 -} - ############################################################################### ## function callRootstrapGen # $1 : emulator/target @@ -82,67 +50,15 @@ function callRootstrapGen () { FULL_RS_CMD="${CMD_RS_GEN} -t ${1} -u ${2} -b ${3} -q ${BUILD_REQUIRED_INSTALLED_PATH} -r ${GBS_BUILDROOT} -A ${OPT_ARCH} ${xmlList}" fi - FULL_RS_INFO_CMD="${CMD_RS_INFO} -t $1 -l ${xmlList} -p $PLATFORM_PROFILE -v $PLATFORM_VERSION" + log "$FULL_RS_CMD" + $FULL_RS_CMD + check_error $? "Fail to ${CMD_RS_GEN}" - if [[ "${ROOTSTRAP_TYPE}" == "emulator" ]]; then - FULL_CMD_RS_PLUGIN_GEN="${CMD_RS_PLUGIN} -t ${ROOTSTRAP_TYPE} -i .info/$PLATFORM_PROFILE-$PLATFORM_VERSION-emulator.core.dev.xml -p ${PLATFORM_PROFILE} -v ${PLATFORM_VERSION}" - elif [[ "${ROOTSTRAP_TYPE}" == "target" ]]; then - FULL_CMD_RS_PLUGIN_GEN="${CMD_RS_PLUGIN} -t ${ROOTSTRAP_TYPE} -i .info/$PLATFORM_PROFILE-$PLATFORM_VERSION-device.core.dev.xml -p ${PLATFORM_PROFILE} -v ${PLATFORM_VERSION}" - else - exit 1; - fi - - if [[ ${DEBUG_MODE} == "1" ]] - then - log "$FULL_RS_CMD" - $FULL_RS_CMD - check_error $? "Fail to ${CMD_RS_GEN}" - - log "$FULL_RS_INFO_CMD" - $FULL_RS_INFO_CMD - check_error $? "Fail to ${CMD_RS_INFO}" - - log "$FULL_CMD_RS_PLUGIN_GEN" - $FULL_CMD_RS_PLUGIN_GEN - check_error $? "Fail to ${FULL_CMD_RS_PLUGIN_GEN}" - - else - if [[ -e ${LOGFILE} ]]; then - log "$FULL_RS_CMD" | tee -a ${LOGFILE} - fi - $FULL_RS_CMD >/dev/null - check_error $? "Fail to ${CMD_RS_GEN}" - - log "$FULL_RS_INFO_CMD" - $FULL_RS_INFO_CMD >/dev/null - check_error $? "Fail to ${CMD_RS_INFO}" - - log "$FULL_CMD_RS_PLUGIN_GEN" - $FULL_CMD_RS_PLUGIN_GEN >/dev/null - check_error $? "Fail to ${FULL_CMD_RS_PLUGIN_GEN}" - fi - - ##Append Snapshot - if [ -n "${SNAPSHOT_BASE}" ]; then - - log "ADD Snapshot : ${SNAPSHOT_BASE}" - - if [[ "${ROOTSTRAP_TYPE}" == "emulator" ]]; then - echo '' | tee -a .info/$PLATFORM_PROFILE-$PLATFORM_VERSION-emulator.core.dev.xml - elif [[ "${ROOTSTRAP_TYPE}" == "target" ]]; then - echo '' | tee -a .info/$PLATFORM_PROFILE-$PLATFORM_VERSION-device.core.dev.xml - fi - fi - - log "Done... [$SECONDS]Sec" 1>&2 + log "Done... [$SECONDS]Sec" 1>&2 } - -GLOBAL_ERROR="0" OPT_TARGET=false OPT_EMULATOR=false -OPT_DOWNLOAD_RPM=false -OPT_CLEAN=true OPT_CONF="" OPT_ARCH="" INTERNAL=false @@ -155,7 +71,6 @@ function usage () { echo "Usage: $SCRIPT_NAME -C [] [