From 42d91a7db404bacc50541e1813c537d9c260ffb4 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Thu, 20 Sep 2012 12:56:59 +0300 Subject: Replace "echo -e" with "printf" to have the same behavior in dash or bash oe-core removed the prerequisite to have sh as bash. POSIX doesn't define any options and furthermore allows 'echo -e' to be the default behavior. This means that in dash 'echo -e' will actually print '-e' and interpret backslashes by default. We use instead 'printf' builtin command with or without '\n' to simulate 'echo -e' or 'echo -n'. 'printf' needs format while 'echo' can be used without any arguments. So 'echo >' was replaced by 'printf "" >'. 'echo' without '-n' flag adds a new line by default so to keep the same behavior of two new lines while using 'echo "\n"', 'printf "\n\n"' is used. [YOCTO #3138] (From OE-Core rev: a19880ad10ccb5d7d909dcf9de5c3dc58a0ebcd3) Signed-off-by: Andrei Gherzan Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/classes/populate_sdk_base.bbclass') diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 1c151d7186..2bff41f9e6 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -118,7 +118,7 @@ fakeroot create_shar() { DEFAULT_INSTALL_DIR="${SDKPATH}" -echo -n "Enter target directory for Poky SDK (default: $DEFAULT_INSTALL_DIR): " +printf "Enter target directory for Poky SDK (default: $DEFAULT_INSTALL_DIR): " read target_sdk_dir if [ "$target_sdk_dir" = "" ]; then @@ -128,7 +128,7 @@ fi eval target_sdk_dir=$target_sdk_dir target_sdk_dir=$(readlink -m $target_sdk_dir) -echo -n "You are about to install Poky SDK to \"$target_sdk_dir\". Proceed[Y/n]?" +printf "You are about to install Poky SDK to \"$target_sdk_dir\". Proceed[Y/n]?" read answer if [ "$answer" = "" ]; then @@ -148,11 +148,11 @@ fi payload_offset=$(($(grep -na -m1 "^MARKER:$" $(basename $0)|cut -d':' -f1) + 1)) -echo -n "Extracting SDK..." +printf "Extracting SDK..." tail -n +$payload_offset $(basename $0) | tar xj --strip-components=4 -C $target_sdk_dir echo "done" -echo -n "Setting it up..." +printf "Setting it up..." # fix environment paths env_setup_script=$(find $target_sdk_dir -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}") sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script -- cgit v1.2.3-54-g00ecf