Skip to content

Commit

Permalink
Restore multicore build support with kernel-bootstrap
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Googulator committed Jan 1, 2024
1 parent 9243df2 commit 8d994c2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions rootfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def create_configuration_file(args):
config.write(f"CHROOT={args.chroot or args.bwrap}\n")
config.write(f"UPDATE_CHECKSUMS={args.update_checksums}\n")
config.write(f"JOBS={args.cores}\n")
config.write(f"FINAL_JOBS={args.cores}\n")
config.write(f"INTERNAL_CI={args.internal_ci or False}\n")
config.write(f"BARE_METAL={args.bare_metal}\n")
if (args.bare_metal or args.qemu) and not args.kernel:
Expand Down
14 changes: 14 additions & 0 deletions steps/improve/update_jobs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh
#
# SPDX-FileCopyrightText: 2024 Gábor Stefanik <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
# Update $JOBS once SMP support is available

cat >> /steps/bootstrap.cfg <<- EOF
JOBS=${FINAL_JOBS}
EOF

. /steps/bootstrap.cfg
. /steps/env
1 change: 1 addition & 0 deletions steps/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ improve: clean_sources
build: linux-4.9.10 ( BUILD_LINUX == True )
jump: break ( INTERNAL_CI == pass1 )
jump: linux ( CHROOT == False )
improve: update_jobs
improve: finalize_fhs
build: musl-1.2.4
build: curl-7.88.1
Expand Down

0 comments on commit 8d994c2

Please sign in to comment.