update-12.30

This commit is contained in:
github-actions[bot] 2021-12-30 10:15:33 +08:00
parent 849433847e
commit bff67d1a4f
4 changed files with 12 additions and 4 deletions

View File

@ -18,7 +18,7 @@ PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE.txt PKG_LICENSE_FILES:=LICENSE.txt
PKG_MAINTAINER:=Dobroslaw Kijowski <dobo90@gmail.com> PKG_MAINTAINER:=Dobroslaw Kijowski <dobo90@gmail.com>
PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host packr/host PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
@ -48,6 +48,7 @@ endef
define Package/adguardhome/conffiles define Package/adguardhome/conffiles
/etc/adguardhome.yaml /etc/adguardhome.yaml
/etc/config/adguardhome
endef endef
define Package/adguardhome/description define Package/adguardhome/description
@ -69,7 +70,6 @@ define Build/Compile
( \ ( \
pushd $(PKG_BUILD_DIR) ; \ pushd $(PKG_BUILD_DIR) ; \
make js-deps js-build ; \ make js-deps js-build ; \
packr -z -v -i internal ; \
popd ; \ popd ; \
$(call GoPackage/Build/Compile) ; \ $(call GoPackage/Build/Compile) ; \
) )
@ -79,6 +79,9 @@ endef
# $(call GoPackage/Package/Install/Bin,$(1)) # $(call GoPackage/Package/Install/Bin,$(1))
# $(INSTALL_DIR) $(1)/etc/init.d # $(INSTALL_DIR) $(1)/etc/init.d
# $(INSTALL_BIN) ./files/adguardhome.init $(1)/etc/init.d/adguardhome # $(INSTALL_BIN) ./files/adguardhome.init $(1)/etc/init.d/adguardhome
#
# $(INSTALL_DIR) $(1)/etc/config
# $(INSTALL_DATA) ./files/adguardhome.config $(1)/etc/config/adguardhome
#endef #endef
$(eval $(call GoBinPackage,adguardhome)) $(eval $(call GoBinPackage,adguardhome))

View File

@ -0,0 +1,3 @@
config adguardhome config
# Where to store persistent data by AdGuard Home
option workdir /var/adguardhome

View File

@ -1,7 +1,6 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
PROG=/usr/bin/AdGuardHome PROG=/usr/bin/AdGuardHome
WORK_DIR=/tmp/adguardhome
USE_PROCD=1 USE_PROCD=1
@ -11,6 +10,9 @@ START=21
STOP=89 STOP=89
start_service() { start_service() {
config_load adguardhome
config_get WORK_DIR config workdir
[ -d "$WORK_DIR" ] || mkdir -m 0755 -p "$WORK_DIR" [ -d "$WORK_DIR" ] || mkdir -m 0755 -p "$WORK_DIR"
procd_open_instance procd_open_instance

View File

@ -6,7 +6,7 @@ PKG_RELEASE:=5
LUCI_TITLE:=LuCI Support for mosdns LUCI_TITLE:=LuCI Support for mosdns
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
LUCI_DEPENDS:=+mosdns +jsonfilter LUCI_DEPENDS:=+mosdns +jsonfilter +bash
define Package/$(PKG_NAME)/conffiles define Package/$(PKG_NAME)/conffiles
/etc/mosdns/config.yaml /etc/mosdns/config.yaml