6 files changed, 48 insertions, 38 deletions

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch
deleted file mode 100644
index 7be4c3e544..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-@@ -52,8 +52,6 @@
-                $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-                        $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
-        fi                      
--       $(E) "  LDCONFIG"
--       $(Q) -$(LDCONFIG)
- 
- install-strip: install
-        $(E) "  STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-@@ -69,7 +67,6 @@
-        $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
-                $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-                $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
--       -$(LDCONFIG)
- 
- clean::
-        $(RM) -rf elfshared
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/acinclude.m4
index 4b00668476..4b00668476 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/acinclude.m4
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/fallocate.patch
index d074c15cfd..d074c15cfd 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/fallocate.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/mkdir.patch
index aa7a2981b4..aa7a2981b4 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/mkdir.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/remove.ldconfig.call.patch
new file mode 100644
index 0000000000..f3e6eb778f
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/remove.ldconfig.call.patch
@@ -0,0 +1,44 @@
+From b139e03ac2f72e644e547c7ee9b1514383af4d97 Mon Sep 17 00:00:00 2001
+From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
+Date: Wed, 30 Jan 2013 15:22:04 +0200
+Subject: [PATCH] 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>
+Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
+---
+ lib/Makefile.elf-lib |    3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
+index 78479d3..4a4a5ac 100644
+--- a/lib/Makefile.elf-lib
++++ b/lib/Makefile.elf-lib
+@@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
+        $(E) "  SYMLINK $(libdir)/$(ELF_IMAGE).so"
+        $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+                $(libdir)/$(ELF_IMAGE).so $(DESTDIR)
+-       $(E) "  LDCONFIG"
+-       $(Q) -$(LDCONFIG)
+ 
+ install-strip: install
+        $(E) "  STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+@@ -67,7 +65,6 @@ uninstall-shlibs uninstall::
+        $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
+                $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+                $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
+-       -$(LDCONFIG)
+ 
+ clean::
+        $(RM) -rf elfshared
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.6.bb
index b0eee3be43..e6d90a1505 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.6.bb
@@ -1,14 +1,13 @@
 require e2fsprogs.inc
 
-PR = "r4"
+PR = "r0"
 
-SRC_URI += "file://fallocate.patch \
-            file://acinclude.m4 \
+SRC_URI += "file://acinclude.m4 \
             file://remove.ldconfig.call.patch \
 "
 
-SRC_URI[md5sum] = "8ed1501ae6746e2e735bdd1407211dc9"
-SRC_URI[sha256sum] = "0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991"
+SRC_URI[md5sum] = "9e444c240c1001b3292d108fbad0f49c"
+SRC_URI[sha256sum] = "726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5"
 
 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"