From 27157ad9f57ce76c652125766d780f61adc2a4f3 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 13 Dec 2018 23:45:24 +0100 Subject: [PATCH 1/3] open-plc-utils: cleanup package meta-data Align package variables to other packages which also use a git checkout as tarball: - PKG_VERSION should not be set to a date, just rely on package default handling which apply automatically when using PKG_SOURCE_VERSION - introduce a plain PKG_RELEASE instead to allow keeping track of modified packaging - PKG_SOURCE_DIR is set by package defaults - same for PKG_SOURCE - this results in a different hash of the tarball created, so adjust PKG_MIRROR_HASH Signed-off-by: Michael Heimpold --- utils/open-plc-utils/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/utils/open-plc-utils/Makefile b/utils/open-plc-utils/Makefile index 6df0adc28..e0a3862c9 100644 --- a/utils/open-plc-utils/Makefile +++ b/utils/open-plc-utils/Makefile @@ -8,15 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open-plc-utils -PKG_VERSION:=2018-11-03 -PKG_RELEASE:=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/qca/open-plc-utils.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=32408520fcebe785983a68e39ec83830a3005779 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=1c5a2bb75550f1d7069f857c30f1f45ccfd3b0b0e9abadbca10f4df582f51d1c +PKG_MIRROR_HASH:=b5ae48fd300f75b948a2b2a5f6cd4465b7a336495685f73100ad33a5d43a4c05 PKG_MAINTAINER:=Florian Fainelli From f58daa6c9b1f46e097229f872c0b4d0c1a3c3d4b Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 13 Dec 2018 10:11:21 +0100 Subject: [PATCH 2/3] open-plc-utils: package missing tools amprule, pev and evse At the moment, there are three binaries which are not covered by packaging, so add them. Signed-off-by: Michael Heimpold --- utils/open-plc-utils/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/open-plc-utils/Makefile b/utils/open-plc-utils/Makefile index e0a3862c9..131630ce6 100644 --- a/utils/open-plc-utils/Makefile +++ b/utils/open-plc-utils/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open-plc-utils -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/qca/open-plc-utils.git @@ -61,7 +61,7 @@ OPEN_PLC_UTILS_APPS:=efbu efeu efru efsu edru edsu nics \ int6kmdio2 int6kmod int6kstat int6ktest int6krate \ int6krule int6ktone int6kwait CMEncrypt sada \ coqos_add coqos_info coqos_man coqos_mod coqos_rel \ - mdustats ampboot amphost ampID amplist amprate \ + mdustats ampboot amphost ampID amplist amprate amprule \ ampstat amptest amptool amptone ampwait \ plcboot plchost plcID plclist plcrate plcrule \ plcstat plctest plctool plctone \ @@ -69,7 +69,8 @@ OPEN_PLC_UTILS_APPS:=efbu efeu efru efsu edru edsu nics \ plcdevs plclog plcmdio16 plcmdio32 \ config2cfg sdram \ int6kuart int6kbaud ttysig ptsctl weeder ttysend \ - ttyrecv ttycat int6kdetect + ttyrecv ttycat int6kdetect \ + pev evse $(foreach a,$(OPEN_PLC_UTILS_APPS),$(eval $(call GenPlugin,$(a)))) From 969b6df4428db418caacea5481e3e6dbfb9bfd9e Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Fri, 14 Dec 2018 00:02:09 +0100 Subject: [PATCH 3/3] open-plc-utils: minor whitespace fixes Signed-off-by: Michael Heimpold --- utils/open-plc-utils/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/open-plc-utils/Makefile b/utils/open-plc-utils/Makefile index 131630ce6..1c721a1dc 100644 --- a/utils/open-plc-utils/Makefile +++ b/utils/open-plc-utils/Makefile @@ -43,9 +43,9 @@ define GenPlugin TITLE:=Utility $(1) from the Open PLC utilities endef - define Package/$(addprefix open-plc-utils-,$(1))/description - Utility $(1) from the Open PLC utilities package. - endef + define Package/$(addprefix open-plc-utils-,$(1))/description + Utility $(1) from the Open PLC utilities package. + endef endef OPEN_PLC_UTILS_APPS:=efbu efeu efru efsu edru edsu nics \ @@ -91,7 +91,7 @@ endef define BuildPlugin define Package/$(1)/install - $(INSTALL_DIR) $$(1)/usr/bin + $(INSTALL_DIR) $$(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/$(subst open-plc-utils-,,$(1)) \ $$(1)/usr/bin/ endef