From 9a5618c4c22a617f69d184f80b91ccf2a9148026 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 May 2016 10:35:20 -0700 Subject: libc-common.bbclass: Use sed instead of grep Squash two install cmds into one Replace grep with sed substitution logic, optimizes away mv cmd Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'meta/classes/libc-common.bbclass') diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass index bbc80167dd..11b0065a6d 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/ 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 -- cgit 1.2.3-korg