diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-08-16 14:34:44 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-19 11:25:23 +0100 |
commit | 6382979cca1d1c57467f983ba9611f91555b20a9 (patch) | |
tree | 00f199e3c6fae1993541647c9e9692989018e244 /meta | |
parent | 2a48e9007cc92fedfdb6919411859fb943eacc94 (diff) | |
download | poky-6382979cca1d1c57467f983ba9611f91555b20a9.tar.gz |
cronie: fix out of tree build
(From OE-Core rev: fd9e591f266e1a6c183e77f24e50d31e0d52bdd5)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/cronie/cronie_1.4.11.bb | 1 |
2 files changed, 32 insertions, 0 deletions
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 0000000000..7384a0bad4 --- /dev/null +++ b/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | For an out of tree build, the cronie-common.h file was not being | ||
2 | found correctly, so point it to the top_srcdir | ||
3 | |||
4 | Upstream-Status: Submitted | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | Index: cronie-1.4.11/anacron/Makefile.am | ||
9 | =================================================================== | ||
10 | --- cronie-1.4.11.orig/anacron/Makefile.am | ||
11 | +++ cronie-1.4.11/anacron/Makefile.am | ||
12 | @@ -9,6 +9,7 @@ common_nodist = anacron-paths.h | ||
13 | nodist_anacron_SOURCES = $(common_nodist) | ||
14 | BUILT_SOURCES = $(common_nodist) | ||
15 | |||
16 | +AM_CFLAGS = -I$(top_srcdir) | ||
17 | |||
18 | LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT) | ||
19 | |||
20 | Index: cronie-1.4.11/src/Makefile.am | ||
21 | =================================================================== | ||
22 | --- cronie-1.4.11.orig/src/Makefile.am | ||
23 | +++ cronie-1.4.11/src/Makefile.am | ||
24 | @@ -15,6 +15,7 @@ nodist_crond_SOURCES = $(common_nodist) | ||
25 | nodist_crontab_SOURCES = $(common_nodist) | ||
26 | BUILT_SOURCES = $(common_nodist) | ||
27 | |||
28 | +AM_CFLAGS = -I$(top_srcdir) | ||
29 | |||
30 | LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT) | ||
31 | |||
diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb index 5b124482a3..aa1ba39346 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}', '', | |||
19 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" | 19 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" |
20 | 20 | ||
21 | SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ | 21 | SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ |
22 | file://fix-out-of-tree-build.patch \ | ||
22 | file://crond.init \ | 23 | file://crond.init \ |
23 | file://crontab \ | 24 | file://crontab \ |
24 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" | 25 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" |