summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/rootfs_rpm.bbclass4
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb8
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 @@
3# 3#
4 4
5ROOTFS_PKGMANAGE = "rpm smartpm" 5ROOTFS_PKGMANAGE = "rpm smartpm"
6ROOTFS_PKGMANAGE_BOOTSTRAP = "rpm-postinsts"
6 7
7# Add 50Meg of extra space for Smart 8# Add 50Meg of extra space for Smart
8IMAGE_ROOTFS_EXTRA_SPACE_append = "${@base_contains("PACKAGE_INSTALL", "smartpm", " + 51200", "" ,d)}" 9IMAGE_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"
10# Smart is python based, so be sure python-native is available to us. 11# Smart is python based, so be sure python-native is available to us.
11EXTRANATIVEPATH += "python-native" 12EXTRANATIVEPATH += "python-native"
12 13
13# Postinstalls on device are handled within this class at present
14ROOTFS_PKGMANAGE_BOOTSTRAP = ""
15
16do_rootfs[depends] += "rpm-native:do_populate_sysroot" 14do_rootfs[depends] += "rpm-native:do_populate_sysroot"
17do_rootfs[depends] += "rpmresolve-native:do_populate_sysroot" 15do_rootfs[depends] += "rpmresolve-native:do_populate_sysroot"
18do_rootfs[depends] += "python-smartpm-native:do_populate_sysroot" 16do_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"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" 45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
46PR = "r61" 46PR = "r62"
47 47
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 49# 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"
200 200
201LDFLAGS_append_libc-uclibc = "-lrt -lpthread" 201LDFLAGS_append_libc-uclibc = "-lrt -lpthread"
202 202
203PACKAGES = "${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" 203PACKAGES = "${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"
204 204
205SOLIBS = "5.4.so" 205SOLIBS = "5.4.so"
206 206
@@ -224,9 +224,11 @@ FILES_${PN} = "${bindir}/rpm \
224 ${libdir}/rpm/bin/wget \ 224 ${libdir}/rpm/bin/wget \
225 /var/lib/rpm \ 225 /var/lib/rpm \
226 /var/cache/rpm \ 226 /var/cache/rpm \
227 ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
228 " 227 "
229 228
229FILES_${PN}-postinsts = "${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
230 "
231
230FILES_${PN}-dbg += "${libdir}/rpm/.debug \ 232FILES_${PN}-dbg += "${libdir}/rpm/.debug \
231 ${libdir}/rpm/bin/.debug \ 233 ${libdir}/rpm/bin/.debug \
232 " 234 "