sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

*.bbclass (shell): avoid pipe with sed 

Replace:
cat <file> | sed -e xxx
By:
sed -e xxx <file>

(From OE-Core rev: e2026f5d32ac05396615224ac9ec927439e7e6b4)

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Matthieu Crapet 2014-05-06 14:17:47 +02:00 committed by Richard Purdie
parent 5ae4aadcae
commit 77790c43b1
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/binconfig.bbclass
View File

@ -57,7 +57,7 @@ binconfig_sysroot_preprocess () {
for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name '${BINCONFIG_GLOB}'`; do
configname=`basename $config`
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
sed ${@get_binconfig_mangle(d)} $config > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
done
}

2
meta/classes/buildhistory.bbclass
View File

@ -360,7 +360,7 @@ buildhistory_get_installed() {
# Produce dependency graph
# First, quote each name to handle characters that cause issues for dot
cat ${WORKDIR}/bh_installed_pkgs_deps.txt | sed 's:\([^| ]*\):"\1":g' > $1/depends.tmp && \
sed 's:\([^| ]*\):"\1":g' ${WORKDIR}/bh_installed_pkgs_deps.txt > $1/depends.tmp && \
rm ${WORKDIR}/bh_installed_pkgs_deps.txt
# Change delimiter from pipe to -> and set style for recommend lines
sed -i -e 's:|: -> :' -e 's:"\[REC\]":[style=dotted]:' -e 's:$:;:' $1/depends.tmp

2
meta/classes/kernel-grub.bbclass
View File

@ -67,7 +67,7 @@ pkg_postinst_kernel-image_prepend () {
if [ "${grubcfg##*/}" = "grub.cfg" ]; then
cat "$grubcfg"
elif [ "${grubcfg##*/}" = "menu.list" ]; then
cat "$grubcfg" | sed -e '/^default/d' -e '/^timeout/d'
sed -e '/^default/d' -e '/^timeout/d' "$grubcfg"
fi
}

8
meta/classes/sip.bbclass
View File

@ -42,11 +42,9 @@ sip_do_generate() {
echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
cat ${module}/${module}.sbf | sed s,target,TARGET, \
| sed s,sources,SOURCES, \
| sed s,headers,HEADERS, \
| sed s,"moc_HEADERS =","HEADERS +=", \
>${module}/${module}.pro
sed -e 's,target,TARGET,' -e 's,sources,SOURCES,' -e 's,headers,HEADERS,' \
${module}/${module}.sbf | sed s,"moc_HEADERS =","HEADERS +=", \
>${module}/${module}.pro
echo "TEMPLATE=lib" >>${module}/${module}.pro
[ "${module}" = "qt" ] && echo "" >>${module}/${module}.pro
[ "${module}" = "qtcanvas" ] && echo "" >>${module}/${module}.pro