From 45c05736ded213b02989657128415c0e5c6e28f0 Mon Sep 17 00:00:00 2001
From: albojubatus <denominator@openmailbox.org>
Date: Sat, 30 Dec 2017 21:12:25 +0200
Subject: [PATCH] added midas-util dependencies as packages

---
 configs/samsung_midas_defconfig  |  2 +-
 package/inih/Config.in           |  4 ++++
 package/inih/inih.mk             | 24 ++++++++++++++++++++++++
 package/libufdt/Config.in        |  4 ++++
 package/libufdt/libufdt.mk       | 25 +++++++++++++++++++++++++
 package/midas-util/Config.in     |  4 +++-
 package/midas-util/midas-util.mk | 11 +++++------
 7 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 package/inih/Config.in
 create mode 100644 package/inih/inih.mk
 create mode 100644 package/libufdt/Config.in
 create mode 100644 package/libufdt/libufdt.mk

diff --git a/configs/samsung_midas_defconfig b/configs/samsung_midas_defconfig
index 58c477c..2ab84c5 100644
--- a/configs/samsung_midas_defconfig
+++ b/configs/samsung_midas_defconfig
@@ -2,7 +2,7 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_CCACHE=y
+BR2_CCACHE=n
 BR2_CCACHE_DIR="/mnt/android/buildroot/.ccache"
 BR2_CCACHE_INITIAL_SETUP="--max-size 10G"
 BR2_KERNEL_HEADERS_4_14=y
diff --git a/package/inih/Config.in b/package/inih/Config.in
new file mode 100644
index 0000000..57c09eb
--- /dev/null
+++ b/package/inih/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_INIH
+    bool "inih"
+    help
+        ini file parser
diff --git a/package/inih/inih.mk b/package/inih/inih.mk
new file mode 100644
index 0000000..a4710e5
--- /dev/null
+++ b/package/inih/inih.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# inih
+#
+################################################################################
+
+INIH_VERSION = master
+INIH_SITE = $(call github,benhoyt,inih,$(INIH_VERSION))
+#INIH_LICENSE = GPL-3.0+
+#INIH_LICENSE_FILES = .gitignore
+#INIH_DEPENDENCIES = dtc
+
+# Makefile in the repo uses host 'gcc' directly.
+# This below uses a make implicit rule so that it picks variables like CC.
+#define MIDAS_UTIL_BUILD_CMDS
+#	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install CFLAGS='--sysroot $(STAGING_DIR)'
+#endef
+
+#define MIDAS_UTIL_INSTALL_TARGET_CMDS
+#	cp -v $(@D)/out/bin/* $(TARGET_DIR)/bin
+#	cp -v $(@D)/out/lib/* $(TARGET_DIR)/lib
+#endef
+
+$(eval $(generic-package))
diff --git a/package/libufdt/Config.in b/package/libufdt/Config.in
new file mode 100644
index 0000000..4320210
--- /dev/null
+++ b/package/libufdt/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_LIBUFDT
+    bool "libufdt"
+    help
+        libufdt
diff --git a/package/libufdt/libufdt.mk b/package/libufdt/libufdt.mk
new file mode 100644
index 0000000..d80e580
--- /dev/null
+++ b/package/libufdt/libufdt.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# libufdt
+#
+################################################################################
+
+LIBUFDT_VERSION = master
+LIBUFDT_SITE = https://android.googlesource.com/platform/system/libufdt
+LIBUFDT_SITE_METHOD = git
+#INIH_LICENSE = GPL-3.0+
+#INIH_LICENSE_FILES = .gitignore
+#INIH_DEPENDENCIES = dtc
+
+# Makefile in the repo uses host 'gcc' directly.
+# This below uses a make implicit rule so that it picks variables like CC.
+#define MIDAS_UTIL_BUILD_CMDS
+#	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install CFLAGS='--sysroot $(STAGING_DIR)'
+#endef
+
+#define MIDAS_UTIL_INSTALL_TARGET_CMDS
+#	cp -v $(@D)/out/bin/* $(TARGET_DIR)/bin
+#	cp -v $(@D)/out/lib/* $(TARGET_DIR)/lib
+#endef
+
+$(eval $(generic-package))
diff --git a/package/midas-util/Config.in b/package/midas-util/Config.in
index 4dbfe7c..5b6072d 100644
--- a/package/midas-util/Config.in
+++ b/package/midas-util/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_MIDAS_UTIL
     bool "midas-util"
-    depends on BR2_PACKAGE_DTC
+    depends on BR2_PACKAGE_DTC 
+    depends on BR2_PACKAGE_INIH
+    depends on BR2_PACKAGE_LIBUFDT
     help
         utilities for midas devices
diff --git a/package/midas-util/midas-util.mk b/package/midas-util/midas-util.mk
index 287b32f..a249ae4 100644
--- a/package/midas-util/midas-util.mk
+++ b/package/midas-util/midas-util.mk
@@ -4,21 +4,20 @@
 #
 ################################################################################
 
-MIDAS_UTIL_VERSION = 2eca13712acffa380989ee36a668845b7d8c2e3f
-MIDAS_UTIL_SITE = $(call github,fourkbomb,midas-util,$(MIDAS_UTIL_VERSION))
+MIDAS_UTIL_VERSION = restructure
+MIDAS_UTIL_SITE = $(call github,albojubatus,midas-util,$(MIDAS_UTIL_VERSION))
 MIDAS_UTIL_LICENSE = GPL-3.0+
 MIDAS_UTIL_LICENSE_FILES = .gitignore
-MIDAS_UTIL_DEPENDENCIES = dtc
+MIDAS_UTIL_DEPENDENCIES = dtc inih libufdt
 
 # Makefile in the repo uses host 'gcc' directly.
 # This below uses a make implicit rule so that it picks variables like CC.
 define MIDAS_UTIL_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install CFLAGS='--sysroot $(STAGING_DIR)'
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install DIR_INIH=../../inih-master DIR_LIBUFDT=../../libufdt-master CFLAGS='--sysroot $(STAGING_DIR)'
 endef
 
 define MIDAS_UTIL_INSTALL_TARGET_CMDS
-	cp -v $(@D)/out/bin/* $(TARGET_DIR)/bin
-	cp -v $(@D)/out/lib/* $(TARGET_DIR)/lib
+	cp -v $(@D)/bin/* $(TARGET_DIR)/bin
 endef
 
 $(eval $(generic-package))