From 2babd29a6d594ee5d860ff6b5a1a4c3a1c892299 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 16 Feb 2021 16:50:37 +0800 Subject: [PATCH 1/2] luci-app-adguardhome: fix version detection Reported-by: AmadeusGhost Signed-off-by: Tianling Shen --- .../luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua b/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua index 3bf49aaebb..6896b61eff 100644 --- a/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua +++ b/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua @@ -37,7 +37,7 @@ else local version=uci:get("AdGuardHome","AdGuardHome","version") local testtime=fs.stat(binpath,"mtime") if testtime~=tonumber(binmtime) or version==nil then - local tmp=luci.sys.exec(binpath.." --version | grep -m 1 -E ' [0-9.]+' -o ") + local tmp=luci.sys.exec(binpath.." --version | grep -m 1 -E 'v[0-9.]+' -o ") version=string.sub(tmp, 1) if version=="" then version="core error" end uci:set("AdGuardHome","AdGuardHome","version",version) From 013ad0d61380d01a6cd1adaa989849909bd07c1c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 16 Feb 2021 00:03:28 +0100 Subject: [PATCH 2/2] build: reorder more BuildPackages lines to deal with ABI_VERSION After the ABI version rework, packages need to be declared in the order of their dependencies, so that dependent packages will use the right ABI version Signed-off-by: Felix Fietkau Signed-off-by: Tianling Shen --- package/libs/elfutils/Makefile | 5 +++-- package/network/utils/bpftools/Makefile | 2 +- package/network/utils/ipset/Makefile | 2 +- package/network/utils/iptables/Makefile | 9 +++++---- package/network/utils/wireless-tools/Makefile | 2 +- package/system/uci/Makefile | 2 +- package/utils/e2fsprogs/Makefile | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index f2b25d2c36..aa6743e688 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -95,7 +95,8 @@ define Package/libelf/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf{-*.so,*.so.*} $(1)/usr/lib/ endef -$(eval $(call BuildPackage,libasm)) -$(eval $(call BuildPackage,libdw)) +# these lines need to be ordered by dependency because of ABI versioning $(eval $(call BuildPackage,libelf)) +$(eval $(call BuildPackage,libdw)) +$(eval $(call BuildPackage,libasm)) $(eval $(call HostBuild)) diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile index 06a7a7adfd..7a25b35755 100644 --- a/package/network/utils/bpftools/Makefile +++ b/package/network/utils/bpftools/Makefile @@ -162,6 +162,6 @@ define Package/libbpf/install $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libbpf.so.* $(1)/usr/lib/ endef +$(eval $(call BuildPackage,libbpf)) $(eval $(call BuildPackage,bpftool-full)) $(eval $(call BuildPackage,bpftool-minimal)) -$(eval $(call BuildPackage,libbpf)) diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index 2d0c561198..bc4945e0f6 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -69,5 +69,5 @@ define Package/libipset/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so.* $(1)/usr/lib/ endef -$(eval $(call BuildPackage,ipset)) $(eval $(call BuildPackage,libipset)) +$(eval $(call BuildPackage,ipset)) diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index db3bfa2858..0d86e2770b 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -703,6 +703,10 @@ define BuildPlugin $$(eval $$(call BuildPackage,$(1))) endef +$(eval $(call BuildPackage,libxtables)) +$(eval $(call BuildPackage,libxtables-nft)) +$(eval $(call BuildPackage,libip4tc)) +$(eval $(call BuildPackage,libip6tc)) $(eval $(call BuildPackage,iptables)) $(eval $(call BuildPackage,iptables-nft)) $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m))) @@ -737,7 +741,4 @@ $(eval $(call BuildPackage,ip6tables)) $(eval $(call BuildPackage,ip6tables-nft)) $(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m))) $(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m))) -$(eval $(call BuildPackage,libip4tc)) -$(eval $(call BuildPackage,libip6tc)) -$(eval $(call BuildPackage,libxtables)) -$(eval $(call BuildPackage,libxtables-nft)) + diff --git a/package/network/utils/wireless-tools/Makefile b/package/network/utils/wireless-tools/Makefile index 485b85ddc7..52e246a59c 100644 --- a/package/network/utils/wireless-tools/Makefile +++ b/package/network/utils/wireless-tools/Makefile @@ -89,5 +89,5 @@ define Package/libiw/install $(CP) $(PKG_BUILD_DIR)/libiw.so.* $(1)/usr/lib/ endef -$(eval $(call BuildPackage,wireless-tools)) $(eval $(call BuildPackage,libiw)) +$(eval $(call BuildPackage,wireless-tools)) diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 47abd320d8..73f2e3fa45 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -84,6 +84,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib endef -$(eval $(call BuildPackage,uci)) $(eval $(call BuildPackage,libuci)) $(eval $(call BuildPackage,libuci-lua)) +$(eval $(call BuildPackage,uci)) diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 43ad42602a..3d64fab587 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -315,10 +315,10 @@ define Package/lsattr/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsattr $(1)/usr/bin/ endef -$(eval $(call BuildPackage,e2fsprogs)) $(eval $(call BuildPackage,libcomerr)) $(eval $(call BuildPackage,libss)) $(eval $(call BuildPackage,libext2fs)) +$(eval $(call BuildPackage,e2fsprogs)) $(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,resize2fs)) $(eval $(call BuildPackage,badblocks))