diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-23 17:36:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-23 17:39:44 +0000 |
| commit | 9a414a57ad69a426a8d8a2970c42ca7427240615 (patch) | |
| tree | e88892b028fff00f386fe8681b46e593dad177b7 /meta/classes/package_deb.bbclass | |
| parent | d9130e5113c8f93f327fbe19dbfe39036c1c3995 (diff) | |
| download | openembedded-core-9a414a57ad69a426a8d8a2970c42ca7427240615.tar.gz openembedded-core-9a414a57ad69a426a8d8a2970c42ca7427240615.tar.bz2 openembedded-core-9a414a57ad69a426a8d8a2970c42ca7427240615.zip | |
package/populate_sdk: Move functions from package_* to populate_sdk_*
This fixes build failures introduced with "classes/buildhistory: implement history
collection for SDK" by moving the functions to files where only the specific image
type which is enabled is inherited. The failures occured when multiple PACKAGE_CLASSES
were enabled.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index a937b85a61..455919913b 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -423,31 +423,3 @@ addtask package_write_deb before do_package_write after do_packagedata do_packag PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_DEB} ] || package_update_index_deb;" PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" - - -# 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\n' | while read pkg pkgfile - do - fullpath=`find ${DEPLOY_DIR_DEB} -name "$pkgfile" || true` - if [ "$fullpath" = "" ] ; then - echo "$pkg $pkgfile" - else - echo "$pkg $fullpath" - fi - done - 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 -} |