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:40:27 +0000 |
commit | 554e3d254075a75a0ce8e114ab5144fff5440440 (patch) | |
tree | 88a17bb63d4d4261352cfd9e10bb74131929005a /meta/classes/package_deb.bbclass | |
parent | 3fff11a7fc0449bf927bcc79773f37dee32e51f1 (diff) | |
download | poky-554e3d254075a75a0ce8e114ab5144fff5440440.tar.gz |
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.
(From OE-Core rev: 9a414a57ad69a426a8d8a2970c42ca7427240615)
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 | |||
423 | PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_DEB} ] || package_update_index_deb;" | 423 | PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_DEB} ] || package_update_index_deb;" |
424 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" | 424 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" |
425 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" | 425 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" |
426 | |||
427 | |||
428 | # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called | ||
429 | DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg" | ||
430 | |||
431 | list_installed_packages() { | ||
432 | if [ "$1" = "arch" ] ; then | ||
433 | # Here we want the PACKAGE_ARCH not the deb architecture | ||
434 | ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch}\n' | ||
435 | elif [ "$1" = "file" ] ; then | ||
436 | ${DPKG_QUERY_COMMAND} -W -f='${Package} ${Package}_${Version}_${Architecture}.deb\n' | while read pkg pkgfile | ||
437 | do | ||
438 | fullpath=`find ${DEPLOY_DIR_DEB} -name "$pkgfile" || true` | ||
439 | if [ "$fullpath" = "" ] ; then | ||
440 | echo "$pkg $pkgfile" | ||
441 | else | ||
442 | echo "$pkg $fullpath" | ||
443 | fi | ||
444 | done | ||
445 | else | ||
446 | ${DPKG_QUERY_COMMAND} -W -f='${Package}\n' | ||
447 | fi | ||
448 | } | ||
449 | |||
450 | rootfs_list_installed_depends() { | ||
451 | # Cheat here a little bit by using the opkg query helper util | ||
452 | ${DPKG_QUERY_COMMAND} -W -f='Package: ${Package}\nDepends: ${Depends}\nRecommends: ${Recommends}\n\n' | opkg-query-helper.py | ||
453 | } | ||