From 814820577ef3f122602f04f43c1b0338dc37a334 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 16 Dec 2019 23:47:54 -0800 Subject: [PATCH] nps: fix file path --- .../luasrc/model/cbi/kodexplorer/settings.lua | 1 + package/lean/npc/Makefile | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/settings.lua b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/settings.lua index cd2963c15..0882c7b64 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/settings.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/settings.lua @@ -1,3 +1,4 @@ + m = Map("kodexplorer",translate("KodExplorer"),translate("KodExplorer是一款快捷高效的私有云和在线文档管理系统，为个人网站、企业私有云部署、网络存储、在线文档管理、在线办公等提供安全可控，简便易用、可高度定制的私有云产品。采用windows风格界面、操作习惯，无需适应即可快速上手，支持几百种常用文件格式的在线预览，可扩展易定制。")) m:append(Template("kodexplorer/status")) diff --git a/package/lean/npc/Makefile b/package/lean/npc/Makefile index 172ed5ede..2b1080788 100644 --- a/package/lean/npc/Makefile +++ b/package/lean/npc/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=npc PKG_VERSION:=0.25.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 ifeq ($(ARCH),mipsel) NPC_ARCH:=mipsle @@ -23,7 +23,13 @@ ifeq ($(ARCH),x86_64) NPC_ARCH:=amd64 endif ifeq ($(ARCH),arm) - NPC_ARCH:=arm + NPC_ARCH:=arm_v7 + ifeq ($(BOARD),bcm53xx) + NPC_ARCH:=arm_v6 + endif + ifeq ($(BOARD),kirkwood) + NPC_ARCH:=arm_v5 + endif endif ifeq ($(ARCH),aarch64) NPC_ARCH:=arm64 @@ -33,11 +39,13 @@ PKG_LICENSE:=Apache-2.0 PKG_SOURCE_URL:=https://github.com/cnlh/nps/releases/download/v$(PKG_VERSION) PKG_SOURCE:=linux_$(NPC_ARCH)_client.tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/nps +PKG_BUILD_DIR:=$(BUILD_DIR)/nps-$(PKG_VERSION) PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk +PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(PKG_SOURCE) + define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network