summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 11:39:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 11:41:30 +0100
commitd78dcf56989d5e7fb5ac101f9af5cbf253f1a2df (patch)
tree9f7974a93830c45efc397f35d04dffb78076d531
parentc1ac96dde194e326d98fb9a82ed002ce2e03c2ea (diff)
downloadpoky-d78dcf56989d5e7fb5ac101f9af5cbf253f1a2df.tar.gz
augeas: Fix missing files with separate build directory
${datadir} was empty when building ${B} != ${S}, this patch addresses that problem and means the -lenses package is no longer empty. (From OE-Core rev: ee3b0d8fbe42a3c813039850886b5bf97544eb15) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/augeas/augeas.inc1
-rw-r--r--meta/recipes-extended/augeas/augeas/sepbuildfix.patch22
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc
index c956621eb1..da41d420ef 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
7 7
8SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ 8SRC_URI = "http://download.augeas.net/${BP}.tar.gz \
9 file://add-missing-argz-conditional.patch \ 9 file://add-missing-argz-conditional.patch \
10 file://sepbuildfix.patch \
10 " 11 "
11 12
12DEPENDS = "readline libxml2" 13DEPENDS = "readline libxml2"
diff --git a/meta/recipes-extended/augeas/augeas/sepbuildfix.patch b/meta/recipes-extended/augeas/augeas/sepbuildfix.patch
new file mode 100644
index 0000000000..b82a3ee2cb
--- /dev/null
+++ b/meta/recipes-extended/augeas/augeas/sepbuildfix.patch
@@ -0,0 +1,22 @@
1Ensure that builds in separate builddirs (${B} != ${S}) correctly install the
2lenses files.
3
4Upstream-Status: Pending
5
6RP 2013/4/17
7
8Index: augeas-1.0.0/Makefile.am
9===================================================================
10--- augeas-1.0.0.orig/Makefile.am 2012-11-02 15:20:11.000000000 +0000
11+++ augeas-1.0.0/Makefile.am 2013-04-17 10:36:24.033400125 +0000
12@@ -5,8 +5,8 @@
13 lensdir=$(datadir)/augeas/lenses/dist
14 lenstestdir=$(datadir)/augeas/lenses/dist/tests
15
16-dist_lens_DATA=$(wildcard lenses/*.aug)
17-dist_lenstest_DATA=$(wildcard lenses/tests/*.aug)
18+dist_lens_DATA=$(wildcard $(top_srcdir)/lenses/*.aug)
19+dist_lenstest_DATA=$(wildcard $(top_srcdir)lenses/tests/*.aug)
20
21 EXTRA_DIST=augeas.spec build/aux/move-if-change Makefile.am HACKING
22