From c5d91b1170ea7d2438760c7751e39404cd530660 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 23 Mar 2012 23:30:49 +0100 Subject: rootfs_ipk: replace 3 opkg-cl calls with one in get_package_filename * || true is needed for cases where grep doesn't find anything * and quotes around info are needed to keep line breaks (From OE-Core rev: 9a8199e4a0f46ed3e9582143b206144aee28b709) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/rootfs_ipk.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 2df8ca49e2..13bd4bff23 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -127,9 +127,10 @@ list_installed_packages() { } get_package_filename() { - name=`opkg-cl ${IPKG_ARGS} info $1 | grep -B 7 -A 7 "^Status.* \(\(installed\)\|\(unpacked\)\)" | awk '/^Package/ {printf $2"_"}'` - name=$name`opkg-cl ${IPKG_ARGS} info $1 | grep -B 7 -A 7 "^Status.* \(\(installed\)\|\(unpacked\)\)" | awk -F: '/^Version/ {printf $NF"_"}' | sed 's/^\s*//g'` - name=$name`opkg-cl ${IPKG_ARGS} info $1 | grep -B 7 -A 7 "^Status.* \(\(installed\)\|\(unpacked\)\)" | awk '/^Archi/ {print $2".ipk"}'` + info=`opkg-cl ${IPKG_ARGS} info $1 | grep -B 7 -A 7 "^Status.* \(\(installed\)\|\(unpacked\)\)" || true` + name=`echo "${info}" | awk '/^Package/ {printf $2"_"}'` + name=$name`echo "${info}" | awk -F: '/^Version/ {printf $NF"_"}' | sed 's/^\s*//g'` + name=$name`echo "${info}" | awk '/^Archi/ {print $2".ipk"}'` fullname=`find ${DEPLOY_DIR_IPK} -name "$name" || true` if [ "$fullname" = "" ] ; then -- cgit v1.2.3-54-g00ecf