summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-07-06 15:06:42 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 11:38:02 +0100
commit0e832baadf78d5c6caa4a3b41d49430971b9bacb (patch)
tree6db7f1fc54a18404d7570ccbc6998877361f7c48 /meta
parente17ae2c830cdd03d23ffed56a384f3a9b4122a2c (diff)
downloadpoky-0e832baadf78d5c6caa4a3b41d49430971b9bacb.tar.gz
rpm: Fix PACKAGECONFIG dependencies
neon requires expat to be built first lua similarly requires expat if enabled selinux package name should be "libselinux" (from meta-selinux). (From OE-Core rev: 6b3c9802b659ca1d3b7638ff80e6492cc0e16d6f) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 8e892a8389..6ef1aae025 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" 45DEPENDS = "libpcre attr acl popt ossp-uuid file"
46PR = "r44" 46PR = "r45"
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...
@@ -129,13 +129,13 @@ PACKAGECONFIG[libelf] = "--with-libelf,--without-libelf,elfutils,"
129 129
130WITH_SELINUX = "--with-selinux --with-sepol --with-semanage" 130WITH_SELINUX = "--with-selinux --with-sepol --with-semanage"
131WITHOUT_SELINUX = "--without-selinux --without-sepol --without-semanage" 131WITHOUT_SELINUX = "--without-selinux --without-sepol --without-semanage"
132PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},selinux," 132PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libselinux,"
133 133
134WITH_NEON = "--with-neon --with-libproxy --with-expat --without-gssapi" 134WITH_NEON = "--with-neon --with-libproxy --with-expat --without-gssapi"
135WITHOUT_NEON = "--without-neon --without-libproxy --without-expat --without-gssapi" 135WITHOUT_NEON = "--without-neon --without-libproxy --without-expat --without-gssapi"
136PACKAGECONFIG[neon] = "${WITH_NEON},${WITHOUT_NEON},neon," 136PACKAGECONFIG[neon] = "${WITH_NEON},${WITHOUT_NEON},neon expat,"
137 137
138PACKAGECONFIG[lua] = "--with-lua,--without-lua," 138PACKAGECONFIG[lua] = "--with-lua,--without-lua,expat,"
139PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl," 139PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl,"
140 140
141PACAKGECONFIG[augeas] = "--with-augeas,--without-augeas,augeas," 141PACAKGECONFIG[augeas] = "--with-augeas,--without-augeas,augeas,"