summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-07 04:24:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-07 17:32:01 +0100
commit18c0022628dda83eb2cd73a702df7e277d31211f (patch)
treecfc9fe177c0cf3871f505d0b0d50e9449e0d12a1 /meta
parentaf76eb0405352d66dfd00d7f856f401d892855e1 (diff)
downloadopenembedded-core-18c0022628dda83eb2cd73a702df7e277d31211f.tar.gz
libuser: 0.60 -> 0.61
Removed fixsepbuild.patch since it is not needed any more. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libuser/libuser/fixsepbuild.patch35
-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 @@
-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-0.58/docs/Makefile.am
-===================================================================
---- libuser-0.58.orig/docs/Makefile.am 2012-11-07 18:25:58.000000000 -0800
-+++ libuser-0.58/docs/Makefile.am 2013-03-22 23:32:06.843518069 -0700
-@@ -8,14 +8,14 @@
-
- all: sgml/libuser.txt sgml/libuser.html
-
--libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile
-+libuser.conf.5: $(abs_srcdir)/libuser.conf.5.in Makefile
- sed 's,@sysconfdir\@,$(sysconfdir),g' \
-- < $(srcdir)/libuser.conf.5.in > $@
-+ < $(abs_srcdir)/libuser.conf.5.in > $@
-
--sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
-- [ -d sgml ] || mkdir sgml
-- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
-+sgml/libuser.txt: $(abs_srcdir)/sgml/libuser.sgml
-+ [ -d sgml ] || mkdir sgml || true
-+ cd sgml; sgml2txt $(abs_srcdir)/sgml/libuser.sgml
-
--sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
-- [ -d sgml ] || mkdir sgml
-- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
-+sgml/libuser.html: $(abs_srcdir)/sgml/libuser.sgml
-+ [ -d sgml ] || mkdir sgml || true
-+ 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 \
SECTION = "base"
SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
- file://fixsepbuild.patch"
+ "
-SRC_URI[md5sum] = "5c549724999ccca65ceaaecc4eb8cb98"
-SRC_URI[sha256sum] = "b1f73408ebfee79eb01a47c5879a2cdef6a00b75ee24870de7df1b816ff483eb"
+SRC_URI[md5sum] = "d977dc59161272c1491edd9ca7ba22f2"
+SRC_URI[sha256sum] = "0a114a52446e12781e2ffdf26f59df0d14e7809c7db5e551d3cf61c4e398751d"
DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native python"