Skip to content

Commit 8d994c2

Browse files
committed
Restore multicore build support with kernel-bootstrap
This was removed as part of the simplify refactor, severely slowing down qemu and bare-metal builds. Restoring it brings us back to the same build times that we saw before the refactor.
1 parent 9243df2 commit 8d994c2

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

rootfs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def create_configuration_file(args):
3131
config.write(f"CHROOT={args.chroot or args.bwrap}\n")
3232
config.write(f"UPDATE_CHECKSUMS={args.update_checksums}\n")
3333
config.write(f"JOBS={args.cores}\n")
34+
config.write(f"FINAL_JOBS={args.cores}\n")
3435
config.write(f"INTERNAL_CI={args.internal_ci or False}\n")
3536
config.write(f"BARE_METAL={args.bare_metal}\n")
3637
if (args.bare_metal or args.qemu) and not args.kernel:

steps/improve/update_jobs.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/sh
2+
#
3+
# SPDX-FileCopyrightText: 2024 Gábor Stefanik <[email protected]>
4+
#
5+
# SPDX-License-Identifier: GPL-3.0-or-later
6+
#
7+
# Update $JOBS once SMP support is available
8+
9+
cat >> /steps/bootstrap.cfg <<- EOF
10+
JOBS=${FINAL_JOBS}
11+
EOF
12+
13+
. /steps/bootstrap.cfg
14+
. /steps/env

steps/manifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ improve: clean_sources
118118
build: linux-4.9.10 ( BUILD_LINUX == True )
119119
jump: break ( INTERNAL_CI == pass1 )
120120
jump: linux ( CHROOT == False )
121+
improve: update_jobs
121122
improve: finalize_fhs
122123
build: musl-1.2.4
123124
build: curl-7.88.1

0 commit comments

Comments
 (0)