summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2019-04-03 14:38:44 +0200
committerKarel Kočí <karel.koci@nic.cz>2019-04-03 14:38:44 +0200
commit1374e4c4653ada2919e0fa26feb8c4b86c83a98b (patch)
tree8c376b86089e83f2926d9407cee52979bbbc5809
parente840c2383394182b626c646115d7859b042a4158 (diff)
downloadopenwrt-personal-pkgs-1374e4c4653ada2919e0fa26feb8c4b86c83a98b.tar.gz
openwrt-personal-pkgs-1374e4c4653ada2919e0fa26feb8c4b86c83a98b.tar.bz2
openwrt-personal-pkgs-1374e4c4653ada2919e0fa26feb8c4b86c83a98b.zip
updater-ng: move to new parser and use argp-standalone
-rw-r--r--updater-ng/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/updater-ng/Makefile b/updater-ng/Makefile
index 4a86044..d71e18f 100644
--- a/updater-ng/Makefile
+++ b/updater-ng/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=updater-ng
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater/updater.git
-PKG_SOURCE_BRANCH:=uri
+PKG_SOURCE_BRANCH:=unglobal-arguments
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
HOST_BUILD_DEPENDS:= \
@@ -19,7 +19,7 @@ HOST_BUILD_DEPENDS:= \
uriparser/host \
libb64/host \
uthash/host
-PKG_BUILD_DEPENDS:=busybox libb64 uthash
+PKG_BUILD_DEPENDS:=busybox libb64 uthash argp-standalone
include $(INCLUDE_DIR)/autopkg-branch.mk
include $(INCLUDE_DIR)/host-build.mk
@@ -71,11 +71,17 @@ endef
define Build/Compile
- $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) NO_DOC=1 LUA_COMPILE:=no UPDATER_VERSION:=$(PKG_VERSION) BUSYBOX_EXEC=$(STAGING_DIR)/bin/busybox-static
+ $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) \
+ NO_DOC=1 LUA_COMPILE:=no \
+ BUSYBOX_EXEC=$(STAGING_DIR)/bin/busybox-static \
+ ARGP_STANDALONE=y \
+ UPDATER_VERSION:=$(PKG_VERSION)
endef
define Host/Compile
- $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) NO_DOC=1 LUA_COMPILE:=no UPDATER_VERSION:=$(PKG_VERSION)
+ $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) \
+ NO_DOC=1 LUA_COMPILE:=no \
+ UPDATER_VERSION:=$(PKG_VERSION)
endef
define Host/Install