Merge remote-tracking branch 'origin/main' into temp-lede

smallprogram · Jan 8, 2025 · aa8543c · aa8543c
2 parents 918fd4c + 54e6779
commit aa8543c
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 72 deletions.
diff --git a/config/openwrt_config/R2C.config b/config/openwrt_config/R2C.config
@@ -1761,13 +1761,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3328=y
 CONFIG_PACKAGE_u-boot-nanopi-r2c-rk3328=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5159,7 +5152,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/R2CPLUS.config b/config/openwrt_config/R2CPLUS.config
@@ -1761,13 +1761,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3328=y
 CONFIG_PACKAGE_u-boot-nanopi-r2c-plus-rk3328=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5159,7 +5152,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/R2S.config b/config/openwrt_config/R2S.config
@@ -1761,13 +1761,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3328=y
 CONFIG_PACKAGE_u-boot-nanopi-r2s-rk3328=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5159,7 +5152,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/R4S.config b/config/openwrt_config/R4S.config
@@ -1761,13 +1761,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3399=y
 CONFIG_PACKAGE_u-boot-nanopi-r4s-rk3399=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5159,7 +5152,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/R4SE.config b/config/openwrt_config/R4SE.config
@@ -1761,13 +1761,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3399=y
 CONFIG_PACKAGE_u-boot-nanopi-r4s-rk3399=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5159,7 +5152,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/R5C.config b/config/openwrt_config/R5C.config
@@ -1765,13 +1765,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3568=y
 CONFIG_PACKAGE_u-boot-nanopi-r5c-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5163,7 +5156,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/R5S.config b/config/openwrt_config/R5S.config
@@ -1761,13 +1761,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3568=y
 CONFIG_PACKAGE_u-boot-nanopi-r5s-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5159,7 +5152,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/R6S.config b/config/openwrt_config/R6S.config
@@ -1761,13 +1761,6 @@ CONFIG_PACKAGE_trusted-firmware-a-rk3588=y
 CONFIG_PACKAGE_u-boot-nanopi-r6s-rk3588s=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5159,7 +5152,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set

diff --git a/config/openwrt_config/X86.config b/config/openwrt_config/X86.config
@@ -1762,13 +1762,6 @@ CONFIG_PACKAGE_grub2-efi=y
 # CONFIG_PACKAGE_gummiboot is not set
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-# CONFIG_PACKAGE_appfilter is not set
-# CONFIG_PACKAGE_kmod-oaf is not set
-# end of Derry Apps
-
 #
 # Development
 #
@@ -5207,7 +5200,6 @@ CONFIG_PACKAGE_luci-app-netspeedtest=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-# CONFIG_PACKAGE_luci-app-oaf is not set
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set