diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-02-19 12:14:58 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-20 14:28:11 +0000 |
| commit | bac890580c4454a5f94eadb40dec8972a13bbf6f (patch) | |
| tree | 7dd6e5f93c0b7c1885e7306405c72b10f9940952 | |
| parent | 7e595a5f9432188f5adec99e675827114c70d0c8 (diff) | |
| download | poky-bac890580c4454a5f94eadb40dec8972a13bbf6f.tar.gz | |
populate_sdk_*.bbclass: remove left over bash routines
The list_installed_packages bash routine is no longer needed here. We've
got a python replacement.
(From OE-Core rev: 6c1e379ce81a6f397bf8e7e7c9dd3cea91274b46)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 21 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_ipk.bbclass | 20 |
2 files changed, 0 insertions, 41 deletions
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index d03b0551e9..462525feff 100644 --- a/meta/classes/populate_sdk_deb.bbclass +++ b/meta/classes/populate_sdk_deb.bbclass | |||
| @@ -11,27 +11,6 @@ do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | |||
| 11 | # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called | 11 | # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called |
| 12 | DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg" | 12 | DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg" |
| 13 | 13 | ||
| 14 | list_installed_packages() { | ||
| 15 | if [ "$1" = "arch" ] ; then | ||
| 16 | # Here we want the PACKAGE_ARCH not the deb architecture | ||
| 17 | ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch}\n' | ||
| 18 | elif [ "$1" = "file" ] ; then | ||
| 19 | ${DPKG_QUERY_COMMAND} -W -f='${Package} ${Package}_${Version}_${Architecture}.deb ${PackageArch}\n' | while read pkg pkgfile pkgarch | ||
| 20 | do | ||
| 21 | fullpath=`find ${DEPLOY_DIR_DEB} -name "$pkgfile" || true` | ||
| 22 | if [ "$fullpath" = "" ] ; then | ||
| 23 | echo "$pkg $pkgfile $pkgarch" | ||
| 24 | else | ||
| 25 | echo "$pkg $fullpath $pkgarch" | ||
| 26 | fi | ||
| 27 | done | ||
| 28 | elif [ "$1" = "ver" ] ; then | ||
| 29 | ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch} ${Version}\n' | ||
| 30 | else | ||
| 31 | ${DPKG_QUERY_COMMAND} -W -f='${Package}\n' | ||
| 32 | fi | ||
| 33 | } | ||
| 34 | |||
| 35 | rootfs_list_installed_depends() { | 14 | rootfs_list_installed_depends() { |
| 36 | # Cheat here a little bit by using the opkg query helper util | 15 | # Cheat here a little bit by using the opkg query helper util |
| 37 | ${DPKG_QUERY_COMMAND} -W -f='Package: ${Package}\nDepends: ${Depends}\nRecommends: ${Recommends}\n\n' | opkg-query-helper.py | 16 | ${DPKG_QUERY_COMMAND} -W -f='Package: ${Package}\nDepends: ${Depends}\nRecommends: ${Recommends}\n\n' | opkg-query-helper.py |
diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass index f51a22cb8a..4c23f055c1 100644 --- a/meta/classes/populate_sdk_ipk.bbclass +++ b/meta/classes/populate_sdk_ipk.bbclass | |||
| @@ -3,26 +3,6 @@ do_populate_sdk[recrdeptask] += "do_package_write_ipk" | |||
| 3 | 3 | ||
| 4 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" | 4 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" |
| 5 | 5 | ||
| 6 | list_installed_packages() { | ||
| 7 | if [ "$1" = "arch" ] ; then | ||
| 8 | opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -a | ||
| 9 | elif [ "$1" = "file" ] ; then | ||
| 10 | opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -f | while read pkg pkgfile pkgarch | ||
| 11 | do | ||
| 12 | fullpath=`find ${DEPLOY_DIR_IPK} -name "$pkgfile" || true` | ||
| 13 | if [ "$fullpath" = "" ] ; then | ||
| 14 | echo "$pkg $pkgfile $pkgarch" | ||
| 15 | else | ||
| 16 | echo "$pkg $fullpath $pkgarch" | ||
| 17 | fi | ||
| 18 | done | ||
| 19 | elif [ "$1" = "ver" ] ; then | ||
| 20 | opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -v | ||
| 21 | else | ||
| 22 | opkg-cl ${OPKG_ARGS} list_installed | awk '{ print $1 }' | ||
| 23 | fi | ||
| 24 | } | ||
| 25 | |||
| 26 | rootfs_list_installed_depends() { | 6 | rootfs_list_installed_depends() { |
| 27 | opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py | 7 | opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py |
| 28 | } | 8 | } |
