summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-01-01 01:25:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 11:13:57 +0000
commit63281708fab30adc4ca1a506deefbf8a54dcce6d (patch)
treebf6b9b48314909bd062f4fba473708065cbd6c81 /meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
parent5ddb7d4ebb135e288ab56b44aceabb3578ae9ed1 (diff)
downloadpoky-63281708fab30adc4ca1a506deefbf8a54dcce6d.tar.gz
e2fsprogs: upgrade to 1.42.9
* Upgrade to 1.42.9 * Remove the following patches since they have been merged/fixed by upstream: - debugfs-extent-header.patch - debugfs-sparse-copy.patch - debugfs-too-short.patch - e2fsprogs-fix-tests-f_extent_oobounds.patch - fallocate.patch * The populate-extfs.sh had been merged by the upstream, but I'd like to go on using the previous one which is from our meta layer, they are a little different, and the script would be dropped when we use the mke2fs to populate the rootfs. * Sumitted the patch for populate-extfs.sh (from Søren Holm) to upstream. * Submitted fix-icache.patch to upstream, I wrongly thought it was not applicable to the upstream, but it does. * Join the do_install() and do_install_append() together. (From OE-Core rev: 82cc941128f9eaf57c3a9a648fc58227f6c1956c) Signed-off-by: Robert Yang <liezhi.yang@windriver.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/e2fsprogs/remove.ldconfig.call.patch')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
new file mode 100644
index 0000000000..f3e6eb778f
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/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