diff options
| author | Andrei Gherzan <andrei@gherzan.ro> | 2012-09-20 12:56:59 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-20 13:18:19 +0100 |
| commit | a19880ad10ccb5d7d909dcf9de5c3dc58a0ebcd3 (patch) | |
| tree | df84bd192b722295630191c120d7bf65101d2134 /meta/recipes-extended | |
| parent | 6d8aeb0c9b939082cc8d54a940d615b33d81348d (diff) | |
| download | openembedded-core-a19880ad10ccb5d7d909dcf9de5c3dc58a0ebcd3.tar.gz openembedded-core-a19880ad10ccb5d7d909dcf9de5c3dc58a0ebcd3.tar.bz2 openembedded-core-a19880ad10ccb5d7d909dcf9de5c3dc58a0ebcd3.zip | |
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]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/lsb/lsb_4.1.bb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 3a323e7e15..1729c78a20 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb @@ -106,10 +106,10 @@ do_archgen () { continue;; esac if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then - echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h + printf " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h echo "(_${each_arch});" | tr - _ >> zypp/oe-arch.h else - echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h + printf " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h echo "( IdString ( \"${each_arch}\" ) );" | tr - _ >> zypp/oe-arch.h fi done diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index a3242db708..55ea241783 100644 --- a/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb @@ -31,12 +31,12 @@ do_install(){ mkdir -p ${D}${base_bindir} mkdir -p ${D}/${baselib} mkdir -p ${D}${sysconfdir}/lsb-release.d - echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release + printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release if [ "${TARGET_ARCH}" = "i586" ];then - echo -n "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release + printf "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release else - echo -n "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release + printf "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release fi echo "\"" >> ${D}${sysconfdir}/lsb-release echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release |