*.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>

diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 7158c8c..cbc4173 100644 (file)
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -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
 }

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index d75e7e6..20382ce 100644 (file)
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -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

diff --git a/meta/classes/kernel-grub.bbclass b/meta/classes/kernel-grub.bbclass
index 85721ff..a63f482 100644 (file)
--- a/meta/classes/kernel-grub.bbclass
+++ b/meta/classes/kernel-grub.bbclass
@@ -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
        }
 

diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
index 711f851..6ed2a13 100644 (file)
--- a/meta/classes/sip.bbclass
+++ b/meta/classes/sip.bbclass
@@ -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