summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/binconfig.bbclass2
-rw-r--r--meta/classes/buildhistory.bbclass2
-rw-r--r--meta/classes/kernel-grub.bbclass2
-rw-r--r--meta/classes/sip.bbclass8
4 files changed, 6 insertions, 8 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 7158c8c705..cbc4173601 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -57,7 +57,7 @@ binconfig_sysroot_preprocess () {
57 for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name '${BINCONFIG_GLOB}'`; do 57 for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name '${BINCONFIG_GLOB}'`; do
58 configname=`basename $config` 58 configname=`basename $config`
59 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} 59 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
60 cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname 60 sed ${@get_binconfig_mangle(d)} $config > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
61 chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname 61 chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
62 done 62 done
63} 63}
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index d75e7e6fff..20382ce410 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -360,7 +360,7 @@ buildhistory_get_installed() {
360 360
361 # Produce dependency graph 361 # Produce dependency graph
362 # First, quote each name to handle characters that cause issues for dot 362 # First, quote each name to handle characters that cause issues for dot
363 cat ${WORKDIR}/bh_installed_pkgs_deps.txt | sed 's:\([^| ]*\):"\1":g' > $1/depends.tmp && \ 363 sed 's:\([^| ]*\):"\1":g' ${WORKDIR}/bh_installed_pkgs_deps.txt > $1/depends.tmp && \
364 rm ${WORKDIR}/bh_installed_pkgs_deps.txt 364 rm ${WORKDIR}/bh_installed_pkgs_deps.txt
365 # Change delimiter from pipe to -> and set style for recommend lines 365 # Change delimiter from pipe to -> and set style for recommend lines
366 sed -i -e 's:|: -> :' -e 's:"\[REC\]":[style=dotted]:' -e 's:$:;:' $1/depends.tmp 366 sed -i -e 's:|: -> :' -e 's:"\[REC\]":[style=dotted]:' -e 's:$:;:' $1/depends.tmp
diff --git a/meta/classes/kernel-grub.bbclass b/meta/classes/kernel-grub.bbclass
index 85721ffd70..a63f482a91 100644
--- a/meta/classes/kernel-grub.bbclass
+++ b/meta/classes/kernel-grub.bbclass
@@ -67,7 +67,7 @@ pkg_postinst_kernel-image_prepend () {
67 if [ "${grubcfg##*/}" = "grub.cfg" ]; then 67 if [ "${grubcfg##*/}" = "grub.cfg" ]; then
68 cat "$grubcfg" 68 cat "$grubcfg"
69 elif [ "${grubcfg##*/}" = "menu.list" ]; then 69 elif [ "${grubcfg##*/}" = "menu.list" ]; then
70 cat "$grubcfg" | sed -e '/^default/d' -e '/^timeout/d' 70 sed -e '/^default/d' -e '/^timeout/d' "$grubcfg"
71 fi 71 fi
72 } 72 }
73 73
diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
index 711f851593..6ed2a13bda 100644
--- a/meta/classes/sip.bbclass
+++ b/meta/classes/sip.bbclass
@@ -42,11 +42,9 @@ sip_do_generate() {
42 echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'" 42 echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
43 sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \ 43 sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
44 sip/${module}/${module}mod.sip || die "Error calling sip on ${module}" 44 sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
45 cat ${module}/${module}.sbf | sed s,target,TARGET, \ 45 sed -e 's,target,TARGET,' -e 's,sources,SOURCES,' -e 's,headers,HEADERS,' \
46 | sed s,sources,SOURCES, \ 46 ${module}/${module}.sbf | sed s,"moc_HEADERS =","HEADERS +=", \
47 | sed s,headers,HEADERS, \ 47 >${module}/${module}.pro
48 | sed s,"moc_HEADERS =","HEADERS +=", \
49 >${module}/${module}.pro
50 echo "TEMPLATE=lib" >>${module}/${module}.pro 48 echo "TEMPLATE=lib" >>${module}/${module}.pro
51 [ "${module}" = "qt" ] && echo "" >>${module}/${module}.pro 49 [ "${module}" = "qt" ] && echo "" >>${module}/${module}.pro
52 [ "${module}" = "qtcanvas" ] && echo "" >>${module}/${module}.pro 50 [ "${module}" = "qtcanvas" ] && echo "" >>${module}/${module}.pro