From 554e3d254075a75a0ce8e114ab5144fff5440440 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 23 Mar 2013 17:36:53 +0000 Subject: 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 --- meta/classes/populate_sdk_rpm.bbclass | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'meta/classes/populate_sdk_rpm.bbclass') diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index bbee35eab5..219cd185ce 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass @@ -155,3 +155,18 @@ python () { d.setVar('MULTILIB_OS_LIST', ml_os_list) } +RPM_QUERY_CMD = '${RPM} --root $INSTALL_ROOTFS_RPM -D "_dbpath ${rpmlibdir}"' + +list_installed_packages() { + if [ "$1" = "arch" ]; then + ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe arch + elif [ "$1" = "file" ]; then + ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{PACKAGEORIGIN}\n]" | translate_smart_to_oe + else + ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe + fi +} + +rootfs_list_installed_depends() { + rpmresolve -t $INSTALL_ROOTFS_RPM/${rpmlibdir} +} -- cgit v1.2.3-54-g00ecf