diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/libuser/libuser/fixsepbuild.patch | 35 | ||||
-rw-r--r-- | meta/recipes-extended/libuser/libuser_0.61.bb (renamed from meta/recipes-extended/libuser/libuser_0.60.bb) | 6 |
2 files changed, 3 insertions, 38 deletions
diff --git a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch deleted file mode 100644 index 893ca1490b..0000000000 --- a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Fix out of tree build errors and parallel make issues. The mkdir commands | ||
2 | can race each other. The srcdir variable is a complete path so a ../ prefix makes | ||
3 | no sense. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | RP 2013/03/21 | ||
8 | |||
9 | Index: libuser-0.58/docs/Makefile.am | ||
10 | =================================================================== | ||
11 | --- libuser-0.58.orig/docs/Makefile.am 2012-11-07 18:25:58.000000000 -0800 | ||
12 | +++ libuser-0.58/docs/Makefile.am 2013-03-22 23:32:06.843518069 -0700 | ||
13 | @@ -8,14 +8,14 @@ | ||
14 | |||
15 | all: sgml/libuser.txt sgml/libuser.html | ||
16 | |||
17 | -libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile | ||
18 | +libuser.conf.5: $(abs_srcdir)/libuser.conf.5.in Makefile | ||
19 | sed 's,@sysconfdir\@,$(sysconfdir),g' \ | ||
20 | - < $(srcdir)/libuser.conf.5.in > $@ | ||
21 | + < $(abs_srcdir)/libuser.conf.5.in > $@ | ||
22 | |||
23 | -sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml | ||
24 | - [ -d sgml ] || mkdir sgml | ||
25 | - cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml | ||
26 | +sgml/libuser.txt: $(abs_srcdir)/sgml/libuser.sgml | ||
27 | + [ -d sgml ] || mkdir sgml || true | ||
28 | + cd sgml; sgml2txt $(abs_srcdir)/sgml/libuser.sgml | ||
29 | |||
30 | -sgml/libuser.html: $(srcdir)/sgml/libuser.sgml | ||
31 | - [ -d sgml ] || mkdir sgml | ||
32 | - cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml | ||
33 | +sgml/libuser.html: $(abs_srcdir)/sgml/libuser.sgml | ||
34 | + [ -d sgml ] || mkdir sgml || true | ||
35 | + cd sgml; sgml2html $(abs_srcdir)/sgml/libuser.sgml | ||
diff --git a/meta/recipes-extended/libuser/libuser_0.60.bb b/meta/recipes-extended/libuser/libuser_0.61.bb index e6316ef488..f2b9ddbb9a 100644 --- a/meta/recipes-extended/libuser/libuser_0.60.bb +++ b/meta/recipes-extended/libuser/libuser_0.61.bb | |||
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | |||
12 | SECTION = "base" | 12 | SECTION = "base" |
13 | 13 | ||
14 | SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \ | 14 | SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \ |
15 | file://fixsepbuild.patch" | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "5c549724999ccca65ceaaecc4eb8cb98" | 17 | SRC_URI[md5sum] = "d977dc59161272c1491edd9ca7ba22f2" |
18 | SRC_URI[sha256sum] = "b1f73408ebfee79eb01a47c5879a2cdef6a00b75ee24870de7df1b816ff483eb" | 18 | SRC_URI[sha256sum] = "0a114a52446e12781e2ffdf26f59df0d14e7809c7db5e551d3cf61c4e398751d" |
19 | 19 | ||
20 | DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native python" | 20 | DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native python" |
21 | 21 | ||