diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-17 11:39:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-17 11:41:30 +0100 |
commit | d78dcf56989d5e7fb5ac101f9af5cbf253f1a2df (patch) | |
tree | 9f7974a93830c45efc397f35d04dffb78076d531 /meta/recipes-extended/augeas | |
parent | c1ac96dde194e326d98fb9a82ed002ce2e03c2ea (diff) | |
download | openembedded-core-contrib-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>
Diffstat (limited to 'meta/recipes-extended/augeas')
-rw-r--r-- | meta/recipes-extended/augeas/augeas.inc | 1 | ||||
-rw-r--r-- | meta/recipes-extended/augeas/augeas/sepbuildfix.patch | 22 |
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" SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ file://add-missing-argz-conditional.patch \ + file://sepbuildfix.patch \ " DEPENDS = "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 @@ +Ensure that builds in separate builddirs (${B} != ${S}) correctly install the +lenses files. + +Upstream-Status: Pending + +RP 2013/4/17 + +Index: augeas-1.0.0/Makefile.am +=================================================================== +--- augeas-1.0.0.orig/Makefile.am 2012-11-02 15:20:11.000000000 +0000 ++++ augeas-1.0.0/Makefile.am 2013-04-17 10:36:24.033400125 +0000 +@@ -5,8 +5,8 @@ + lensdir=$(datadir)/augeas/lenses/dist + lenstestdir=$(datadir)/augeas/lenses/dist/tests + +-dist_lens_DATA=$(wildcard lenses/*.aug) +-dist_lenstest_DATA=$(wildcard lenses/tests/*.aug) ++dist_lens_DATA=$(wildcard $(top_srcdir)/lenses/*.aug) ++dist_lenstest_DATA=$(wildcard $(top_srcdir)lenses/tests/*.aug) + + EXTRA_DIST=augeas.spec build/aux/move-if-change Makefile.am HACKING + |