diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-01-07 23:55:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-01-07 23:55:54 +0000 |
| commit | 939f5d55c0e4e5d9b9f04f341c848cec4e226d6b (patch) | |
| tree | 5188223fbada2e2262834fbfd5da27ba52a2731e | |
| parent | 62b156a0fef7fdb309a6d6cb0291ccd5b49a443e (diff) | |
| parent | bb3cd6d33b47a8aa00ad8dbef0411a7721720872 (diff) | |
merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
and 'f556521018478109967b108bb830f8109aefbb0e'
119 files changed, 529 insertions, 94560 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e0b4c59e5f..d48d2a5726 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -906,7 +906,7 @@ def check_app_exists(app, d): from bb import which, data app = data.expand(app, d) - path = data.getVar('PATH', d) + path = data.getVar('PATH', d, 1) return len(which(path, app)) != 0 def check_gcc3(data): diff --git a/classes/opie_i18n.bbclass b/classes/opie_i18n.bbclass index cb3d07de75..107d090451 100644 --- a/classes/opie_i18n.bbclass +++ b/classes/opie_i18n.bbclass @@ -13,7 +13,7 @@ SRC_URI += "${HANDHELDS_CVS};module=opie/i18n" DEPENDS += "opie-i18n" die () { - echo -e "opie_18n: ERROR: $1" + printf "opie_18n: ERROR: $1\n" exit 1 } @@ -60,21 +60,21 @@ do_build_opie_i18n () { package_name2="`echo "${PN}"| sed "s/^opie\-//;s/\-//"`" test "$package_name" != "$package_name2" && I18N_FILES="${package_name}.ts lib${package_name}.ts opie-${package_name}.ts ${package_name2}.ts lib${package_name2}.ts opie-${package_name2}.ts" test "$package_name" = "$package_name2" && I18N_FILES="${package_name}.ts lib${package_name}.ts opie-${package_name}.ts" - echo -e "I18N Datafiles: ${I18N_FILES} (auto-detected)\nYou can overide the auto-detection by setting I18N_FILES in your .oe file" + printf "I18N Datafiles: ${I18N_FILES} (auto-detected)\nYou can overide the auto-detection by setting I18N_FILES in your .oe file\n" else echo "I18N Datafiles: ${I18N_FILES} (provided by .bb)" fi rm -f "${WORKDIR}/FILES.tmp" "${WORKDIR}/PACKAGES.tmp" - echo -e "\nFILES is set to [${FILES}]\n" + printf "\nFILES is set to [${FILES}]\n\n" for file in ${I18N_FILES} do echo "Working on [$file]" for ts_file in `ls -1 */*.ts | egrep "/$file"` do - echo -e "\tCompiling [$ts_file]" + printf "\tCompiling [$ts_file]\n" cd "${WORKDIR}/i18n/`dirname $ts_file`" || die "[${WORKDIR}/i18n/`dirname $ts_file`] not found" opie-lrelease "`basename $ts_file`" || die "lrelease failed! Make sure that <inherit opie_i18n> or <inherit opie> is *below* <DEPENDS =>!" @@ -82,7 +82,7 @@ do_build_opie_i18n () { # to allow packaging as "_" is not allowed in a package name lang="`echo "$ts_file" | sed -n "s#\(.*\)/ |
