From f47d7df6a89ae9457fc99dcb44c35969aa40b7a8 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 15 Jun 2018 08:57:44 +0200 Subject: [PATCH] ucert: fix build set PKG_BUILD_DIR before including package.mk to avoid problems as seen on buildbot. Signed-off-by: Daniel Golle --- package/system/ucert/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/system/ucert/Makefile b/package/system/ucert/Makefile index d02c8700f2..61129f22f6 100644 --- a/package/system/ucert/Makefile +++ b/package/system/ucert/Makefile @@ -17,6 +17,8 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Daniel Golle +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk @@ -24,7 +26,6 @@ include $(INCLUDE_DIR)/cmake.mk CMAKE_HOST_OPTIONS += -DUCERT_FULL=1 -DUCERT_HOST_BUILD=1 HOST_BUILD_DEPENDS:=libubox/host libjson-c/host usign/host PKG_BUILD_DEPENDS:=ucert/host -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) define Package/ucert-full SECTION:=base @@ -48,6 +49,11 @@ ifeq ($(BUILD_VARIANT),full) CMAKE_OPTIONS += -DUCERT_FULL=1 endif +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(call Build/Prepare/Default) +endef + define Package/ucert/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucert $(1)/usr/bin