]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
libc-common.bbclass: Use sed instead of grep
authorKhem Raj <raj.khem@gmail.com>
Wed, 11 May 2016 17:35:20 +0000 (10:35 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 13 May 2016 12:40:52 +0000 (13:40 +0100)
Squash two install cmds into one
Replace grep with sed substitution logic, optimizes
away mv cmd

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/libc-common.bbclass

index bbc80167dde3e0f33827868cc1b8063fe10d5def..11b0065a6d11413e24c124201ca63ae18652d312 100644 (file)
@@ -4,14 +4,12 @@ do_install() {
                h=`echo $r|sed -e's,\.x$,.h,'`
                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
        done
-       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
        done
        rm -f ${D}${sysconfdir}/rpc
        rm -rf ${D}${datadir}/zoneinfo