Add package luci-app-daed

Signed-off-by: Nicholas Sun <nicholas-sun@outlook.com>

Author: nicholas-opensource

.github/workflows/R2S-OpenWrt.yml

@@ -50,6 +50,7 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
+        sudo -E git config --global core.abbrev auto
         df -h
     - name: Prepare Mixedwrt
       run: |

.github/workflows/R4S-OpenWrt.yml

@@ -50,6 +50,7 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
+        sudo -E git config --global core.abbrev auto
         df -h
     - name: Prepare Mixedwrt
       run: |

.github/workflows/X86-OpenWrt.yml

@@ -50,6 +50,7 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
+        sudo -E git config --global core.abbrev auto
         df -h
     - name: Prepare Mixedwrt
       run: |

PATCH/cgroupfs-mount/0001-fix-cgroupfs-mount.patch

@@ -0,0 +1,26 @@
+diff --git a/utils/cgroupfs-mount/files/cgroupfs-mount.init b/utils/cgroupfs-mount/files/cgroupfs-mount.init
+index 0d6b68d..4ae3185 100755
+--- a/utils/cgroupfs-mount/files/cgroupfs-mount.init
++++ b/utils/cgroupfs-mount/files/cgroupfs-mount.init
+@@ -4,9 +4,17 @@ START=01
+ 
+ boot() {
+ 	# Procd mounts non-hierarchical cgroupfs so unmount first before cgroupfs-mount
+-	if mountpoint -q /sys/fs/cgroup; then
+-		umount /sys/fs/cgroup/
+-	fi
++	umount_cgroup() {
++		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
++			if mountpoint -q /sys/fs/cgroup/$sys; then
++				umount /sys/fs/cgroup/$sys || true
++			fi
++		done
++		if mountpoint -q /sys/fs/cgroup; then
++			umount /sys/fs/cgroup || true
++		fi
++	}
+ 
+-	cgroupfs-mount
++	umount_cgroup
++	cgroupfs-mount v2
+ }

PATCH/cgroupfs-mount/900-add-cgroupfs2.patch

@@ -0,0 +1,32 @@
+diff --git a/cgroupfs-mount b/cgroupfs-mount
+index 40810ba..f4c9f45 100755
+--- a/cgroupfs-mount
++++ b/cgroupfs-mount
+@@ -26,7 +26,11 @@ fi
+ 
+ # mount /sys/fs/cgroup if not already done
+ if ! mountpoint -q /sys/fs/cgroup; then
+-	mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
++	if [ "$1" = "v2" ]; then
++		mount -t cgroup2 -o rw,nosuid,nodev,noexec,relatime,nsdelegate cgroup2 /sys/fs/cgroup
++	else
++		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
++	fi
+ fi
+ 
+ cd /sys/fs/cgroup
+@@ -34,9 +38,11 @@ cd /sys/fs/cgroup
+ # get/mount list of enabled cgroup controllers
+ for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
+ 	mkdir -p $sys
+-	if ! mountpoint -q $sys; then
+-		if ! mount -n -t cgroup -o $sys cgroup $sys; then
+-			rmdir $sys || true
++	if [ "$1" != "v2" ]; then
++		if ! mountpoint -q $sys; then
++			if ! mount -n -t cgroup -o $sys cgroup $sys; then
++				rmdir $sys || true
++			fi
+ 		fi
+ 	fi
+ done

PATCH/script/updategeo.sh

@@ -1,11 +1,4 @@
 
-# The honeymoon is over, but...
-
-  * Wasted too much time playing Tears of the Kingdom, maybe Ganondorf was killed around the 16th of August, so I'll be updating the repository at that time~  
-  * 愿可盖大人荣光永存！  
-
-![zelda](https://i.redd.it/totk-lets-be-honest-link-would-have-spoilers-on-day-one-v0-ruxcfjuzxm3b1.jpg?s=900bbf90aa557af0ce47b5e3481223b52c7907e5)
-
 ## Notice
 
 This repository is based on [QiuSimons/YAOF](https://github.com/QiuSimons/YAOF).  
@@ -36,7 +29,7 @@ Password：None
 
 ### Version Informations
 
-OpenWrt official v23.05.0-rc1  
+OpenWrt official v23.05.0-rc2  
 
 ---
 ### Feature
@@ -50,24 +43,14 @@ OpenWrt official v23.05.0-rc1
 4.Opkg vermagic matched with OpenWrt manifest ( You can install the software as if you have AppStore~ )
 
 5.Add package [dae](https://github.com/daeuniverse/dae), a high performance eBPF transparent proxy client  
-Add command `updategeo` to download `geoip.dat` and `geosite.dat` and place them to the correct path for `dae`  
-* The init of dae has a problem temporarily and cannot run yet  
-* Run dae with command:  
-```
-updategeo
-chmod 600 /etc/dae/config.dae
-dae run -c /etc/dae/config.dae
-```
-* Run dae with log output:  
-```
-dae run -c /etc/dae/config.dae &> /tmp/dae.log
 ```
+6.Add [luci-app-daed](https://github.com/QiuSimons/luci-app-daed) to enable [daed](https://github.com/daeuniverse/daed), a modern dashboard for dae  
 
-6.Update to firewall4, firewall3 no longer supported ( Huge improvements in performance )  
+7.Update to firewall4, firewall3 no longer supported ( Huge improvements in performance )  
 
-7.Add support for phone USB hotspot sharing, both for Android and iPhone
+8.Add support for phone USB hotspot sharing, both for Android and iPhone
 
-8.Disable IPv6 by default
+9.Disable IPv6 by default
 
   * If you do need IPv6
 
@@ -80,6 +63,7 @@ uci set dhcp.@dnsmasq[0].rebind_protection='0'
 uci del dhcp.@dnsmasq[0].filteraaaa
 uci commit dhcp
 ```
+  * PS: HYBRID mode is never a good choice, please learn about [IPv6](https://www.cisco.com/en/US/docs/switches/lan/catalyst3850/software/release/3se/consolidated_guide/b_consolidated_3850_3se_cg_chapter_0101011.html). Also odhcpd on OpenWrt has serious bugs!  
 
 #### X86_64 Feature
 

README.md

@@ -1,30 +1,13 @@
 #!/bin/bash
 
 # Clone source code
-#latest_release="$(curl -s https://api.github.com/repos/openwrt/openwrt/tags | grep -Eo "v23.05.+[0-9\.]" | head -n 1)"
-latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][3-9]/p' | sed -n 1p | sed 's/.tar.gz//g')"
-git clone --single-branch -b ${latest_release} https://github.com/openwrt/openwrt openwrt_release
-git clone --single-branch -b openwrt-23.05 https://github.com/openwrt/openwrt openwrt
-rm -f ./openwrt/include/version.mk
-rm -f ./openwrt/include/kernel.mk
-rm -f ./openwrt/include/kernel-5.15
-rm -f ./openwrt/include/kernel-version.mk
-rm -f ./openwrt/include/toolchain-build.mk
-rm -f ./openwrt/include/kernel-defaults.mk
-rm -f ./openwrt/package/base-files/image-config.in
-rm -rf ./openwrt/target/linux/*
-rm -rf ./openwrt/package/kernel/linux/*
-cp -f ./openwrt_release/include/version.mk ./openwrt/include/version.mk
-cp -f ./openwrt_release/include/kernel.mk ./openwrt/include/kernel.mk
-cp -f ./openwrt_release/include/kernel-5.15 ./openwrt/include/kernel-5.15
-cp -f ./openwrt_release/include/kernel-version.mk ./openwrt/include/kernel-version.mk
-cp -f ./openwrt_release/include/toolchain-build.mk ./openwrt/include/toolchain-build.mk
-cp -f ./openwrt_release/include/kernel-defaults.mk ./openwrt/include/kernel-defaults.mk
-cp -f ./openwrt_release/package/base-files/image-config.in ./openwrt/package/base-files/image-config.in
-cp -f ./openwrt_release/version ./openwrt/version
-cp -f ./openwrt_release/version.date ./openwrt/version.date
-cp -rf ./openwrt_release/target/linux/* ./openwrt/target/linux/
-cp -rf ./openwrt_release/package/kernel/linux/* ./openwrt/package/kernel/linux/
+latest_release="$(curl -s https://api.github.com/repos/openwrt/openwrt/tags | grep -Eo "v23.05.+[0-9\.]" | head -n 1)"
+git clone --single-branch -b ${latest_release} https://github.com/openwrt/openwrt openwrt
+git clone --single-branch -b openwrt-23.05 https://github.com/openwrt/openwrt openwrt_snap
+find openwrt/package/* -maxdepth 0 ! -name 'firmware' ! -name 'kernel' ! -name 'base-files' ! -name 'Makefile' -exec rm -rf {} +
+rm -rf ./openwrt_snap/package/firmware ./openwrt_snap/package/kernel ./openwrt_snap/package/base-files ./openwrt_snap/package/Makefile
+cp -rf ./openwrt_snap/package/* ./openwrt/package/
+cp -rf ./openwrt_snap/feeds.conf.default ./openwrt/feeds.conf.default
 
 # Clone packages
 git clone -b master --depth 1 https://github.com/immortalwrt/immortalwrt.git immortalwrt
@@ -38,5 +21,6 @@ git clone -b master --depth 1 https://github.com/coolsnowwolf/luci.git lede_luci
 git clone -b main --depth 1 https://github.com/openwrt/openwrt.git openwrt_ma
 git clone -b master --depth 1 https://github.com/openwrt/packages.git openwrt_pkg_ma
 git clone -b master --depth 1 https://github.com/openwrt/luci.git openwrt_luci_ma
+git clone -b master --depth 1 https://github.com/QiuSimons/openwrt-mos mosdns
 
 exit 0

SCRIPTS/01_get_ready.sh

@@ -43,24 +43,13 @@ sed -i 's/syn_flood/synflood_protect/g' package/network/config/firewall/files/fi
 ## Change x86 & rockchip target and u-boot
 rm -rf ./target/linux/rockchip
 cp -rf ../immortalwrt_23/target/linux/rockchip ./target/linux/rockchip
-#rm -rf ./target/linux/rockchip/Makefile
-#cp -rf ../openwrt_release/target/linux/rockchip/Makefile ./target/linux/rockchip/Makefile
-#rm -rf ./target/linux/rockchip/armv8/config-5.15
-#cp -rf ../openwrt_release/target/linux/rockchip/armv8/config-5.15 ./target/linux/rockchip/armv8/config-5.15
 cp -rf ../PATCH/rockchip-5.15/* ./target/linux/rockchip/patches-5.15/
 rm -rf ./package/boot/uboot-rockchip
 cp -rf ../immortalwrt_23/package/boot/uboot-rockchip ./package/boot/uboot-rockchip
 rm -rf ./package/boot/arm-trusted-firmware-rockchip
 cp -rf ../immortalwrt_23/package/boot/arm-trusted-firmware-rockchip ./package/boot/arm-trusted-firmware-rockchip
-rm -rf ./package/kernel/linux/modules/video.mk
-cp -rf ../lede/package/kernel/linux/modules/video.mk ./package/kernel/linux/modules/video.mk
-sed -i '/nouveau\.ko/d' package/kernel/linux/modules/video.mk
-rm -rf ./package/firmware/linux-firmware/intel.mk
-cp -rf ../lede/package/firmware/linux-firmware/intel.mk ./package/firmware/linux-firmware/intel.mk
-rm -rf ./package/firmware/linux-firmware/Makefile
-cp -rf ../lede/package/firmware/linux-firmware/Makefile ./package/firmware/linux-firmware/Makefile
 wget -qO - https://github.com/openwrt/openwrt/commit/c21a3570.patch | patch -p1
-cp -rf ../lede/target/linux/x86/64/config-5.15 ./target/linux/x86/64/config-5.15
+sed -i '/I915/d' target/linux/x86/64/config-5.15
 # Disable mitigations
 sed -i 's,rootwait,rootwait mitigations=off,g' target/linux/rockchip/image/mmc.bootscript
 sed -i 's,rootwait,rootwait mitigations=off,g' target/linux/rockchip/image/nanopi-r2s.bootscript
@@ -84,19 +73,29 @@ rm -rf ./feeds/luci/modules/luci-mod-status
 cp -rf ../immortalwrt_luci_23/modules/luci-mod-status ./feeds/luci/modules/luci-mod-status
 rm -rf ./feeds/packages/utils/coremark
 cp -rf ../immortalwrt_pkg/utils/coremark ./feeds/packages/utils/coremark
+sed -i "s,-O3,-Ofast -funroll-loops -fpeel-loops -fgcse-sm -fgcse-las,g" feeds/packages/utils/coremark/Makefile
 cp -rf ../immortalwrt_23/package/utils/mhz ./package/utils/mhz
 # AutoReboot
 cp -rf ../immortalwrt_luci/applications/luci-app-autoreboot ./feeds/luci/applications/luci-app-autoreboot
 ln -sf ../../../feeds/luci/applications/luci-app-autoreboot ./package/feeds/luci/luci-app-autoreboot
 # Dae ready
 cp -rf ../immortalwrt_pkg/net/dae ./feeds/packages/net/dae
 ln -sf ../../../feeds/packages/net/dae ./package/feeds/packages/dae
-wget https://github.com/immortalwrt/immortalwrt/raw/openwrt-23.05/package/kernel/linux/modules/netsupport.mk -O package/kernel/linux/modules/netsupport.mk
+cp -rf ../immortalwrt_pkg/net/daed ./feeds/packages/net/daed
+ln -sf ../../../feeds/packages/net/daed ./package/feeds/packages/daed
+git clone -b master --depth 1 https://github.com/QiuSimons/luci-app-daed package/new/luci-app-daed
+rm -rf ./feeds/packages/net/v2ray-geodata
+cp -rf ../mosdns/v2ray-geodata ./package/new/v2ray-geodata
+wget -qO - https://github.com/openwrt/openwrt/commit/47ea58b.patch | patch -p1
+wget -qO - https://github.com/openwrt/openwrt/commit/ce3082d.patch | patch -p1
 wget https://github.com/immortalwrt/immortalwrt/raw/openwrt-23.05/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch -O target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
+wget -qO - https://github.com/immortalwrt/immortalwrt/commit/73e5679.patch | patch -p1
+wget https://github.com/immortalwrt/immortalwrt/raw/openwrt-23.05/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch -O target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch
 pushd feeds/packages
-wget -qO - https://github.com/openwrt/packages/commit/7a64a5f4.patch | patch -p1
+patch -p1 <../../../PATCH/cgroupfs-mount/0001-fix-cgroupfs-mount.patch
 popd
-cp -rf ../PATCH/script/updategeo.sh ./package/base-files/files/bin/updategeo
+mkdir -p feeds/packages/utils/cgroupfs-mount/patches
+cp -rf ../PATCH/cgroupfs-mount/900-add-cgroupfs2.patch ./feeds/packages/utils/cgroupfs-mount/patches/
 # Dae update
 sed -i '/zip/d;/HASH/d;/RELEASE:=/d' feeds/packages/net/dae/Makefile
 sed -i "/VERSION:/ s/$/-$(date +'%Y%m%d')/" feeds/packages/net/dae/Makefile
@@ -125,5 +124,4 @@ cp -f ../PATCH/script/fuck package/base-files/files/usr/bin/fuck
 wget -qO - https://github.com/openwrt/openwrt/commit/bbf39d07.patch | patch -p1
 # Remove config
 rm -rf .config
-cat ../SEED/extra.cfg >> ./target/linux/generic/config-5.15
 sed -i 's,CONFIG_WERROR=y,# CONFIG_WERROR is not set,g' target/linux/generic/config-5.15

SCRIPTS/02_prepare_package.sh

@@ -22,7 +22,7 @@ cp -rf ../PATCH/script/cputemp.sh ./package/base-files/files/bin/cputemp
 cp -rf ../PATCH/duplicate/files ./files
 
 # Match Vermagic
-latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][3-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')"
+latest_release="$(curl -s https://api.github.com/repos/openwrt/openwrt/tags | grep -Eo "v23.05.+[0-9\.]" | head -n 1)"
 wget https://downloads.openwrt.org/releases/${latest_release}/targets/rockchip/armv8/packages/Packages.gz
 zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' >.vermagic
 sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk