diff --git a/bmx7/Makefile b/bmx7/Makefile index b560d520e..3d46148aa 100644 --- a/bmx7/Makefile +++ b/bmx7/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bmx7 PKG_VERSION:=2024.06.11 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -30,7 +30,6 @@ MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) \ -DBMX7_LIB_IWINFO" \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS) \ -L$(STAGING_DIR)/usr/lib -liwinfo" \ - GIT_REV="$(PKG_REV)" \ CC="$(TARGET_CC)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)" \ build_all @@ -98,17 +97,17 @@ define Package/bmx7-table endef define Package/bmx7/install - $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/bmx7 $(1)/usr/sbin/bmx7 endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE_ARGS) + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE_ARGS) endef define Package/bmx7-uci-config/conffiles /etc/config/bmx7 -/etc/bmx7 +/etc/bmx7/ endef define Package/bmx7-uci-config/install diff --git a/bmx7/test-version.sh b/bmx7/test-version.sh new file mode 100644 index 000000000..9d2784b08 --- /dev/null +++ b/bmx7/test-version.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +bmx7) + # The version of bmx7 is derived from the source date, which the + # binary does not report. `bmx7 -v` is not an alternative: the + # key path option is applied before the version option, so a + # missing node key gets generated first - "Creating RSA2048 + # private key. This can take a while", as bmx7 puts it. + exit 0 + ;; + +bmx7-*) + # Plugins are libraries and do not provide version information + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac