Browse Source

adguardhome: update to 0.107.0

Full changelog available at: https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.0

packr has been removed from build dependencies, per
c6888326b0 (diff-2873f79a86c0d8b3335cd7731b0ecf7dd4301eb19a82ef7a1cba7589b5252261L2)

Also added the ability to configure working directory location and moved
the directory to /var. On most setups this should not change anything,
as /var is symlinked to /tmp. The move mostly benefits setups where /var
is configured to be persistent.

The working directory is used by AdGuard to store persistent data like
query logs, filter lists, etc.

Data stored in this directory can get really huge, as such allowing
this directory to be moved elsewhere (ie. an USB drive) is very
beneficial.

Co-authored-by: Dobroslaw Kijowski <dobo90@gmail.com>
Co-authored-by: Jeffery To <jeffery.to@gmail.com>
Signed-off-by: Hiếu Lê <leorize+oss@disroot.org>
lilik-openwrt-22.03
Hiếu Lê 3 years ago
parent
commit
f44603a131
No known key found for this signature in database GPG Key ID: 347D33895E6EA388
3 changed files with 13 additions and 5 deletions
  1. +7
    -4
      net/adguardhome/Makefile
  2. +3
    -0
      net/adguardhome/files/adguardhome.config
  3. +3
    -1
      net/adguardhome/files/adguardhome.init

+ 7
- 4
net/adguardhome/Makefile View File

@ -6,19 +6,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adguardhome PKG_NAME:=adguardhome
PKG_VERSION:=0.106.3
PKG_VERSION:=0.107.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome
PKG_MIRROR_HASH:=bdf5ad833df90969cd82b9fb6a91846338c738ed01671fc768d867b592102f7c
PKG_MIRROR_HASH:=7bb70a3cdbde0d4c451454369317e6265832bcf6743c44fae7df7e3f8a37a108
PKG_LICENSE:=GPL-3.0-only 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
@ -46,6 +46,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
@ -56,7 +57,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) ; \
) )
@ -66,6 +66,9 @@ define Package/adguardhome/install
$(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))


+ 3
- 0
net/adguardhome/files/adguardhome.config View File

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

+ 3
- 1
net/adguardhome/files/adguardhome.init 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


Loading…
Cancel
Save