rpm: Build with selinux support.

Acked-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>

2 files changed, 39 insertions, 0 deletions

diff --git a/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch b/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
new file mode 100644
index 0000000..d3d36d8
--- /dev/null
+++ b/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
@@ -0,0 +1,25 @@
+From: Xin Ouyang <Xin.Ouyang@windriver.com>
+Date: Mon, 25 Jun 2012 15:08:03 +0800
+Subject: [PATCH] rpm: fix build bug.
+
+Upstream-Status: Pending
+---
+ rpmio/macro.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/rpmio/macro.c b/rpmio/macro.c
+index 9f4cb01..cf9ede5 100644
+--- a/rpmio/macro.c
++++ b/rpmio/macro.c
+@@ -99,7 +99,7 @@ const char * rpmMacrofiles = MACROFILES;
+ #include "debug.h"
+ 
+ /*@unchecked@*/
+-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
++#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SELINUX)
+ static int _globalI = 0x80000000;
+ #endif
+ 
+-- 
+1.7.5.4
+
diff --git a/recipes-devtools/rpm/rpm_5.4.9.bbappend b/recipes-devtools/rpm/rpm_5.4.9.bbappend
new file mode 100644
index 0000000..831f581
--- /dev/null
+++ b/recipes-devtools/rpm/rpm_5.4.9.bbappend
@@ -0,0 +1,14 @@
+PR .= ".1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://rpm-fix-build-bug.patch \
+           "
+
+FILES_${PN} += "${libdir}/rpm/bin/spooktool \
+                ${libdir}/rpm/bin/semodule \
+               "
+
+# Fix incorrect dependency in upstream version
+PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libselinux,"
+PACKAGECONFIG_append = " ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"