]> code.ossystems Code Review - openembedded-core.git/commitdiff
populate_sdk_*.bbclass: remove left over bash routines
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Wed, 19 Feb 2014 10:14:58 +0000 (12:14 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 20 Feb 2014 14:28:04 +0000 (14:28 +0000)
The list_installed_packages bash routine is no longer needed here. We've
got a python replacement.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/classes/populate_sdk_deb.bbclass
meta/classes/populate_sdk_ipk.bbclass

index d03b0551e90fc86b7504ec2d244a1ff7e0012fa0..462525feffcecbe7d70f832be4edf207d97c7f7a 100644 (file)
@@ -11,27 +11,6 @@ do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
 # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called
 DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg"
 
-list_installed_packages() {
-       if [ "$1" = "arch" ] ; then
-               # Here we want the PACKAGE_ARCH not the deb architecture
-               ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch}\n'
-       elif [ "$1" = "file" ] ; then
-               ${DPKG_QUERY_COMMAND} -W -f='${Package} ${Package}_${Version}_${Architecture}.deb ${PackageArch}\n' | while read pkg pkgfile pkgarch
-               do
-                       fullpath=`find ${DEPLOY_DIR_DEB} -name "$pkgfile" || true`
-                       if [ "$fullpath" = "" ] ; then
-                               echo "$pkg $pkgfile $pkgarch"
-                       else
-                               echo "$pkg $fullpath $pkgarch"
-                       fi
-               done
-       elif [ "$1" = "ver" ] ; then
-               ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch} ${Version}\n'
-       else
-               ${DPKG_QUERY_COMMAND} -W -f='${Package}\n'
-       fi
-}
-
 rootfs_list_installed_depends() {
        # Cheat here a little bit by using the opkg query helper util
        ${DPKG_QUERY_COMMAND} -W -f='Package: ${Package}\nDepends: ${Depends}\nRecommends: ${Recommends}\n\n' | opkg-query-helper.py
index f51a22cb8a13456f49bf065223db1d70757bb39e..4c23f055c1802ed3530d3ac61b1b87d96d276a56 100644 (file)
@@ -3,26 +3,6 @@ do_populate_sdk[recrdeptask] += "do_package_write_ipk"
 
 do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
 
-list_installed_packages() {
-       if [ "$1" = "arch" ] ; then
-               opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -a
-       elif [ "$1" = "file" ] ; then
-               opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -f | while read pkg pkgfile pkgarch
-               do
-                       fullpath=`find ${DEPLOY_DIR_IPK} -name "$pkgfile" || true`
-                       if [ "$fullpath" = "" ] ; then
-                               echo "$pkg $pkgfile $pkgarch"
-                       else
-                               echo "$pkg $fullpath $pkgarch"
-                       fi
-               done
-       elif [ "$1" = "ver" ] ; then
-               opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -v
-       else
-               opkg-cl ${OPKG_ARGS} list_installed | awk '{ print $1 }'
-       fi
-}
-
 rootfs_list_installed_depends() {
        opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py
 }