Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore multicore build support with kernel-bootstrap #388

Merged
merged 2 commits into from
Jan 10, 2024
Merged

Restore multicore build support with kernel-bootstrap #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a76fac4
Allow update_env to incorporate runtime changes to bootstrap.cfg
Googulator Jan 1, 2024
50d1d68
Restore multicore build support with kernel-bootstrap
Googulator Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rootfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def create_configuration_file(args):
config.write(f"UPDATE_CHECKSUMS={args.update_checksums}\n")
config.write(f"JOBS={args.cores}\n")
config.write(f"SWAP_SIZE={args.swap}\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/finalize_job_count.sh
View file
Open in desktop
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
#
# Finalize job count once SMP support is available

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

. /steps/bootstrap.cfg
. /steps/env
2 changes: 1 addition & 1 deletion steps/improve/update_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

unset GUILE_LOAD_PATH

cat > /steps/env <<- EOF
cat >> /steps/env <<- 'EOF'
export PATH=${PREFIX}/bin
PREFIX=${PREFIX}
LIBDIR=${LIBDIR}
Expand Down
1 change: 1 addition & 0 deletions steps/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ build: linux-4.9.10 ( BUILD_LINUX == True )
jump: break ( INTERNAL_CI == pass1 )
jump: linux ( CHROOT == False )
jump: move_disk ( KERNEL_BOOTSTRAP == True )
improve: finalize_job_count
improve: finalize_fhs
improve: swap ( SWAP_SIZE != 0 )
build: musl-1.2.4
Expand Down