From 0e832baadf78d5c6caa4a3b41d49430971b9bacb Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 6 Jul 2012 15:06:42 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 8 ++++---- 1 file 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" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file" -PR = "r44" +PR = "r45" # 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... @@ -129,13 +129,13 @@ PACKAGECONFIG[libelf] = "--with-libelf,--without-libelf,elfutils," WITH_SELINUX = "--with-selinux --with-sepol --with-semanage" WITHOUT_SELINUX = "--without-selinux --without-sepol --without-semanage" -PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},selinux," +PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libselinux," WITH_NEON = "--with-neon --with-libproxy --with-expat --without-gssapi" WITHOUT_NEON = "--without-neon --without-libproxy --without-expat --without-gssapi" -PACKAGECONFIG[neon] = "${WITH_NEON},${WITHOUT_NEON},neon," +PACKAGECONFIG[neon] = "${WITH_NEON},${WITHOUT_NEON},neon expat," -PACKAGECONFIG[lua] = "--with-lua,--without-lua," +PACKAGECONFIG[lua] = "--with-lua,--without-lua,expat," PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl," PACAKGECONFIG[augeas] = "--with-augeas,--without-augeas,augeas," -- cgit v1.2.3-54-g00ecf