From 4ca5d84aefbb725878138344ac5af8994c4a0edb Mon Sep 17 00:00:00 2001 From: SangYoun Kwak Date: Fri, 19 Jul 2024 09:19:20 +0900 Subject: Modify generate script to copy xml files Conditions: 1. The .xml files are separated as another repository and its install location is under /tmp. 2. The convert32.sh and convert64.sh scripts convert paths in the .xml files as their architecture(ex: /usr/lib -> /usr/lib64) and they searchs .xml files under its abuild directory. According to conditions above, it is unable to convert architecture specific paths of .xml files. Thus, some files are not copied. To solve this problem, .xml files under /tmp are copied to abuild directory. (manipulating .xml files under /tmp directory causes permission problem, so they should be copied beforehand) Change-Id: Iedc303c1720e41e33b2970b765630f7b5080054d Signed-off-by: SangYoun Kwak --- generate_rootstrap.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/generate_rootstrap.sh b/generate_rootstrap.sh index 8262fbc..b2ab78a 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 /tmp/rs_resource --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 /tmp/rs_resource --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 /tmp/rs_resource --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 /tmp/rs_resource --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 /tmp/rs_resource --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." @@ -95,6 +95,8 @@ function generate_rootstrap_riscv64 { function generate_rootstrap { local arch=$1 + cp -r '/tmp/rs_resource' . + case "${arch}" in "arm") generate_rootstrap_arm -- cgit v1.2.3