public/CronosAgent
4
Fork 0
Code Activity

Added processing of version number to OpenWRT

Browse source
This commit is contained in:
R3ABM Artem 2016-08-03 12:03:02 +03:00
parent 4370407011
commit 7bb7aaf9e1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenWRT/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cronosagent PKG_NAME:=cronosagent
PKG_VERSION:=master PKG_VERSION:=$(shell grep -o -E '[0-9]+' source/Version.h)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=+libstdcpp +libopenssl PKG_BUILD_DEPENDS:=+libstdcpp +libopenssl
X_SOURCE_DIR:=$(CURDIR)/source X_SOURCE_DIR:=$(CURDIR)/source
@ -53,8 +53,8 @@ define Package/cronosagent/install
$(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/cronosagent $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/cronosagent
$(INSTALL_BIN) $(X_SOURCE_DIR)/cronosagent.sh $(1)/opt/CronosAgent/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/cronosagent $(1)/opt/CronosAgent/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cronosagent $(1)/opt/CronosAgent/
$(INSTALL_BIN) $(X_SOURCE_DIR)/cronosagent.sh $(1)/opt/CronosAgent/
$(INSTALL_BIN) $(X_SOURCE_DIR)/OpenWRT/init.d/cronosagent $(1)/etc/init.d/ $(INSTALL_BIN) $(X_SOURCE_DIR)/OpenWRT/init.d/cronosagent $(1)/etc/init.d/
$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/config/cronosagent $(1)/etc/config/ $(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/config/cronosagent $(1)/etc/config/
$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/controller/cronosagent.lua $(1)/usr/lib/lua/luci/controller/ $(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/controller/cronosagent.lua $(1)/usr/lib/lua/luci/controller/

2
OpenWRT/build.sh
View file

@ -42,6 +42,6 @@ fi
make package/$PACKAGE/compile V=99 2>&1 | tee $PROJECT/../build.log | grep -i error make package/$PACKAGE/compile V=99 2>&1 | tee $PROJECT/../build.log | grep -i error
# Copy built packages # Copy built packages
find bin -name ${PACKAGE}*.ipk | xargs -I {} cp {} $PROJECT/.. find bin -name ${PACKAGE}*.ipk | xargs -I {} mv {} $PROJECT/..
popd > /dev/null popd > /dev/null