summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs
diff options
context:
space:
mode:
authorAndrei Dinu <andrei.adrianx.dinu@intel.com>2013-01-30 16:47:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-01 15:54:31 +0000
commit920ddb426267c545c8ed525cfbe01f9d3cf48949 (patch)
treee2ac9a691f951279dbfeafbbaad96f1ceab6f131 /meta/recipes-devtools/e2fsprogs
parent20822dedfee77567837a2539baec7d07d2f92449 (diff)
downloadpoky-920ddb426267c545c8ed525cfbe01f9d3cf48949.tar.gz
e2fsprogs : upgrade to 1.42.6
- removed the usage of the patches already contained in the new version - adapted patch remove.ldconfig.call.patch so that it applies on new version (From OE-Core rev: 7ceba1eb102b3f855f561764833f8a7a407b7785) Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch33
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/acinclude.m4 (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4)0
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/fallocate.patch (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch)0
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/mkdir.patch (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch)0
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/remove.ldconfig.call.patch44
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.6.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb)9
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 @@
1When /etc/ld.so.cache is writeable by user running bitbake then it
2creates invalid cache (in my case libstdc++.so cannot be found after
3building zlib(-native) and I have to call touch */libstdc++.so &&
4/sbin/ldconfig to fix it.
5
6So remove ldconfig call from make install-libs
7
8Patch authored by Martin Jansa.
9
10Upstream-Status: Inappropriate [disable feature]
11
12Signed-off-by: Scott Garman <scott.a.garman@intel.com>
13
14diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib
15--- e2fsprogs-1.42.orig/lib/Makefile.elf-lib 2010-06-14 05:07:36.000000000 +0200
16+++ e2fsprogs-1.42/lib/Makefile.elf-lib 2012-02-23 14:26:07.021272275 +0100
17@@ -52,8 +52,6 @@
18 $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
19 $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
20 fi
21- $(E) " LDCONFIG"
22- $(Q) -$(LDCONFIG)
23
24 install-strip: install
25 $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
26@@ -69,7 +67,6 @@
27 $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
28 $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
29 $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
30- -$(LDCONFIG)
31
32 clean::
33 $(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 @@
1From b139e03ac2f72e644e547c7ee9b1514383af4d97 Mon Sep 17 00:00:00 2001
2From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
3Date: Wed, 30 Jan 2013 15:22:04 +0200
4Subject: [PATCH] When /etc/ld.so.cache is writeable by user running bitbake
5 then it creates invalid cache (in my case libstdc++.so
6 cannot be found after building zlib(-native) and I have to
7 call touch */libstdc++.so && /sbin/ldconfig to fix it.
8
9So remove ldconfig call from make install-libs
10
11Patch authored by Martin Jansa.
12
13Upstream-Status: Inappropriate [disable feature]
14
15Signed-off-by: Scott Garman <scott.a.garman@intel.com>
16Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
17---
18 lib/Makefile.elf-lib | 3 ---
19 1 file changed, 3 deletions(-)
20
21diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
22index 78479d3..4a4a5ac 100644
23--- a/lib/Makefile.elf-lib
24+++ b/lib/Makefile.elf-lib
25@@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
26 $(E) " SYMLINK $(libdir)/$(ELF_IMAGE).so"
27 $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
28 $(libdir)/$(ELF_IMAGE).so $(DESTDIR)
29- $(E) " LDCONFIG"
30- $(Q) -$(LDCONFIG)
31
32 install-strip: install
33 $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
34@@ -67,7 +65,6 @@ uninstall-shlibs uninstall::
35 $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
36 $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
37 $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
38- -$(LDCONFIG)
39
40 clean::
41 $(RM) -rf elfshared
42--
431.7.9.5
44
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 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r4" 3PR = "r0"
4 4
5SRC_URI += "file://fallocate.patch \ 5SRC_URI += "file://acinclude.m4 \
6 file://acinclude.m4 \
7 file://remove.ldconfig.call.patch \ 6 file://remove.ldconfig.call.patch \
8" 7"
9 8
10SRC_URI[md5sum] = "8ed1501ae6746e2e735bdd1407211dc9" 9SRC_URI[md5sum] = "9e444c240c1001b3292d108fbad0f49c"
11SRC_URI[sha256sum] = "0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991" 10SRC_URI[sha256sum] = "726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5"
12 11
13EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" 12EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
14EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" 13EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"