Allow the use of configurator under builder-hex0

fosslinux · May 26, 2024 · d012821 · d012821
1 parent 6fd95a8
commit d012821
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/seed/configurator.c b/seed/configurator.c
@@ -665,7 +665,7 @@ void no_input(Entry *head) {
 	fputs("Likely, you are currently running under builder-hex0.\n", stdout);
 	fputs("That's ok! We're going to make some assumptions; namely, that you do need\n", stdout);
 	fputs("the kernel bootstrap, and that you'll get a chance to configure later.\n", stdout);
-	write_cfg_values(head, "KERNEL_BOOTSTRAP=True\n", FALSE);
+	write_cfg_values(head, "KERNEL_BOOTSTRAP=True\nBUILD_KERNELS=True\n", FALSE);
 }
 
 int main(int argc, char **argv, char **envp) {

diff --git a/seed/configurator.x86.checksums b/seed/configurator.x86.checksums
@@ -1 +1 @@
-bc373892becaa92c52bda2d0e8389931d0859e97848e53b3b9d10ebf7cba9651  configurator
+8235581c60334314b5a8321b0b07d6fb905669dce81878c8cfed909377573e91  configurator
diff --git a/seed/script-generator.x86.checksums b/seed/script-generator.x86.checksums
@@ -1 +1 @@
-475ee131b41f42f158b18dfa5461eb860d2a2e895bb1593b1957b7266035b14c  script-generator
+a0ad0938f7a66b44674db2b0a2a0410966098b3cc511d8b1a4dadc77b1828088  script-generator
diff --git a/steps/configurator b/steps/configurator
@@ -54,7 +54,7 @@ Only set to True if live-bootstrap is running directly on bare metal, without
 another kernel or virtualisation layer in between. A chroot, bubblewrap, or
 QEMU is not bare metal.
 
-o /sysinfo/jobs JOBS int _ Number of jobs
+o /sysinfo/jobs FINAL_JOBS int _ Number of jobs
 The number of jobs that packages should be compiled with. A sensible value
 would be the number of threads on your system.
 

diff --git a/steps/improve/reconfigure.sh b/steps/improve/reconfigure.sh
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2024 fosslinux <[email protected]>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+set -ex
+/configurator /steps/configurator
+/script-generator /steps/manifest
diff --git a/steps/manifest b/steps/manifest
@@ -41,6 +41,7 @@ build: fiwix-1.5.0-lb1 ( BUILD_FIWIX == True )
 build: lwext4-1.0.0-lb1 ( BUILD_FIWIX == True )
 build: kexec-fiwix-1.0 ( BUILD_FIWIX == True )
 jump: fiwix ( KERNEL_BOOTSTRAP == True )
+improve: reconfigure ( CONFIGURATOR != True )
 define: JOBS = 1 ( KERNEL_BOOTSTRAP == True )
 build: make-3.82
 build: patch-2.5.9
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		bc373892becaa92c52bda2d0e8389931d0859e97848e53b3b9d10ebf7cba9651 configurator
		8235581c60334314b5a8321b0b07d6fb905669dce81878c8cfed909377573e91 configurator
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		475ee131b41f42f158b18dfa5461eb860d2a2e895bb1593b1957b7266035b14c script-generator
		a0ad0938f7a66b44674db2b0a2a0410966098b3cc511d8b1a4dadc77b1828088 script-generator