diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-03-23 23:30:49 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-26 23:27:37 +0100 |
| commit | 9a8199e4a0f46ed3e9582143b206144aee28b709 (patch) | |
| tree | 647ff718e953bb46bf6f468908cc792fa5993c42 | |
| parent | 8c9ff3a5df85339e5d2b85fa00e471b6a3d17bd2 (diff) | |
| download | openembedded-core-9a8199e4a0f46ed3e9582143b206144aee28b709.tar.gz openembedded-core-9a8199e4a0f46ed3e9582143b206144aee28b709.tar.bz2 openembedded-core-9a8199e4a0f46ed3e9582143b206144aee28b709.zip | |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
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 |