diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-03-15 14:12:15 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 15:33:03 +0000 |
commit | a731d22551f576f84c43d5d88f56113c4652c317 (patch) | |
tree | b0c4c623e07e5e0640f1aaeb55dbb67d874938e2 /meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch | |
parent | 35ada8fe03f14cff78ec6f4e1277c5840e08b334 (diff) | |
download | poky-a731d22551f576f84c43d5d88f56113c4652c317.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch | 33 |
1 files changed, 33 insertions, 0 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 new file mode 100644 index 0000000000..7be4c3e544 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | When /etc/ld.so.cache is writeable by user running bitbake then it | ||
2 | creates invalid cache (in my case libstdc++.so cannot be found after | ||
3 | building zlib(-native) and I have to call touch */libstdc++.so && | ||
4 | /sbin/ldconfig to fix it. | ||
5 | |||
6 | So remove ldconfig call from make install-libs | ||
7 | |||
8 | Patch authored by Martin Jansa. | ||
9 | |||
10 | Upstream-Status: Inappropriate [disable feature] | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | |||
14 | diff -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 | ||