diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 1d3ea641f0..d373dab408 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -3,6 +3,7 @@ # ROOTFS_PKGMANAGE = "rpm smartpm" +ROOTFS_PKGMANAGE_BOOTSTRAP = "rpm-postinsts" # Add 50Meg of extra space for Smart IMAGE_ROOTFS_EXTRA_SPACE_append = "${@base_contains("PACKAGE_INSTALL", "smartpm", " + 51200", "" ,d)}" @@ -10,9 +11,6 @@ IMAGE_ROOTFS_EXTRA_SPACE_append = "${@base_contains("PACKAGE_INSTALL", "smartpm" # Smart is python based, so be sure python-native is available to us. EXTRANATIVEPATH += "python-native" -# Postinstalls on device are handled within this class at present -ROOTFS_PKGMANAGE_BOOTSTRAP = "" - do_rootfs[depends] += "rpm-native:do_populate_sysroot" do_rootfs[depends] += "rpmresolve-native:do_populate_sysroot" do_rootfs[depends] += "python-smartpm-native:do_populate_sysroot" diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index e9c8f23c18..44e228d53d 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" -PR = "r61" +PR = "r62" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -200,7 +200,7 @@ CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE" LDFLAGS_append_libc-uclibc = "-lrt -lpthread" -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" +PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale ${PN}-postinsts" SOLIBS = "5.4.so" @@ -224,9 +224,11 @@ FILES_${PN} = "${bindir}/rpm \ ${libdir}/rpm/bin/wget \ /var/lib/rpm \ /var/cache/rpm \ - ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \ " +FILES_${PN}-postinsts = "${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \ + " + FILES_${PN}-dbg += "${libdir}/rpm/.debug \ ${libdir}/rpm/bin/.debug \ " |