diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-21 14:18:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:54:35 +0000 |
| commit | 211aeccc17b532d71938beaca274efcad2e3fb0b (patch) | |
| tree | 744dc663e0924fc4685e75b8754fa3b8d98f5f8d /meta | |
| parent | 6211a2bdd32f7b2c8de7a5d75353c0522c8d4230 (diff) | |
| download | ast2050-yocto-poky-211aeccc17b532d71938beaca274efcad2e3fb0b.zip ast2050-yocto-poky-211aeccc17b532d71938beaca274efcad2e3fb0b.tar.gz | |
libuser: Fix case where ${B} != ${S}
Fix out of tree builds and a parallel make race, see the patch header
for details.
(From OE-Core rev: ef259227fc6d8147b493554e381aa196f5a7a96a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/libuser/libuser/fixsepbuild.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-extended/libuser/libuser_0.58.bb | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch new file mode 100644 index 0000000..27e6bc6 --- /dev/null +++ b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch @@ -0,0 +1,26 @@ +Fix out of tree build errors and parallel make issues. The mkdir commands +can race each other. The srcdir variable is a complete path so a ../ prefix makes +no sense. + +Upstream-Status: Pending + +RP 2013/03/21 + +Index: libuser/docs/Makefile.am +=================================================================== +--- libuser/docs.orig/Makefile.am 2012-11-08 02:25:58.000000000 +0000 ++++ libuser/docs/Makefile.am 2013-03-21 14:15:40.756950231 +0000 +@@ -13,9 +13,9 @@ + < $(srcdir)/libuser.conf.5.in > $@ + + sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml +- [ -d sgml ] || mkdir sgml +- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml ++ [ -d sgml ] || mkdir sgml || true ++ cd sgml; sgml2txt $(srcdir)/sgml/libuser.sgml + + sgml/libuser.html: $(srcdir)/sgml/libuser.sgml +- [ -d sgml ] || mkdir sgml +- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml ++ [ -d sgml ] || mkdir sgml || true ++ cd sgml; sgml2html $(srcdir)/sgml/libuser.sgml diff --git a/meta/recipes-extended/libuser/libuser_0.58.bb b/meta/recipes-extended/libuser/libuser_0.58.bb index fbd3dd5..c1fe49d 100644 --- a/meta/recipes-extended/libuser/libuser_0.58.bb +++ b/meta/recipes-extended/libuser/libuser_0.58.bb @@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SECTION = "base" -SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz" +SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \ + file://fixsepbuild.patch" SRC_URI[md5sum] = "1fc3ef3f3a3955b2d78562ff4daed793" SRC_URI[sha256sum] = "12a0c09d016d80687e04227a00a89e3c056d3b48bfa2444a9028e6474d8e1dbd" |
