From 589f08752abbac388c365c94b865d75281cb6d2b Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Thu, 20 Nov 2025 12:15:01 +0100
Subject: [PATCH] fix(buildscript): use reconfigure instead of rebuild

Reconfigure starts one stage before rebuild, just to be safe. It is the earliest step after the source download and patching.

Signed-off-by: desertwitch <24509509+desertwitch@users.noreply.github.com>
---
 README.md            | 14 +++++++++-----
 build_all_shredos.sh |  8 ++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 516a7a1021..8b39eeb9aa 100644
--- a/README.md
+++ b/README.md
@@ -844,11 +844,15 @@ Do note that loading a configuration should typically be the last step before `m
 
 #### Building multiple configurations:
 
-Generally when building multiple of the above configurations on the **same
-architecture**, you only need to ensure `make grub2-rebuild` is run between any
-two configurations, unless you have made other changes to the project. For two
-configurations of **different architectures**, a full `make clean` is always
-required for the switch-over between two different architectures.
+Generally, when building multiple configurations of the above on the same
+architecture, you only need to ensure that `make` and `make grub2-reconfigure`
+are run between any two configurations. The same applies to any other package
+whose configuration has changed, adding corresponding `<package>-reconfigure`
+steps. A `make clean` step is not usually required unless you have made
+significant changes to the project, which should save time with such builds.
+
+For two configurations targeting different architectures, a full `make clean`
+is always required when switching between them, plan time for this (takes long).
 
 For your convenience, look also into the `build_all_shredos.sh` script in the
 project root. If you invoke it with no arguments, it will show a usage manual
diff --git a/build_all_shredos.sh b/build_all_shredos.sh
index 4c4e5f4b4f..5b65114589 100755
--- a/build_all_shredos.sh
+++ b/build_all_shredos.sh
@@ -300,7 +300,9 @@ build_config() {
 		echo "============================================"
 		echo
 		for pkg in "${ALWAYS_REBUILD_PKGS[@]}"; do
-			if ! run_cmd make "${pkg}-rebuild"; then
+			# Reconfigure starts one stage before rebuild, just to be safe.
+			# It is the earliest step after the source download and patching.
+			if ! run_cmd make "${pkg}-reconfigure"; then
 				build_config_failed "$config" "$arch" "$log_file"
 				return 1
 			fi
@@ -337,7 +339,9 @@ build_config() {
 			echo "============================================"
 			echo
 			for pkg in "${ALWAYS_REBUILD_PKGS[@]}"; do
-				if ! run_cmd make "${pkg}-rebuild"; then
+				# Reconfigure starts one stage before rebuild, just to be safe.
+				# It is the earliest step after the source download and patching.
+				if ! run_cmd make "${pkg}-reconfigure"; then
 					build_config_failed "$config" "$arch" "$log_file"
 					return 1
 				fi