Revert "intel-microcode: create early load microcode image"

[openwrt/.git] / package / system / ucert / Makefile

diff --git a/package/system/ucert/Makefile b/package/system/ucert/Makefile
index d02c8700f24cf504ff6309b2fbc7454eb81cf928..5b4c6b12ca89660b6e11e32352dc8ffedd86a93a 100644 (file)
--- a/package/system/ucert/Makefile
+++ b/package/system/ucert/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ucert.git
-PKG_SOURCE_DATE:=2018-06-10
-PKG_SOURCE_VERSION:=46eec66b190470254fc01973f208dc056bcb9780
-PKG_MIRROR_HASH:=43868aa490fd7a8962586d15e9be9bfff437fe02765ac580c8f244616fa4dff4
+PKG_SOURCE_DATE:=2018-09-18
+PKG_SOURCE_VERSION:=e1c722b1b6cbf2527b3178342464e56b97825874
+PKG_MIRROR_HASH:=36dcca7c2d649a6c34a8daaaef4698fbeb808fd6580c6bfb1ca35f4f06825d17
 
 CMAKE_INSTALL:=1
 PKG_CHECK_FORMAT_SECURITY:=1
@@ -17,14 +17,21 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
+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
 
-CMAKE_HOST_OPTIONS += -DUCERT_FULL=1 -DUCERT_HOST_BUILD=1
+CMAKE_HOST_OPTIONS += \
+       -DUCERT_FULL=1 \
+       -DUCERT_HOST_BUILD=1 \
+       -DCMAKE_SKIP_RPATH=FALSE \
+       -DUSE_RPATH="${STAGING_DIR_HOST}/lib"
+
 HOST_BUILD_DEPENDS:=libubox/host libjson-c/host usign/host
+HOST_BUILD_PREFIX:=$(STAGING_DIR_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 +55,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