[gnome-continuous-yocto/gnomeostree-3.28-rocko: 230/8267] libc-common.bbclass: Use sed instead of grep

commit f99fb6a16781d543292558b1000014a0148da005
Author: Khem Raj <raj khem gmail com>
Date:   Wed May 11 10:35:20 2016 -0700

    libc-common.bbclass: Use sed instead of grep
    Squash two install cmds into one
    Replace grep with sed substitution logic, optimizes
    away mv cmd
    (From OE-Core rev: 9a5618c4c22a617f69d184f80b91ccf2a9148026)
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/libc-common.bbclass |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index bbc8016..11b0065 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -4,14 +4,12 @@ do_install() {
                h=`echo $r|sed -e's,\.x$,.h,'`
                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
-       install -d ${D}/${sysconfdir}/ 
-       install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
+       install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf
        install -d ${D}${localedir}
        make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
        # get rid of some broken files...
        for i in ${GLIBC_BROKEN_LOCALES}; do
-               grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
-               mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
+               sed -i "/$i/d" ${WORKDIR}/SUPPORTED
        rm -f ${D}${sysconfdir}/rpc
        rm -rf ${D}${datadir}/zoneinfo

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]