remove not working AVM_SOURCE_7582_07_15

Freetz-NG · Oct 4, 2024 · 73d5b84 · 73d5b84
1 parent dca42a1
commit 73d5b84
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3,222 deletions.
diff --git a/config/avm/source.in b/config/avm/source.in
@@ -50,10 +50,6 @@ config FREETZ_AVM_SOURCE_7272_06_87
 config FREETZ_AVM_SOURCE_3272_06_86
 	bool
 
-# BCM63138
-config FREETZ_AVM_SOURCE_7582_07_15
-	bool
-
 # BRCMA9
 config FREETZ_AVM_SOURCE_7539_07_29
 	bool
@@ -283,8 +279,6 @@ config FREETZ_AVM_SOURCE_ID
 	default "7272_06.20"    if FREETZ_AVM_SOURCE_7272_06_20
 	default "7272_06.87"    if FREETZ_AVM_SOURCE_7272_06_87
 	default "3272_06.86"    if FREETZ_AVM_SOURCE_3272_06_86
-# BCM63138
-	default "7582_07.15"    if FREETZ_AVM_SOURCE_7582_07_15
 # BRCMA9
 	default "7539_07.29"    if FREETZ_AVM_SOURCE_7539_07_29
 	default "7539_07.56"    if FREETZ_AVM_SOURCE_7539_07_56
@@ -424,18 +418,6 @@ config FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_AR10
 	select FREETZ_AVM_SOURCE_3272_06_86 if FREETZ_AVM_VERSION_06_8X && FREETZ_TYPE_3272
 	bool
 
-config FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_BCM63138
-	depends on FREETZ_SYSTEM_TYPE_BCM63138
-	select FREETZ_AVM_SOURCE_7582_07_15
-	bool
-	help
-		TODO:
-		 - update make/linux/configs/*/config-bcm63138-7582_07.15
-		 - run config/.kos/generate.sh
-		 - update make/linux/patches/4.1.38/
-		 - change FREETZ_REPLACE_MODULE_AVAILABLE
-		 - special unpack
-
 config FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_BRCMA9
 	depends on FREETZ_SYSTEM_TYPE_BRCMA9
 	select FREETZ_AVM_SOURCE_7539_07_29 if FREETZ_AVM_VERSION_07_2X_MAX

diff --git a/config/mod/dl-kernel.in b/config/mod/dl-kernel.in
@@ -177,6 +177,7 @@ config FREETZ_DL_KERNEL_AVMDIFF_HASH
 	default "15bf09ac1450c5adc219097354038132f57e3650481e2b10e94b56fec71c47cd"  if FREETZ_AVM_SOURCE_7539_08_00
 	default "5e28c7d6de3d5f65592afc92ecf2361426e75afd4c8ff5adf2f4856a991c8bac"  if FREETZ_AVM_SOURCE_7580_06_53
 	default "90d7a50c529f4d83f22d637107031716e5efe10bf881ada4a6298b52bfab9f21"  if FREETZ_AVM_SOURCE_7580_06_81
+	default "1dfa4ad5eb81c6baef8f933c669c953670573c0364099dc898883643a6816803"  if FREETZ_AVM_SOURCE_7581_07_18
 	default "df4e6d172fcc4e21c9e37eba527ce4fe37915addec610cf6a1057de05afe7c55"  if FREETZ_AVM_SOURCE_7582_07_15
 	default "69854e7bbe28c074f8f2a8292cfc37ff929fbd6e75a050f46ef13e7bc1bf0807"  if FREETZ_AVM_SOURCE_7583_07_10
 	default "6898877c6c38a90e87670d02d68b30a1c237f2f60a57742b2b964863a0744132"  if FREETZ_AVM_SOURCE_7590_06_92

diff --git a/config/mod/source.in b/config/mod/source.in
@@ -30,7 +30,6 @@ config FREETZ_REPLACE_KERNEL_AVAILABLE
 config FREETZ_REPLACE_MODULE_AVAILABLE
 	bool
 	depends on FREETZ_KERNEL_AVMDIFF_AVAILABLE && !FREETZ_TYPE_FIRMWARE_UNTESTED
-	depends on !FREETZ_AVM_SOURCE_7582_07_15  # 07_1X-final 7581/7582 (corrupt)
 	depends on !FREETZ_AVM_SOURCE_7539_07_56  # 07_5X-final 7539 (corrupt)
 	depends on !FREETZ_AVM_SOURCE_7539_08_00  # 08_0X-final 7539 (corrupt)
 	depends on !FREETZ_AVM_SOURCE_7599_08_00  # 08_0X-final 7590/7599 (corrupt)
@@ -41,8 +40,9 @@ config FREETZ_REPLACE_MODULE_AVAILABLE
 
 config FREETZ_KERNEL_AVMDIFF_AVAILABLE
 	bool
-	depends on !(FREETZ_KERNEL_VERSION_4_4_60 && FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_MAPLE)  # 07_2X-final 7510/1209 (corrupt)
+	depends on !(FREETZ_KERNEL_VERSION_4_1_38 && FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_BCM63138)  # 07_1X-final 7581+7582 (07.18)
+	depends on !(FREETZ_KERNEL_VERSION_4_4_60 && FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_MAPLE)     # 07_2X-final 7510+1209 (07.30)
 	default y
 	help
-		There are no avm sources at all of this kernel version and thus no avmdiff, so unpatched vanilla is used.
+		There are corrupt or no avm sources at all of this kernel version and thus no avmdiff, so unpatched vanilla is used.
 
diff --git a/make/kernel/configs/avm/config-bcm63138-7582_07.15 b/make/kernel/configs/avm/config-bcm63138-7582_07.15