🎉 Sync 2026-06-14 00:48:20

daed/Makefile

@@ -1,31 +1,41 @@
 # SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2023 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=daed
-PKG_VERSION:=1.27.0
-PKG_RELEASE:=6
+PKG_VERSION:=2026.06.08
+PKG_RELEASE:=7
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/daeuniverse/daed.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=skip
+PKG_SOURCE:=daed-src-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/kenzok8/openwrt-daede/releases/download/daed-src
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_HASH:=skip
 
 PKG_LICENSE:=AGPL-3.0-only MIT
 PKG_LICENSE_FILES:=LICENSE wing/LICENSE
-PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+PKG_MAINTAINER:=kenzok8
+
+DAED_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(DAED_BUILD_DIR)/wing
 
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/wing
 PKG_BUILD_DEPENDS:=golang/host bpf-headers
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_FLAGS:=no-mips16
 
+# armv7 lacks a CO-RE vmlinux.h for the trace eBPF (under wing/dae-core), so
+# trace's bpf2go fails there. Apply sbwml/openwrt_helloworld's arm patches
+# (add vmlinux-arm.h + drop the kprobe that doesn't work) to build on arm.
+ifeq ($(ARCH),arm)
+PATCH_DIR:=$(CURDIR)/patches_arm
+endif
+
 GO_PKG:=github.com/daeuniverse/dae-wing
+
 GO_PKG_LDFLAGS:= \
+	-s -w -buildid= \
+	-linkmode external -extldflags '-static -Wl,-s' \
 	-X '$(GO_PKG)/db.AppDescription=$(PKG_NAME) is a integration solution of dae, API and UI.'
-GO_PKG_LDFLAGS_X= \
+GO_PKG_LDFLAGS_X:= \
 	$(GO_PKG)/db.AppName=$(PKG_NAME) \
 	$(GO_PKG)/db.AppVersion=$(PKG_VERSION)
 GO_PKG_TAGS:=embedallowed,trace
@@ -34,7 +44,10 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/bpf.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
-TAR_CMD=$(HOST_TAR) -C $(BUILD_DIR)/ $(TAR_OPTIONS)
+GO_PKG_BUILD_VARS+= GOFLAGS="-trimpath -buildvcs=false -pgo=auto"
+GO_PKG_TARGET_VARS+= \
+	CGO_LDFLAGS="$(TARGET_LDFLAGS) -static -Wl,-s" \
+	GOEXPERIMENT=newinliner,simd
 
 define Package/daed/Default
   SECTION:=net
@@ -46,24 +59,26 @@ endef
 define Package/daed
   $(call Package/daed/Default)
   TITLE:=A Modern Dashboard For dae
-  # You need enable KERNEL_DEBUG_INFO_BTF and KERNEL_BPF_EVENTS
-  DEPENDS:=$(GO_ARCH_DEPENDS) $(BPF_DEPENDS) \
-    +ca-bundle +kmod-sched-core +kmod-sched-bpf +kmod-xdp-sockets-diag \
-    +kmod-veth
+  DEPENDS:=$(GO_ARCH_DEPENDS) \
+    +ca-bundle +kmod-sched-core +kmod-sched-bpf \
+    +kmod-veth +v2ray-geoip +v2ray-geosite \
+    +@KERNEL_XDP_SOCKETS \
+    +DAED_USE_VMLINUX_BTF:vmlinux-btf
 endef
 
-define Package/daed-geoip
-  $(call Package/daed/Default)
-  TITLE:=geoip for daed
-  DEPENDS:=+daed +v2ray-geoip
-  PKGARCH:=all
-endef
+define Package/daed/config
+	choice
+		prompt "BTF source for CO-RE"
+		default DAED_USE_KERNEL_BTF
+		depends on PACKAGE_daed
 
-define Package/daed-geosite
-  $(call Package/daed/Default)
-  TITLE:=geosite for daed
-  DEPENDS:=+daed +v2ray-geosite
-  PKGARCH:=all
+	config DAED_USE_KERNEL_BTF
+		bool "Use kernel BTF (integrated)"
+		depends on KERNEL_DEBUG_INFO_BTF
+
+	config DAED_USE_VMLINUX_BTF
+		bool "Use vmlinux-btf package"
+	endchoice
 endef
 
 define Package/daed/description
@@ -76,29 +91,10 @@ define Package/daed/conffiles
 /etc/config/daed
 endef
 
-WEB_FILE:=$(PKG_NAME)-web-$(PKG_VERSION).zip
-define Download/daed-web
-	URL:=https://github.com/daeuniverse/daed/releases/download/v$(PKG_VERSION)
-	URL_FILE:=web.zip
-	FILE:=$(WEB_FILE)
-	HASH:=skip
-endef
-
 define Build/Prepare
-	$(call Build/Prepare/Default)
-
-	( \
-		mkdir -p $(PKG_BUILD_DIR)/webrender ; \
-		unzip -q -d $(PKG_BUILD_DIR)/webrender/ $(DL_DIR)/$(WEB_FILE) ; \
-		find $(PKG_BUILD_DIR)/webrender/web -type f -size +4k ! -name "*.gz" ! -name "*.woff"  ! -name "*.woff2" -exec sh -c '\
-			gzip -9 -k "{}"; \
-			if [ "$$$$(stat -c %s "{}")" -lt "$$$$(stat -c %s "{}.gz")" ]; then \
-				rm "{}.gz"; \
-			else \
-				rm "{}"; \
-			fi' \
-		";" ; \
-	)
+	mkdir -p $(DAED_BUILD_DIR)
+	$(TAR) --strip-components=1 -C $(DAED_BUILD_DIR) -xzf $(DL_DIR)/$(PKG_SOURCE)
+	$(if $(wildcard $(PATCH_DIR)/*.patch),$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),))
 endef
 
 DAE_CFLAGS:= \
@@ -107,10 +103,6 @@ DAE_CFLAGS:= \
 	-I$(BPF_HEADERS_DIR)/tools/lib \
 	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/asm/mach-generic
 
-ifneq ($(CONFIG_USE_MUSL),)
-  TARGET_CFLAGS += -D_LARGEFILE64_SOURCE
-endif
-
 define Build/Compile
 	( \
 		pushd $(PKG_BUILD_DIR) ; \
@@ -126,11 +118,11 @@ define Build/Compile
 		BPF_CFLAGS="$(DAE_CFLAGS)" \
 		BPF_TARGET="bpfel,bpfeb" \
 		BPF_TRACE_TARGET="$(GO_ARCH)" ; \
-		go generate control/control.go ; \
-		go generate trace/trace.go ; \
+		go generate ./control/control.go ; \
+		go generate ./trace/trace.go ; \
 		popd ; \
-		$(call GoPackage/Build/Compile) ; \
 	)
+	$(call GoPackage/Build/Compile)
 endef
 
 define Package/daed/install
@@ -145,18 +137,5 @@ define Package/daed/install
 	$(INSTALL_BIN) $(CURDIR)/files/daed.init $(1)/etc/init.d/daed
 endef
 
-define Package/daed-geoip/install
-	$(INSTALL_DIR) $(1)/usr/share/daed
-	$(LN) ../v2ray/geoip.dat $(1)/usr/share/daed/geoip.dat
-endef
-
-define Package/daed-geosite/install
-	$(INSTALL_DIR) $(1)/usr/share/daed
-	$(LN) ../v2ray/geosite.dat $(1)/usr/share/daed/geosite.dat
-endef
-
-$(eval $(call Download,daed-web))
 $(eval $(call GoBinPackage,daed))
 $(eval $(call BuildPackage,daed))
-$(eval $(call BuildPackage,daed-geoip))
-$(eval $(call BuildPackage,daed-geosite))

daed/files/daed.init

@@ -21,6 +21,7 @@ start_service() {
 	config_get log_maxsize "config" "log_maxsize" "5"
 
 	procd_open_instance "$CONF"
+	procd_set_param env DAE_LOCATION_ASSET="/usr/share/v2ray"
 	procd_set_param command "$PROG" run
 	procd_append_param command --config "/etc/daed/"
 	procd_append_param command --listen "$listen_addr"
@@ -39,6 +40,9 @@ start_service() {
 
 stop_service() {
 	rm -f "$LOG"
+	# daed creates /run/netns/daens on start; a stale entry makes the next
+	# start fail with "failed to create netns: ... file exists". Clean it here.
+	ip netns del daens 2>/dev/null || true
 }
 
 service_triggers() {

daed/patches_arm/0003-drop-kprobe-skb-5.patch

@@ -0,0 +1,24 @@
+--- a/dae-core/trace/kern/trace.c
++++ b/dae-core/trace/kern/trace.c
+@@ -228,7 +228,7 @@ KPROBE_SKB_AT(1)
+ KPROBE_SKB_AT(2)
+ KPROBE_SKB_AT(3)
+ KPROBE_SKB_AT(4)
+-KPROBE_SKB_AT(5)
++//KPROBE_SKB_AT(5)
+ 
+ SEC("kprobe/skb_lifetime_termination")
+ int kprobe_skb_lifetime_termination(struct pt_regs *ctx)
+--- a/dae-core/trace/trace.go
++++ b/dae-core/trace/trace.go
+@@ -206,8 +206,8 @@ func attachBpfToTargets(objs *bpfObjects
+ 			kp, err = link.Kprobe(fn, objs.KprobeSkb3, nil)
+ 		case 4:
+ 			kp, err = link.Kprobe(fn, objs.KprobeSkb4, nil)
+-		case 5:
+-			kp, err = link.Kprobe(fn, objs.KprobeSkb5, nil)
++		//case 5:
++		//	kp, err = link.Kprobe(fn, objs.KprobeSkb5, nil)
+ 		}
+ 		if err != nil {
+ 			logrus.Debugf("failed to attach kprobe to %s: %+v\n", fn, err)

daed/test.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	"daed")
-		daed --version | grep "$PKG_VERSION"
-		;;
-esac