diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 23:00:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 23:00:52 +0000 |
commit | e57935dc18d576feb1003b48e7cdc72a444131b8 (patch) | |
tree | 1b7f030c774295c6378a2c3366b4086f0e47876d /meta/classes/rootfs_rpm.bbclass | |
parent | aa0cb889a4ef883235dc3f3e1d76ee4a556ae03a (diff) | |
download | openembedded-core-e57935dc18d576feb1003b48e7cdc72a444131b8.tar.gz openembedded-core-e57935dc18d576feb1003b48e7cdc72a444131b8.tar.bz2 openembedded-core-e57935dc18d576feb1003b48e7cdc72a444131b8.zip |
Revert "classes/buildhistory: add new output history collection class"
This reverts commit 508ff624fea705eb93cf2cc1e0c9c42cb817acf8. RP
accidentally pulled the wrong commit in, it was supposed to be a
*package*history bbclass change.
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 5fd45d758c..6973008c59 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -160,47 +160,16 @@ remove_packaging_data_files() { rm -rf ${IMAGE_ROOTFS}${opkglibdir} } -RPM_QUERY_CMD = '${RPM} --root ${IMAGE_ROOTFS} -D "_dbpath ${rpmlibdir}" \ - -D "__dbi_txn create nofsync private"' - -list_installed_packages() { - ${RPM_QUERY_CMD} -qa --qf "[%{NAME}\n]" -} - -get_package_filename() { - resolve_package_rpm ${RPMCONF_TARGET_BASE}-base_archs.conf $1 -} - -list_package_depends() { - pkglist=`list_installed_packages` - - for req in `${RPM_QUERY_CMD} -q --qf "[%{REQUIRES}\n]" $1`; do - if echo "$req" | grep -q "^rpmlib" ; then continue ; fi - - realpkg="" - for dep in $pkglist; do - if [ "$dep" = "$req" ] ; then - realpkg="1" - echo $req - break - fi - done - - if [ "$realdep" = "" ] ; then - ${RPM_QUERY_CMD} -q --whatprovides $req --qf "%{NAME}\n" - fi - done -} - -list_package_recommends() { - : -} install_all_locales() { PACKAGES_TO_INSTALL="" # Generate list of installed packages... - INSTALLED_PACKAGES=`list_installed_packages | egrep -v -- "(-locale-|-dev$|-doc$|^kernel|^glibc|^ttf|^task|^perl|^python)"` + INSTALLED_PACKAGES=$( \ + ${RPM} --root ${IMAGE_ROOTFS} -D "_dbpath ${rpmlibdir}" \ + -D "__dbi_txn create nofsync private" \ + -qa --qf "[%{NAME}\n]" | egrep -v -- "(-locale-|-dev$|-doc$|^kernel|^glibc|^ttf|^task|^perl|^python)" \ + ) # This would likely be faster if we did it in one transaction # but this should be good enough for the few users of this function... |