summaryrefslogtreecommitdiffstats
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:41:30 +0100
commitf99fb6a16781d543292558b1000014a0148da005 (patch)
tree5da52b5e92a19089372a52c5bf1bc616b81bf165
parentec8c9eb269bc1f6eda04b65cc900a0ca28feede6 (diff)
downloadpoky-f99fb6a16781d543292558b1000014a0148da005.tar.gz
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>
-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() {
4 h=`echo $r|sed -e's,\.x$,.h,'` 4 h=`echo $r|sed -e's,\.x$,.h,'`
5 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/ 5 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
6 done 6 done
7 install -d ${D}/${sysconfdir}/ 7 install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf
8 install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
9 install -d ${D}${localedir} 8 install -d ${D}${localedir}
10 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" 9 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
11 # get rid of some broken files... 10 # get rid of some broken files...
12 for i in ${GLIBC_BROKEN_LOCALES}; do 11 for i in ${GLIBC_BROKEN_LOCALES}; do
13 grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp 12 sed -i "/$i/d" ${WORKDIR}/SUPPORTED
14 mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
15 done 13 done
16 rm -f ${D}${sysconfdir}/rpc 14 rm -f ${D}${sysconfdir}/rpc
17 rm -rf ${D}${datadir}/zoneinfo 15 rm -rf ${D}${datadir}/zoneinfo