From ac9c39ff5927599bf0ee90801a5d4c48f0fbc361 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 16 Nov 2019 23:26:27 +0800 Subject: [PATCH] Revert "fwtool: update to latest Git head" This reverts commit e5e2b9e659a5a8f2652e517036e82f4f71401004. --- package/system/fwtool/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/package/system/fwtool/Makefile b/package/system/fwtool/Makefile index 00f0339b02..901081c1f4 100644 --- a/package/system/fwtool/Makefile +++ b/package/system/fwtool/Makefile @@ -10,22 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fwtool PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=$(PROJECT_GIT)/project/fwtool.git -PKG_SOURCE_DATE:=2019-11-12 -PKG_SOURCE_VERSION:=8f7fe925ca205c8e8e2d0d1b16218c1e148d5173 -PKG_MIRROR_HASH:=ff68e77397a7ba8f497aae9a6d1f89e196c89391a8d5ed0b81c4eafb889ba744 -CMAKE_INSTALL:=1 - PKG_FLAGS:=nonshared -PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER := Felix Fietkau PKG_BUILD_DEPENDS := fwtool/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/cmake.mk HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) @@ -35,13 +26,21 @@ define Package/fwtool TITLE:=Utility for appending and extracting firmware metadata and signatures endef +define Host/Compile + $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $(HOST_BUILD_DIR)/fwtool ./src/fwtool.c +endef + define Host/Install $(INSTALL_BIN) $(HOST_BUILD_DIR)/fwtool $(1)/bin/ endef +define Build/Compile + $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o $(PKG_BUILD_DIR)/fwtool ./src/fwtool.c +endef + define Package/fwtool/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fwtool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fwtool $(1)/usr/bin/ endef $(eval $(call HostBuild))