[oe-commits] org.oe.dev -----------------------------------------------------------------
freyther commit
openembedded-commits at lists.openembedded.org
Fri Jan 11 11:22:46 UTC 2008
-----------------------------------------------------------------
Revision: a6a229a30536ec1d025937b05457059b0bf4b55d
Ancestor: f8b45e41b7c3f72fd7943d9c7093b0a85dc6b5fd
Author: freyther at openembedded.org
Date: 2008-01-07T18:25:55
Branch: org.openembedded.dev
Modified files:
classes/opie_i18n.bbclass classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass packages/dpkg/dpkg.inc
packages/freenote/freenote_1.12.0.bb
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/helloworld/helloworld_1.0.0.bb
packages/kdepimpi/kdepimpi-base.inc
packages/knights/knights_1.14.bb
packages/mgetty/mgetty_1.1.30.bb
packages/nonworking/imkit/imkit_0.4.5.bb
packages/nunome/nunome_1.0.2.bb
packages/python/python-pyqt_4.3.3.bb
packages/python/python24-pyqt2_3.13.bb
packages/python/python24-pyqwt2_3.10.bb
packages/qpe-games/crossword_0.0.3.bb
packages/slutils/slutils_0.1.0.bb
Bashism fix: echo -e is a bashism and doesn't work when /bin/sh points to dash
Instead of using "echo -e" we simply use printf. printf doesn't add a newline
by default. So some places needed an extra \n in their string.
Most of the change was done by hand, so please carefully review. This bug was
spotted when trying to compile python-pyqt on my ubuntu hardy system.
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: c88bf2ff86a9bb024d33508021e461390bc15397
ViewMTN: http://monotone.openembedded.org/revision/info/c88bf2ff86a9bb024d33508021e461390bc15397
Files:
1
BACKPORTS.txt
classes/opie_i18n.bbclass
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
packages/dpkg/dpkg.inc
packages/freenote/freenote_1.12.0.bb
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/helloworld/helloworld_1.0.0.bb
packages/kdepimpi/kdepimpi-base.inc
packages/knights/knights_1.14.bb
packages/mgetty/mgetty_1.1.30.bb
packages/nonworking/imkit/imkit_0.4.5.bb
packages/nunome/nunome_1.0.2.bb
packages/python/python-pyqt_4.3.3.bb
packages/python/python24-pyqt2_3.13.bb
packages/python/python24-pyqwt2_3.10.bb
packages/qpe-games/crossword_0.0.3.bb
packages/slutils/slutils_0.1.0.bb
Diffs:
#
# mt diff -r4742122a064f983c442dea19f2d4627dc4d7b37b -rc88bf2ff86a9bb024d33508021e461390bc15397
#
#
#
# patch "BACKPORTS.txt"
# from [14d4f45cba7f8ad1d7bb4824ff9ff5231ce92604]
# to [a05c75ea540a7b1c570dc85f34d39182ec94200a]
#
# patch "classes/opie_i18n.bbclass"
# from [8e209cac4778de785791dca1f5858c9afe28bfcd]
# to [b6de291923c7e9e7c0b197d62fb116b16ef9cd6c]
#
# patch "classes/rootfs_deb.bbclass"
# from [a11a09e4cbc92351c6a2152d90f32d639e23ee76]
# to [e8db3994e43f6306e9aa0a2b2d8c58e06e87b803]
#
# patch "classes/rootfs_ipk.bbclass"
# from [9a35d1bcda6049ada7a521242c47fa46ef40ee64]
# to [bf45905ffdc916560ffe662769f35387e731975b]
#
# patch "packages/dpkg/dpkg.inc"
# from [73042524486227d9936337860a313a3864cb255c]
# to [2d9820d2eae2b5362e1c7943d40e5e4252fc3983]
#
# patch "packages/freenote/freenote_1.12.0.bb"
# from [bb9baee29bfaef9ca451fcf916d745c35f21c05b]
# to [4d7ff6b9034129d3a75820e0a6d7c41bfb2230f2]
#
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
# from [66c3ab86d2f892000aaad0732b969b1749d60985]
# to [e886f9c3d56e6dba00f20b02fdb8cff205713397]
#
# patch "packages/helloworld/helloworld_1.0.0.bb"
# from [1b2bf451b37e9d4a7c2ac6608651e2c41a8ba2e7]
# to [8556f8bfbf93a0f8c1005e4bb0d11a8a663fa697]
#
# patch "packages/kdepimpi/kdepimpi-base.inc"
# from [ede0b8f85fda46ba2efefb1270028763c8537951]
# to [4d7e652100ac9841e442091c7ba2ed04d465f8ba]
#
# patch "packages/knights/knights_1.14.bb"
# from [62373c66a5433266a5194728090d968c594ce599]
# to [a5ba2d28a4f7a900587b14a33bb552faa5d92f01]
#
# patch "packages/mgetty/mgetty_1.1.30.bb"
# from [2119c1d587441997ccba28e0e3fba3e5bf5a8e48]
# to [844bfc2fa4af283d57f515b658047992ca7f4110]
#
# patch "packages/nonworking/imkit/imkit_0.4.5.bb"
# from [f1c5de967015632742c9f469d8047c09d060ec8c]
# to [41d3613a62710cfe6b01a1ff132d553f82f6bfbd]
#
# patch "packages/nunome/nunome_1.0.2.bb"
# from [4e108210a865069507a587476dc0c0801a48e1bc]
# to [ba3b7952f30711c4139c1af9a100322113202b8e]
#
# patch "packages/python/python-pyqt_4.3.3.bb"
# from [4c9dd6dd767d79bb118e973d47bbda095cc45c6f]
# to [b996f6bbf6325980e40e06fb774c268cc877e212]
#
# patch "packages/python/python24-pyqt2_3.13.bb"
# from [a86c25cf42602e66a89c20552b8800b315d44ab8]
# to [f33b08fdb47711f481ac48c369d52a25cf47616f]
#
# patch "packages/python/python24-pyqwt2_3.10.bb"
# from [d73c7873c5613b17078902a2de603a34cbb06184]
# to [3ad6bd6c959096b5ed2cf1bab4edec4afcfcb7d5]
#
# patch "packages/qpe-games/crossword_0.0.3.bb"
# from [de0992c794628f861712dad71b8b93d6813207d4]
# to [974f66cc1b2db347d67083ec116808f888a4780d]
#
# patch "packages/slutils/slutils_0.1.0.bb"
# from [e2c26b78e55011f838bef351ef8f14571b2a352d]
# to [d2c466ef562660850455e109bf974a66908b693a]
#
============================================================
--- BACKPORTS.txt 14d4f45cba7f8ad1d7bb4824ff9ff5231ce92604
+++ BACKPORTS.txt a05c75ea540a7b1c570dc85f34d39182ec94200a
@@ -10,7 +10,6 @@
728b58626c50e060bf71960029afce111427d6a0 distcc ahavi autoconfiguration
b86387e484a9b94c2752d8ce5dcfb79742677efc "
c6c33aa5d673dccd6d19de32e40edd19565dbb5a lockdown updates (Koen)
-a6a229a30536ec1d025937b05457059b0bf4b55d echo -e fix (Koen)
Acked:
@@ -34,3 +33,5 @@
560f1294e1ef2699d2b80c98d99386c3030b8c0b task-opie*: "apm" is MACHINE_FEATURE, not COMBINED. (PaulE, PaulS)
4a6e894ff08f0d4e0d6af803eec158fb40198ad7 opie-taskbar 1.2.3: Fix first-run wizard after install path revamp. (PaulE, PaulS)
07699fa4e98276cd15fb353046904408fce6f65c conf/machine/*: Add "phone" MACHINE_FEATURE for phone devices. (Koen, PaulS)
+a6a229a30536ec1d025937b05457059b0bf4b55d echo -e fix (Koen, Marcin)
+
============================================================
--- classes/opie_i18n.bbclass 8e209cac4778de785791dca1f5858c9afe28bfcd
+++ classes/opie_i18n.bbclass b6de291923c7e9e7c0b197d62fb116b16ef9cd6c
@@ -13,7 +13,7 @@ die () {
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#\(.*\)/\(.*\)#\1#p"`"
lang_sane="`echo "$ts_file" | sed -n "s#\(.*\)/\(.*\)#\1#p"|sed s/\_/\-/`"
- echo -e "\tPackaging [`basename $ts_file`] for language [$lang]"
+ printf "\tPackaging [`basename $ts_file`] for language [$lang]\n"
install -d ${D}${palmtopdir}/i18n/$lang
install -m 0644 ${WORKDIR}/i18n/$lang/.directory ${D}${palmtopdir}/i18n/$lang/
@@ -93,14 +93,14 @@ do_build_opie_i18n () {
# function do_build_opie_i18n_data() which sets the variables FILES_* and
# PACKAGES as needed.
echo -n "${PN}-${lang_sane} " >> "${WORKDIR}/PACKAGES.tmp"
- echo -e "${PN}-${lang_sane}#${palmtopdir}/i18n/$lang" >> "${WORKDIR}/FILES.tmp"
+ printf "${PN}-${lang_sane}#${palmtopdir}/i18n/$lang" >> "${WORKDIR}/FILES.tmp\n"
ts_found_something=1
done
if test "$ts_found_something" != 1
then
- echo -e "\tNo translations found"
+ printf "\tNo translations found\n"
else
ts_found_something=""
ts_found="$ts_found $file"
@@ -109,7 +109,7 @@ do_build_opie_i18n () {
# Only used for debugging purposes
test "${I18N_STATS}" = 1 && cd "${WORKDIR}/i18n"
- echo -e "Completed [$file]\n\n"
+ printf "Completed [$file]\n\n\n"
done
qt_dirs="apps bin etc lib pics plugins share sounds"
@@ -125,7 +125,7 @@ do_build_opie_i18n () {
if (echo "${FILES}" | egrep "${palmtopdir}/? |${palmtopdir}/?$") &>/dev/null
then
echo "NOTE: FILES was set to ${palmtopdir} which would include the i18n directory"
- echo -e "\n\nI'll remove ${palmtopdir} from FILES and replace it with all directories"
+ printf "\n\nI'll remove ${palmtopdir} from FILES and replace it with all directories\n"
echo "below QtPalmtop, except i18n ($qt_dirs). See classes/opie_i18n.oeclass for details"
# Removes /opt/QtPalmtop from FILES but keeps /opt/QtPalmtop/$some_dir
@@ -138,7 +138,7 @@ do_build_opie_i18n () {
if test -z "${FILES}"
then
echo "NOTE:"
- echo -e "Since FILES is empty, i'll add all directories below ${palmtopdir} to it,\nexcluding i18n: ( $qt_dirs )"
+ printf "Since FILES is empty, i'll add all directories below ${palmtopdir} to it,\nexcluding i18n: ( $qt_dirs )\n"
echo "${PN}#$FILES $dir_" >> "${WORKDIR}/FILES.tmp"
fi
============================================================
--- classes/rootfs_deb.bbclass a11a09e4cbc92351c6a2152d90f32d639e23ee76
+++ classes/rootfs_deb.bbclass e8db3994e43f6306e9aa0a2b2d8c58e06e87b803
@@ -145,7 +145,7 @@ rootfs_deb_log_check() {
if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
then
echo "log_check: There were error messages in the logfile"
- echo -e "log_check: Matched keyword: [$keyword_die]\n"
+ printf "log_check: Matched keyword: [$keyword_die]\n"
echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
echo ""
do_exit=1
============================================================
--- classes/rootfs_ipk.bbclass 9a35d1bcda6049ada7a521242c47fa46ef40ee64
+++ classes/rootfs_ipk.bbclass bf45905ffdc916560ffe662769f35387e731975b
@@ -71,7 +71,7 @@ rootfs_ipk_log_check() {
if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
then
echo "log_check: There were error messages in the logfile"
- echo -e "log_check: Matched keyword: [$keyword_die]\n"
+ printf "log_check: Matched keyword: [$keyword_die]\n"
echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die" -C1
echo ""
do_exit=1
============================================================
--- packages/dpkg/dpkg.inc 73042524486227d9936337860a313a3864cb255c
+++ packages/dpkg/dpkg.inc 2d9820d2eae2b5362e1c7943d40e5e4252fc3983
@@ -22,9 +22,9 @@ if [ "x$D" != "x" ]; then
if [ "x$D" != "x" ]; then
install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
# this happens at S98 where our good 'ole packages script used to run
- echo -e "#!/bin/sh
+ printf "#!/bin/sh
dpkg --configure -a
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
+\n" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
fi
}
============================================================
--- packages/freenote/freenote_1.12.0.bb bb9baee29bfaef9ca451fcf916d745c35f21c05b
+++ packages/freenote/freenote_1.12.0.bb 4d7ff6b9034129d3a75820e0a6d7c41bfb2230f2
@@ -15,7 +15,7 @@ do_configure_prepend() {
do_configure_prepend() {
mv -f FreeNote subdir1
mv -f FreeNoteSetup subdir2
- echo -e "TEMPLATE=subdirs\nSUBDIRS=subdir1 subdir2\n" >> freenote.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=subdir1 subdir2\n" >> freenote.pro
pushd ${S}/subdir1 && rm *.pro && qmake -project && echo "TARGET=FreeNote" >> subdir1.pro && popd
pushd ${S}/subdir2 && rm *.pro && qmake -project && echo "TARGET=FreeNoteSetup" >> subdir2.pro && popd
}
============================================================
--- packages/gpe-session-scripts/gpe-session-scripts_0.67.bb 66c3ab86d2f892000aaad0732b969b1749d60985
+++ packages/gpe-session-scripts/gpe-session-scripts_0.67.bb e886f9c3d56e6dba00f20b02fdb8cff205713397
@@ -35,7 +35,7 @@ do_install_append() {
fi
install -d ${D}${sysconfdir}/matchbox
install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
- echo -e "exec matchbox-window-manager ${CURSOR_HIDE} \$@ \n" >> ${D}${sysconfdir}/matchbox/session
+ printf "exec matchbox-window-manager ${CURSOR_HIDE} \$@ \n" >> ${D}${sysconfdir}/matchbox/session
install -d ${D}${sysconfdir}/gpe/xsettings-default.d
============================================================
--- packages/helloworld/helloworld_1.0.0.bb 1b2bf451b37e9d4a7c2ac6608651e2c41a8ba2e7
+++ packages/helloworld/helloworld_1.0.0.bb 8556f8bfbf93a0f8c1005e4bb0d11a8a663fa697
@@ -7,7 +7,7 @@ do_fetch () {
do_fetch () {
mkdir -p ${WORKDIR}/${P}
cd ${WORKDIR}/${P}
- echo -e "#include <stdio.h>\nint main(void)\n{\n\tprintf(\"Hello world!\\\n\");\twhile(1);\n\treturn 0;\n}\n" >helloworld.c
+ printf "#include <stdio.h>\nint main(void)\n{\n\tprintf(\"Hello world!\\\n\");\twhile(1);\n\treturn 0;\n}\n" >helloworld.c
}
do_compile () {
============================================================
--- packages/kdepimpi/kdepimpi-base.inc ede0b8f85fda46ba2efefb1270028763c8537951
+++ packages/kdepimpi/kdepimpi-base.inc 4d7e652100ac9841e442091c7ba2ed04d465f8ba
@@ -53,7 +53,7 @@ do_configure_prepend() {
do_configure_prepend() {
mv ${S}/kabc/formats/binary/kabcformat_binaryE.pro ${S}/kabc/formats/binary/binaryE.pro
- echo -e "TEMPLATE=subdirs\nSUBDIRS=${SUBDIRS}\n" >all.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=${SUBDIRS}\n" >all.pro
for d in ${SUBDIRS}
do
if [ -f ${d}/`basename ${d}`E.pro ];
============================================================
--- packages/knights/knights_1.14.bb 62373c66a5433266a5194728090d968c594ce599
+++ packages/knights/knights_1.14.bb a5ba2d28a4f7a900587b14a33bb552faa5d92f01
@@ -17,7 +17,7 @@ do_configure_prepend() {
QMAKE_PROFILES = "knights.pro"
do_configure_prepend() {
- echo -e "TEMPLATE=subdirs\nSUBDIRS=qtcompat microkde knights\n" >knights.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=qtcompat microkde knights\n" >knights.pro
}
do_install() {
============================================================
--- packages/mgetty/mgetty_1.1.30.bb 2119c1d587441997ccba28e0e3fba3e5bf5a8e48
+++ packages/mgetty/mgetty_1.1.30.bb 844bfc2fa4af283d57f515b658047992ca7f4110
@@ -61,7 +61,7 @@ do_compile () {
-DVARRUNDIR=\"/var/run\" \
-DAWK=\"awk\" \
-DPERL=\""${bindir}/perl -w"\" -DTKPERL=\"${bindir}/tkperl\" \
- -DECHO=\""echo -e"\" \
+ -DECHO=\""printf"\" \
-DSHELL=\"/bin/bash\" \
-o mksed mksed.c
./mksed >sedscript
============================================================
--- packages/nonworking/imkit/imkit_0.4.5.bb f1c5de967015632742c9f469d8047c09d060ec8c
+++ packages/nonworking/imkit/imkit_0.4.5.bb 41d3613a62710cfe6b01a1ff132d553f82f6bfbd
@@ -16,5 +16,5 @@ do_configure_prepend() {
QMAKE_PROFILES = "imkit.pro"
do_configure_prepend() {
- echo -e "TEMPLATE=subdirs\nSUBDIRS=libimkit impls/anthy\n" > imkit.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=libimkit impls/anthy\n" > imkit.pro
}
============================================================
--- packages/nunome/nunome_1.0.2.bb 4e108210a865069507a587476dc0c0801a48e1bc
+++ packages/nunome/nunome_1.0.2.bb ba3b7952f30711c4139c1af9a100322113202b8e
@@ -20,11 +20,11 @@ do_configure_prepend() {
do_configure_prepend() {
sed -i -e 's,/opt/QtPalmtop/bin/,${bindir}/,g' "${S}/ui/nunome.h"
sed -i -e 's,/opt/QtPalmtop/,${palmtopdir}/,g' "${S}/ui/nunome.h"
- echo -e "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui" >nunome.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui\n" >nunome.pro
pushd Nnmlib && qmake -project -t lib && popd
- pushd server && qmake -project && echo -e "LIBS+=-lNnmlib\nTARGET=server.bin" >> server.pro && popd
- pushd dicman && qmake -project && echo -e "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin" >> dicman.pro && popd
- pushd ui && qmake -project -t lib && echo -e "LIBS+=-lNnmlib\nTARGET=nunome" >> ui.pro && popd
+ pushd server && qmake -project && printf "LIBS+=-lNnmlib\nTARGET=server.bin\n" >> server.pro && popd
+ pushd dicman && qmake -project && printf "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin\n" >> dicman.pro && popd
+ pushd ui && qmake -project -t lib && printf "LIBS+=-lNnmlib\nTARGET=nunome\n" >> ui.pro && popd
find . -name "moc*"|xargs rm -f
find . -name "Makefile"|xargs rm -f
}
============================================================
--- packages/python/python-pyqt_4.3.3.bb 4c9dd6dd767d79bb118e973d47bbda095cc45c6f
+++ packages/python/python-pyqt_4.3.3.bb b996f6bbf6325980e40e06fb774c268cc877e212
@@ -45,7 +45,7 @@ do_configure_prepend() {
}
do_configure_prepend() {
- echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro
}
do_stage() {
============================================================
--- packages/python/python24-pyqt2_3.13.bb a86c25cf42602e66a89c20552b8800b315d44ab8
+++ packages/python/python24-pyqt2_3.13.bb f33b08fdb47711f481ac48c369d52a25cf47616f
@@ -35,7 +35,7 @@ do_configure_prepend() {
LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages"
do_configure_prepend() {
- echo -e "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro
}
do_stage() {
============================================================
--- packages/python/python24-pyqwt2_3.10.bb d73c7873c5613b17078902a2de603a34cbb06184
+++ packages/python/python24-pyqwt2_3.10.bb 3ad6bd6c959096b5ed2cf1bab4edec4afcfcb7d5
@@ -33,7 +33,7 @@ do_generate_prepend() {
LIBS+=-L${STAGING_LIBDIR}/${PY%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list