From b747c6f5073668d82f4e9cd2485c7f0b2075d9cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 26 May 2015 14:37:28 -0500
Subject: add dtc host-compile to avoid breakage with older dtc on host

---
 package/device-tree-compiler/Makefile              | 32 ++++++++++++++++++++++
 .../device-tree-compiler/patches/patch-Makefile    | 20 ++++++++++++++
 package/u-boot-git/Makefile                        |  8 ++++--
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 package/device-tree-compiler/Makefile
 create mode 100644 package/device-tree-compiler/patches/patch-Makefile

diff --git a/package/device-tree-compiler/Makefile b/package/device-tree-compiler/Makefile
new file mode 100644
index 000000000..0823a17ca
--- /dev/null
+++ b/package/device-tree-compiler/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		device-tree-compiler
+PKG_VERSION:=		8b927bf3b80de4b0a49e6b6e4a56293e9baec364
+PKG_RELEASE:=		1
+PKG_DESCR:=		compiler for dts files
+PKG_SECTION:=		sys/misc
+PKG_URL:=		http://www.devicetree.org/Device_Tree_Compiler
+PKG_SITES:=		git://git.kernel.org/pub/scm/utils/dtc/dtc.git
+
+PKG_CFLINE_DEVICE_TREE_COMPILER:=	depends on ADK_HOST_ONLY
+
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,DEVICE_TREE_COMPILER,device-tree-compiler,$(PKG_VERSION)-$(PKG_RELEASE)))
+
+HOST_STYLE:=		manual
+
+host-build:
+	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET})
+
+device-tree-compiler-hostinstall:
+	$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/bin
+	$(INSTALL_BIN) $(WRKBUILD)/dtc $(STAGING_HOST_DIR)/usr/bin
+
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/device-tree-compiler/patches/patch-Makefile b/package/device-tree-compiler/patches/patch-Makefile
new file mode 100644
index 000000000..35e962b78
--- /dev/null
+++ b/package/device-tree-compiler/patches/patch-Makefile
@@ -0,0 +1,20 @@
+--- device-tree-compiler-8b927bf3b80de4b0a49e6b6e4a56293e9baec364.orig/Makefile	2015-05-26 14:21:19.000000000 -0500
++++ device-tree-compiler-8b927bf3b80de4b0a49e6b6e4a56293e9baec364/Makefile	2015-05-26 14:24:39.833627943 -0500
+@@ -63,7 +63,7 @@ endif
+ # Rules for versioning
+ #
+ 
+-DTC_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
++DTC_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
+ VERSION_FILE = version_gen.h
+ 
+ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+@@ -82,7 +82,7 @@ localver_cmd = $(subst $(space),, $(stri
+ localver_scm = $(shell $(CONFIG_SHELL) ./scripts/setlocalversion)
+ localver_full  = $(localver_config)$(localver_cmd)$(localver_scm)
+ 
+-dtc_version = $(DTC_VERSION)$(localver_full)
++dtc_version = $(DTC_VERSION)
+ 
+ # Contents of the generated version file.
+ define filechk_version
diff --git a/package/u-boot-git/Makefile b/package/u-boot-git/Makefile
index 47a44cc4a..47fff684e 100644
--- a/package/u-boot-git/Makefile
+++ b/package/u-boot-git/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:=		3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a
 PKG_RELEASE:=		1
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
-HOST_BUILDDEP:=		openssl-host
-PKG_BUILDDEP:=		u-boot-host
+HOST_BUILDDEP:=		openssl-host device-tree-compiler-host
+PKG_BUILDDEP:=		u-boot-git-host
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_SITES:=		git://git.denx.de/u-boot.git
 
@@ -57,7 +57,9 @@ do-configure:
 	(cd $(WRKBUILD) && $(MAKE) $(CONFIG))
 
 do-build:
-	(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
+	(cd $(WRKBUILD) && env \
+		PATH='$(HOST_PATH)' \
+		CROSS_COMPILE='$(TARGET_CROSS)' \
 		GCC_HONOUR_COPTS=s $(MAKE))
 	#(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
 	#	GCC_HONOUR_COPTS=s $(MAKE) env)
-- 
cgit v1.2.3