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

smallprogram · Jan 8, 2025 · b8e026f · b8e026f
2 parents b218692 + aa8543c
commit b8e026f
Show file tree

Hide file tree

Showing 23 changed files with 0 additions and 198 deletions.
diff --git a/config/leanlede_config/H66K.config b/config/leanlede_config/H66K.config
@@ -2737,13 +2737,6 @@ CONFIG_PACKAGE_rkbin-rk3568=y
 CONFIG_PACKAGE_u-boot-generic-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6155,7 +6148,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6856,7 +6848,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/H68K.config b/config/leanlede_config/H68K.config
@@ -2737,13 +2737,6 @@ CONFIG_PACKAGE_rkbin-rk3568=y
 CONFIG_PACKAGE_u-boot-generic-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6155,7 +6148,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6856,7 +6848,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/H69K.config b/config/leanlede_config/H69K.config
@@ -2740,13 +2740,6 @@ CONFIG_PACKAGE_rkbin-rk3568=y
 CONFIG_PACKAGE_u-boot-generic-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6158,7 +6151,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6859,7 +6851,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R2C.config b/config/leanlede_config/R2C.config
@@ -2731,13 +2731,6 @@ CONFIG_PACKAGE_rkbin-rk3328=y
 CONFIG_PACKAGE_u-boot-nanopi-r2c-rk3328=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6164,7 +6157,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6831,7 +6823,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R2S.config b/config/leanlede_config/R2S.config
@@ -2731,13 +2731,6 @@ CONFIG_PACKAGE_rkbin-rk3328=y
 CONFIG_PACKAGE_u-boot-nanopi-r2s-rk3328=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6164,7 +6157,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6831,7 +6823,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R4S.config b/config/leanlede_config/R4S.config
@@ -2731,13 +2731,6 @@ CONFIG_PACKAGE_rkbin-rk3399=y
 CONFIG_PACKAGE_u-boot-nanopi-r4s-rk3399=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6164,7 +6157,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6831,7 +6823,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R4SE.config b/config/leanlede_config/R4SE.config
@@ -2732,13 +2732,6 @@ CONFIG_PACKAGE_rkbin-rk3399=y
 CONFIG_PACKAGE_u-boot-nanopi-r4se-rk3399=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6150,7 +6143,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6851,7 +6843,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R5C.config b/config/leanlede_config/R5C.config
@@ -2732,13 +2732,6 @@ CONFIG_PACKAGE_rkbin-rk3568=y
 CONFIG_PACKAGE_u-boot-nanopi-r5c-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6150,7 +6143,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6851,7 +6843,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R5S.config b/config/leanlede_config/R5S.config
@@ -2732,13 +2732,6 @@ CONFIG_PACKAGE_rkbin-rk3568=y
 CONFIG_PACKAGE_u-boot-nanopi-r5s-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6150,7 +6143,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6851,7 +6843,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R66S.config b/config/leanlede_config/R66S.config
@@ -2732,13 +2732,6 @@ CONFIG_PACKAGE_rkbin-rk3568=y
 CONFIG_PACKAGE_u-boot-fastrhino-r66s-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6150,7 +6143,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6851,7 +6843,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R68S.config b/config/leanlede_config/R68S.config
@@ -2732,13 +2732,6 @@ CONFIG_PACKAGE_rkbin-rk3568=y
 CONFIG_PACKAGE_u-boot-fastrhino-r68s-rk3568=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6150,7 +6143,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6851,7 +6843,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R_PI_3b.config b/config/leanlede_config/R_PI_3b.config
@@ -2665,13 +2665,6 @@ CONFIG_PACKAGE_netdata=y
 CONFIG_PACKAGE_bcm27xx-gpu-fw=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6107,7 +6100,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6740,7 +6732,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set

diff --git a/config/leanlede_config/R_PI_4b.config b/config/leanlede_config/R_PI_4b.config
@@ -2666,13 +2666,6 @@ CONFIG_PACKAGE_netdata=y
 CONFIG_PACKAGE_bcm27xx-gpu-fw=y
 # end of Boot Loaders
 
-#
-# Derry Apps
-#
-CONFIG_PACKAGE_appfilter=y
-CONFIG_PACKAGE_kmod-oaf=y
-# end of Derry Apps
-
 #
 # Development
 #
@@ -6109,7 +6102,6 @@ CONFIG_PACKAGE_luci-app-nft-qos=y
 # CONFIG_PACKAGE_luci-app-njitclient is not set
 CONFIG_PACKAGE_luci-app-nlbwmon=y
 # CONFIG_PACKAGE_luci-app-nut is not set
-CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-ocserv=y
 # CONFIG_PACKAGE_luci-app-olsr is not set
 # CONFIG_PACKAGE_luci-app-olsr-services is not set
@@ -6742,7 +6734,6 @@ CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-vi is not set
 CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y
 # CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-tw is not set
-
 # CONFIG_PACKAGE_luci-i18n-ocserv-ar is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bg is not set
 # CONFIG_PACKAGE_luci-i18n-ocserv-bn is not set