From: Saul Wold <sgw@linux.intel.com>
Date: Sat, 31 Aug 2013 10:26:40 +0000 (+0300)
Subject: base-passwd: upgrade to 3.5.28
X-Git-Tag: 2015-4~4880
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5cab5935d6924e0aca5da4b682bb83e54f20bc1d;p=openembedded-core.git

base-passwd: upgrade to 3.5.28

Disable docs creation for now it uses po4a and sgmltools-lite which are
not currently part of OE-Core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.26/add_shutdown.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/add_shutdown.patch
similarity index 100%
rename from meta/recipes-core/base-passwd/base-passwd-3.5.26/add_shutdown.patch
rename to meta/recipes-core/base-passwd/base-passwd-3.5.28/add_shutdown.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.28/disable-docs.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/disable-docs.patch
new file mode 100644
index 0000000000..14c08b7484
--- /dev/null
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.28/disable-docs.patch
@@ -0,0 +1,24 @@
+Disable documentation for now as it uses tools currently not supported
+by OE-Core. It uses sgmltools and po4a.
+
+Upstream-Status: Inappropriate [OE-Core specific]
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: base-passwd-3.5.28/Makefile.in
+===================================================================
+--- base-passwd-3.5.28.orig/Makefile.in
++++ base-passwd-3.5.28/Makefile.in
+@@ -25,13 +25,10 @@ gen_configure	= config.cache config.stat
+ 		  confdefhs.h config.h Makefile
+ 
+ all: update-passwd
+-	$(MAKE) -C doc all
+-	$(MAKE) -C man all
+ 
+ install: all
+ 	mkdir -p $(DESTDIR)$(sbindir)
+ 	$(INSTALL) update-passwd $(DESTDIR)$(sbindir)/
+-	$(MAKE) -C man install
+ 
+ update-passwd.o: version.h
+ 
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.26/input.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/input.patch
similarity index 100%
rename from meta/recipes-core/base-passwd/base-passwd-3.5.26/input.patch
rename to meta/recipes-core/base-passwd/base-passwd-3.5.28/input.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.26/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/nobash.patch
similarity index 100%
rename from meta/recipes-core/base-passwd/base-passwd-3.5.26/nobash.patch
rename to meta/recipes-core/base-passwd/base-passwd-3.5.28/nobash.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.28.bb
similarity index 92%
rename from meta/recipes-core/base-passwd/base-passwd_3.5.26.bb
rename to meta/recipes-core/base-passwd/base-passwd_3.5.28.bb
index 4d94dcca65..a3e664a378 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.28.bb
@@ -1,17 +1,20 @@
 SUMMARY = "Base system master password/group files."
 DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group).  The update-passwd tool is also provided to keep the system databases synchronized with these master files."
 SECTION = "base"
-PR = "r2"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
+DEPENDS = "docbook-utils-native linuxdoc-tools-native"
+
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
            file://add_shutdown.patch \
            file://nobash.patch \
-           file://input.patch"
+           file://input.patch \
+           file://disable-docs.patch \
+          "
 
-SRC_URI[md5sum] = "74245e5c21dc74d9675c77cd8dfa02e6"
-SRC_URI[sha256sum] = "258a78317aa563143d10375c6e1e63a60898e503887f00fffd70b6b297c1b429"
+SRC_URI[md5sum] = "9b535ace7ea3073435e7a6d38d62980a"
+SRC_URI[sha256sum] = "06e757a02ec0a77ea38dd3c5b35493b589f81c4b053ee38df1d32e458ee86b67"
 
 inherit autotools