summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-05-11 10:35:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:40:52 +0100
commit9a5618c4c22a617f69d184f80b91ccf2a9148026 (patch)
treecf61066a7ad6e00c30f6862d38b41eae3bf34e51
parentb8901336e72639342a1d784557043fa47a9d90ff (diff)
downloadopenembedded-core-9a5618c4c22a617f69d184f80b91ccf2a9148026.tar.gz
openembedded-core-9a5618c4c22a617f69d184f80b91ccf2a9148026.tar.bz2
openembedded-core-9a5618c4c22a617f69d184f80b91ccf2a9148026.zip
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 <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-common.bbclass6
1 files changed, 2 insertions, 4 deletions
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