e2fsprogs: upgrade to 1.42.1

Includes minor tweaks to the formatting of some patch headers and the
addition of a SOB line where needed.

(From OE-Core rev: bb9af542bc69f417d414d92ebf46a9412944c1e1)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

5 files changed, 14 insertions, 8 deletions

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4
index 4b00668476..4b00668476 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch
index 4d952a5df7..d074c15cfd 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch
@@ -3,10 +3,10 @@ but we need to check if we have fallocate()
 this problem shows up on uclibc systems since
 uclibc does not have fallocate() implemented
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
 ===================================================================
 --- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c    2012-01-17 17:24:34.290780625 -0800
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch
index e91ffa96c4..aa7a2981b4 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch
@@ -1,4 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Mei Lei <lei.mei@intel.com>
 
 Index: e2fsprogs-1.41.5/po/Makefile.in.in
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch
index 0e5fd7d3fb..7be4c3e544 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch
@@ -1,11 +1,16 @@
-When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
-(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
-touch */libstdc++.so && /sbin/ldconfig to fix it.
+When /etc/ld.so.cache is writeable by user running bitbake then it
+creates invalid cache (in my case libstdc++.so cannot be found after
+building zlib(-native) and I have to call touch */libstdc++.so &&
+/sbin/ldconfig to fix it.
 
 So remove ldconfig call from make install-libs
 
+Patch authored by Martin Jansa.
+
 Upstream-Status: Inappropriate [disable feature]
 
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib
 --- e2fsprogs-1.42.orig/lib/Makefile.elf-lib    2010-06-14 05:07:36.000000000 +0200
 +++ e2fsprogs-1.42/lib/Makefile.elf-lib 2012-02-23 14:26:07.021272275 +0100
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
index 6e3f7b8377..6df7cea320 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
@@ -1,14 +1,14 @@
 require e2fsprogs.inc
 
-PR = "r4"
+PR = "r0"
 
 SRC_URI += "file://fallocate.patch \
             file://acinclude.m4 \
             file://remove.ldconfig.call.patch \
 "
 
-SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610"
-SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46"
+SRC_URI[md5sum] = "8ed1501ae6746e2e735bdd1407211dc9"
+SRC_URI[sha256sum] = "0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
 EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"