Merge pull request #109 from GD-Slime/main

Fixed webd
This commit is contained in:
有種 2023-06-25 16:23:52 +08:00 committed by GitHub
commit 7e7240b4fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 22 additions and 19 deletions

0
luci-app-webd/Makefile Executable file → Normal file
View File

0
luci-app-webd/luasrc/controller/webd.lua Executable file → Normal file
View File

0
luci-app-webd/luasrc/model/cbi/webd.lua Executable file → Normal file
View File

0
luci-app-webd/luasrc/view/webd/webd_status.htm Executable file → Normal file
View File

0
luci-app-webd/po/zh-cn/webd.po Executable file → Normal file
View File

0
luci-app-webd/po/zh_Hans/webd.po Executable file → Normal file
View File

0
luci-app-webd/root/etc/config/webd Executable file → Normal file
View File

0
luci-app-webd/root/etc/init.d/webd Executable file → Normal file
View File

0
luci-app-webd/root/etc/uci-defaults/luci-webd Executable file → Normal file
View File

41
webd/Makefile Executable file → Normal file
View File

@ -1,10 +1,10 @@
# Copyright (C) 2020-2022 Hyy2001X <https://github.com/Hyy2001X>
# Copyright (C) 2020-2023 Hyy2001X <https://github.com/Hyy2001X>
# See more information at https://webd.cf/
include $(TOPDIR)/rules.mk
PKG_NAME:=webd
PKG_VERSION:=20220512
PKG_VERSION:=20230604
PKG_RELEASE:=$(AUTORELESE)
include $(INCLUDE_DIR)/package.mk
@ -19,58 +19,61 @@ endef
ifeq ($(ARCH),aarch64)
ifeq ($(BOARD),cortex-a53)
TARGET_ARCH:=aarch64_cortex-a53.brcm2708-bcm2710
TARGET_ARCH:=musl.brcm2708-bcm2710
endif
ifeq ($(BOARD),rockchip)
TARGET_ARCH:=aarch64_generic.rockchip-armv8
endif
ifeq ($(BOARD),mvebu)
TARGET_ARCH:=arm_cortex-a9.mvebu-cortexa9
TARGET_ARCH:=musl.rockchip-armv8
endif
endif
ifeq ($(ARCH),arm)
ifeq ($(BOARD),ipq806x)
TARGET_ARCH:=arm_cortex-a15.ipq806x
TARGET_ARCH:=muslgnueabi.ipq806x
endif
ifeq ($(BOARD),ipq40xx)
TARGET_ARCH:=arm_cortex-a7.ipq40xx
TARGET_ARCH:=muslgnueabi.ipq40xx
endif
ifeq ($(BOARD),bcm53xx)
TARGET_ARCH:=arm_cortex-a9.bcm53xx
TARGET_ARCH:=muslgnueabi.bcm53xx
endif
ifeq ($(BOARD),oxnas)
TARGET_ARCH:=arm_mpcore.oxnas
TARGET_ARCH:=muslgnueabi.oxnas
endif
ifeq ($(BOARD),kirkwood)
TARGET_ARCH:=arm_xscale.kirkwood
TARGET_ARCH:=muslgnueabi.kirkwood
endif
ifeq ($(BOARD),mvebu)
TARGET_ARCH:=muslgnueabi.mvebu-cortexa9
endif
endif
ifeq ($(ARCH),mipsel)
ifeq ($(BOARD),bcm47xx)
TARGET_ARCH:=mipsel_74kc.brcm47xx-mips74k
TARGET_ARCH:=musl.brcm47xx-mips74k
endif
ifeq ($(BOARD),ramips)
TARGET_ARCH:=mipsel_24kc.ramips-mt7620
TARGET_ARCH:=musl.ramips-mt7620
endif
endif
ifeq ($(ARCH),mips)
ifeq ($(BOARD),ath79)
TARGET_ARCH:=mips_24kc.ath79
TARGET_ARCH:=musl.ath79
endif
ifeq ($(BOARD),bcm63xx)
TARGET_ARCH:=mips_mips32.brcm63xx-uClibc
TARGET_ARCH:=uclibc.brcm63xx
endif
ifeq ($(BOARD),ar71xx)
TARGET_ARCH:=uclibc.ar71xx
endif
endif
ifeq ($(ARCH),x86_64)
TARGET_ARCH:=x86-64
TARGET_ARCH:=musl.x86-64
endif
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-openwrt-$(TARGET_ARCH).tar.gz
PKG_SOURCE_URL:=https://gwgw.ga/webd/$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(ARCH)-openwrt-linux-$(TARGET_ARCH).tar.gz
PKG_SOURCE_URL:=https://cnt2.cf/webd/$(PKG_VERSION)/
PKG_HASH:=skip
UNTAR_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)