From 02d5148c4d5ed0fd1d1b95b46b7b531ff4d6d307 Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Tue, 23 Aug 2022 11:17:18 +0530
Subject: [PATCH] umoci: Add host compilation support

---
 umoci/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/umoci/Makefile b/umoci/Makefile
index 25e191bbb..39c5bea04 100644
--- a/umoci/Makefile
+++ b/umoci/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umoci
-PKG_VERSION:=0.0.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.4.7
+PKG_RELEASE:=$(AUTORELEASE)
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -10,7 +10,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_NAME:=umoci
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/opencontainers/umoci.git
-PKG_SOURCE_VERSION:=2cec49f54b72684ef170f11c708c56140f298bf7
+PKG_SOURCE_VERSION:=17f38511d61846e2fb8ec01a1532f3ef5525e71d
 PKG_MIRROR_HASH:=skip
 
 PKG_BUILD_DEPENDS:=golang/host
@@ -18,11 +18,12 @@ PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/opencontainers/umoci/
-GO_PKG_LDFLAGS_X:=main.gitCommit=$(PKG_SOURCE_VERSION) main.version=$(PKG_SOURCE_VERSION)
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 GOLANG_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-package.mk)
+GOLANG_HOST_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-host-build.mk)
 
 # verify that there is only one single file returned
 ifneq (1,$(words $(GOLANG_PACKAGE_MK)))
@@ -36,6 +37,7 @@ $(info found golang-package.mk at $(GOLANG_PACKAGE_MK))
 endif
 
 include $(GOLANG_PACKAGE_MK)
+include $(GOLANG_HOST_PACKAGE_MK)
 
 define Package/umoci
   SECTION:=utils
@@ -61,5 +63,7 @@ define Package/umoci/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/umoci $(1)/usr/bin
 endef
 
+$(eval $(call GoBinHostBuild))
+$(eval $(call HostBuild))
 $(eval $(call GoBinPackage,umoci))
 $(eval $(call BuildPackage,umoci))