From fad7da67a18c258ef1cb15bff0218dc88b0ddcb5 Mon Sep 17 00:00:00 2001
From: PartialVolume <22084881+PartialVolume@users.noreply.github.com>
Date: Thu, 5 Feb 2026 01:42:19 +0000
Subject: [PATCH] Simplify selection of git commit hash or revision tag v0.40
 etc. by removing the hard coded references to the stable release and have
 just a single selection in menuconfig where you enter a commit hash or a
 version tag. This means for future updates I won't need to manually update
 the hard coded version or comments in nwipe.mk and Config.in that mention
 v0.40 to keep it relevent, I simply update the version in menuconfig to
 v0.41. Updated all defconfigs with the new revision string
 BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"

---
 configs/shredos_defconfig                     |  1 +
 configs/shredos_i686_lite_defconfig           |  1 +
 configs/shredos_iso_extra_defconfig           |  1 +
 configs/shredos_iso_extra_i686_lite_defconfig |  1 +
 configs/shredos_lite_defconfig                |  1 +
 package/nwipe/Config.in                       | 21 +------------------
 package/nwipe/nwipe.mk                        | 14 -------------
 7 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/configs/shredos_defconfig b/configs/shredos_defconfig
index 1f3ad972c4..63ac599445 100644
--- a/configs/shredos_defconfig
+++ b/configs/shredos_defconfig
@@ -117,6 +117,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_LIBCAP_NG=y
 BR2_PACKAGE_LIBSECCOMP=y
 BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"
 BR2_PACKAGE_LIBFRIBIDI=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_NCURSES_TARGET_PROGS=y
diff --git a/configs/shredos_i686_lite_defconfig b/configs/shredos_i686_lite_defconfig
index 05e6b69c25..c377c5420d 100644
--- a/configs/shredos_i686_lite_defconfig
+++ b/configs/shredos_i686_lite_defconfig
@@ -50,6 +50,7 @@ BR2_PACKAGE_TRIGGERHAPPY=y
 BR2_PACKAGE_LZ4=y
 BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
 BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_UTF8PROC=y
 BR2_PACKAGE_XUTIL_UTIL_MACROS=y
diff --git a/configs/shredos_iso_extra_defconfig b/configs/shredos_iso_extra_defconfig
index 246f1e1494..eff6282bb0 100644
--- a/configs/shredos_iso_extra_defconfig
+++ b/configs/shredos_iso_extra_defconfig
@@ -118,6 +118,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_LIBCAP_NG=y
 BR2_PACKAGE_LIBSECCOMP=y
 BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"
 BR2_PACKAGE_LIBFRIBIDI=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_NCURSES_TARGET_PROGS=y
diff --git a/configs/shredos_iso_extra_i686_lite_defconfig b/configs/shredos_iso_extra_i686_lite_defconfig
index db2111c483..9a3155520c 100644
--- a/configs/shredos_iso_extra_i686_lite_defconfig
+++ b/configs/shredos_iso_extra_i686_lite_defconfig
@@ -52,6 +52,7 @@ BR2_PACKAGE_TRIGGERHAPPY=y
 BR2_PACKAGE_LZ4=y
 BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
 BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_UTF8PROC=y
 BR2_PACKAGE_XUTIL_UTIL_MACROS=y
diff --git a/configs/shredos_lite_defconfig b/configs/shredos_lite_defconfig
index b343901eff..7e6007b83a 100644
--- a/configs/shredos_lite_defconfig
+++ b/configs/shredos_lite_defconfig
@@ -52,6 +52,7 @@ BR2_PACKAGE_TRIGGERHAPPY=y
 BR2_PACKAGE_LZ4=y
 BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
 BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_UTF8PROC=y
 BR2_PACKAGE_XUTIL_UTIL_MACROS=y
diff --git a/package/nwipe/Config.in b/package/nwipe/Config.in
index 49083d335d..cdbe4632e0 100644
--- a/package/nwipe/Config.in
+++ b/package/nwipe/Config.in
@@ -19,27 +19,8 @@ config BR2_PACKAGE_NWIPE_SITE
 	    - https://github.com/youruser/nwipe.git
 	    - git@github.com:youruser/nwipe.git
 
-choice
-	prompt "nwipe version"
-	default BR2_PACKAGE_NWIPE_VERSION_STABLE
-	help
-	  Select which nwipe version (Git ref) should be built.
-
-config BR2_PACKAGE_NWIPE_VERSION_STABLE
-	bool "Stable tag (v0.40)"
-	help
-	  Use the previously hard-coded tag (v0.40) as a stable baseline.
-
-config BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION
-	bool "Git revision"
-	help
-	  Use a user-specified Git revision (full commit SHA-1 or tag).
-
-endchoice
-
 config BR2_PACKAGE_NWIPE_GIT_REVISION
-	string "Git revision (full commit SHA-1 or tag)"
-	depends on BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION
+	string "Git revision (full commit SHA-1 or tag v0.25-v0.40 ..)"
 	help
 	  When 'Git revision' is selected above, this string is passed as the
 	  Git ref to check out. Examples:
diff --git a/package/nwipe/nwipe.mk b/package/nwipe/nwipe.mk
index 8fdfc73a1b..db9e212667 100644
--- a/package/nwipe/nwipe.mk
+++ b/package/nwipe/nwipe.mk
@@ -4,21 +4,7 @@
 #
 ################################################################################
 
-# 'NWIPE_TAG' version that will be compiled, nwipe tags are of the form v0.40
-# if BR2_PACKAGE_NWIPE_VERSION_STABLE is y else the git commit version will
-# be installed as defined in Target Packages>libaries>other>nwipe
-
-NWIPE_TAG = v0.40
-
-# Select the Git reference based on the Kconfig choice.
-ifeq ($(BR2_PACKAGE_NWIPE_VERSION_STABLE),y)
-NWIPE_VERSION = $(NWIPE_TAG)
-else ifeq ($(BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION),y)
 NWIPE_VERSION = $(call qstrip,$(BR2_PACKAGE_NWIPE_GIT_REVISION))
-else
-# Fallback – should not happen because the choice enforces exactly one option
-NWIPE_VERSION = $(NWIPE_TAG)
-endif
 
 # Default Git repository URL (never empty).
 NWIPE_SITE = https://github.com/martijnvanbrummelen/nwipe.git