Patchwork [CONSOLIDATED,PULL,07/28] dtc: Add patch to correctly install shared libraries and links

login
register
mail settings
Submitter Saul Wold
Date Nov. 5, 2011, 5:22 p.m.
Message ID <c5d59c1c20fa491cc75cd6b2ca7ef7972fc51eef.1320513631.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14371/
State Accepted
Commit 4c4143e0f0382118448c7c2a452dafac0db5130f
Headers show

Comments

Saul Wold - Nov. 5, 2011, 5:22 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-kernel/dtc/dtc.inc                |    3 ++-
 meta/recipes-kernel/dtc/dtc/make_install.patch |   15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-kernel/dtc/dtc/make_install.patch

Patch

diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 0f45d5f..9b4b768 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -7,10 +7,11 @@  DEPENDS = "flex-native bison-native"
 inherit autotools
 
 SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
+           file://make_install.patch \
 	  "
 
 EXTRA_OEMAKE='PREFIX="${prefix}"'
-INC_PR = "r1"
+INC_PR = "r2"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-kernel/dtc/dtc/make_install.patch b/meta/recipes-kernel/dtc/dtc/make_install.patch
new file mode 100644
index 0000000..2f7d809
--- /dev/null
+++ b/meta/recipes-kernel/dtc/dtc/make_install.patch
@@ -0,0 +1,15 @@ 
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile	2011-11-02 14:52:17.243104779 -0700
++++ git/Makefile	2011-11-02 15:06:01.555104982 -0700
+@@ -161,8 +161,8 @@
+ 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+-	$(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
+-	ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
++	$(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
++	ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib))
+ 	ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT)
+ 	$(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)