From 60ec38e8fa76b7954a84e0498aea483f0c458ffd Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Mon, 10 Apr 2017 09:03:11 -0400
Subject: minimum build changes

Not intended as a final patch, this is just a quick hack for master-next
to enable building meta-selinux on current yocto base images.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch   | 22 ----------------------
 recipes-devtools/rpm/rpm_%.bbappend                |  8 ++++++++
 recipes-devtools/rpm/rpm_5.4.16.bbappend           | 10 ----------
 .../findutils/findutils_4.2.31.bbappend            |  7 -------
 4 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
 create mode 100644 recipes-devtools/rpm/rpm_%.bbappend
 delete mode 100644 recipes-devtools/rpm/rpm_5.4.16.bbappend
 delete mode 100644 recipes-extended/findutils/findutils_4.2.31.bbappend

diff --git a/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch b/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
deleted file mode 100644
index 2ae406b..0000000
--- a/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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(-)
-
-Index: rpm-5.4.15/rpmio/macro.c
-===================================================================
---- rpm-5.4.15.orig/rpmio/macro.c
-+++ rpm-5.4.15/rpmio/macro.c
-@@ -111,7 +111,7 @@ const char * rpmMacrofiles = MACROFILES;
- #endif
- 
- /*@unchecked@*/
--#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_MOZJS) || 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
- 
diff --git a/recipes-devtools/rpm/rpm_%.bbappend b/recipes-devtools/rpm/rpm_%.bbappend
new file mode 100644
index 0000000..199a7e4
--- /dev/null
+++ b/recipes-devtools/rpm/rpm_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+FILES_${PN} += "${libdir}/rpm/bin/spooktool \
+                ${libdir}/rpm/bin/semodule \
+               "
+
+inherit with-selinux
+PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage,"
diff --git a/recipes-devtools/rpm/rpm_5.4.16.bbappend b/recipes-devtools/rpm/rpm_5.4.16.bbappend
deleted file mode 100644
index 2a41a28..0000000
--- a/recipes-devtools/rpm/rpm_5.4.16.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://rpm-fix-build-bug.patch \
-          "
-FILES_${PN} += "${libdir}/rpm/bin/spooktool \
-                ${libdir}/rpm/bin/semodule \
-               "
-
-inherit with-selinux
-PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage,"
diff --git a/recipes-extended/findutils/findutils_4.2.31.bbappend b/recipes-extended/findutils/findutils_4.2.31.bbappend
deleted file mode 100644
index 4c9495e..0000000
--- a/recipes-extended/findutils/findutils_4.2.31.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-PR .= ".2"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-SRC_URI += "file://findutils-selinux.patch"
-
-inherit with-selinux
-- 
cgit v1.2.3-54-g00ecf