summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-02-23 16:50:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:53:03 +0000
commit5a4b06ddec9af12d3281084b87cd6eb1c7fbbe6c (patch)
tree231a42c1030894e58cefcd5e82a4893df427a001
parent30b709c50ce41671dccb897a1b61bc737f7b0424 (diff)
downloadpoky-5a4b06ddec9af12d3281084b87cd6eb1c7fbbe6c.tar.gz
e2fsprogs: remove ldconfig call from install-libs
(From OE-Core rev: 6a74c2050de4540deaf4e855bdf7aec4518f648a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch28
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb6
2 files changed, 32 insertions, 2 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch
new file mode 100644
index 0000000000..0e5fd7d3fb
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch
@@ -0,0 +1,28 @@
1When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
2(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
3touch */libstdc++.so && /sbin/ldconfig to fix it.
4
5So remove ldconfig call from make install-libs
6
7Upstream-Status: Inappropriate [disable feature]
8
9diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib
10--- e2fsprogs-1.42.orig/lib/Makefile.elf-lib 2010-06-14 05:07:36.000000000 +0200
11+++ e2fsprogs-1.42/lib/Makefile.elf-lib 2012-02-23 14:26:07.021272275 +0100
12@@ -52,8 +52,6 @@
13 $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
14 $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
15 fi
16- $(E) " LDCONFIG"
17- $(Q) -$(LDCONFIG)
18
19 install-strip: install
20 $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
21@@ -69,7 +67,6 @@
22 $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
23 $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
24 $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
25- -$(LDCONFIG)
26
27 clean::
28 $(RM) -rf elfshared
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index 2289211c80..c40d02ff71 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,9 +1,11 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI += "file://fallocate.patch \ 5SRC_URI += "file://fallocate.patch \
6 file://acinclude.m4" 6 file://acinclude.m4 \
7 file://remove.ldconfig.call.patch \
8"
7 9
8SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610" 10SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610"
9SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46" 11SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46"