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_rpm.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_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 7d67b9685c..12b4bfa536 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -1155,20 +1155,3 @@ addtask package_write_rpm before do_package_write after do_packagedata do_packag | |||
1155 | PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_RPM} ] || package_update_index_rpm;" | 1155 | PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_RPM} ] || package_update_index_rpm;" |
1156 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" | 1156 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" |
1157 | PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot" | 1157 | PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot" |
1158 | |||
1159 | |||
1160 | RPM_QUERY_CMD = '${RPM} --root $INSTALL_ROOTFS_RPM -D "_dbpath ${rpmlibdir}"' | ||
1161 | |||
1162 | list_installed_packages() { | ||
1163 | if [ "$1" = "arch" ]; then | ||
1164 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe arch | ||
1165 | elif [ "$1" = "file" ]; then | ||
1166 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{PACKAGEORIGIN}\n]" | translate_smart_to_oe | ||
1167 | else | ||
1168 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe | ||
1169 | fi | ||
1170 | } | ||
1171 | |||
1172 | rootfs_list_installed_depends() { | ||
1173 | rpmresolve -t $INSTALL_ROOTFS_RPM/${rpmlibdir} | ||
1174 | } | ||