Patchwork cronie: fix out of tree build

login
register
mail settings
Submitter Saul Wold
Date Aug. 16, 2013, 9:34 p.m.
Message ID <1376688884-23815-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/55959/
State Accepted
Commit fd9e591f266e1a6c183e77f24e50d31e0d52bdd5
Headers show

Comments

Saul Wold - Aug. 16, 2013, 9:34 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../cronie/cronie/fix-out-of-tree-build.patch      | 31 ++++++++++++++++++++++
 meta/recipes-extended/cronie/cronie_1.4.11.bb      |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch

Patch

diff --git a/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch b/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch
new file mode 100644
index 0000000..7384a0b
--- /dev/null
+++ b/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch
@@ -0,0 +1,31 @@ 
+For an out of tree build, the cronie-common.h file was not being
+found correctly, so point it to the top_srcdir
+
+Upstream-Status: Submitted
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: cronie-1.4.11/anacron/Makefile.am
+===================================================================
+--- cronie-1.4.11.orig/anacron/Makefile.am
++++ cronie-1.4.11/anacron/Makefile.am
+@@ -9,6 +9,7 @@ common_nodist = anacron-paths.h
+ nodist_anacron_SOURCES = $(common_nodist)
+ BUILT_SOURCES = $(common_nodist)
+ 
++AM_CFLAGS = -I$(top_srcdir)
+ 
+ LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT)
+ 
+Index: cronie-1.4.11/src/Makefile.am
+===================================================================
+--- cronie-1.4.11.orig/src/Makefile.am
++++ cronie-1.4.11/src/Makefile.am
+@@ -15,6 +15,7 @@ nodist_crond_SOURCES = $(common_nodist)
+ nodist_crontab_SOURCES = $(common_nodist)
+ BUILT_SOURCES = $(common_nodist)
+ 
++AM_CFLAGS = -I$(top_srcdir)
+ 
+ LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT)
+ 
diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb
index 5b12448..aa1ba39 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.11.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.11.bb
@@ -19,6 +19,7 @@  RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '',
 PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
 
 SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
+           file://fix-out-of-tree-build.patch \
            file://crond.init \
            file://crontab \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"