ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-02-21 01:31:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #842 from tlaurion/CPUS_as_make_argument

Browse Source 
Add 'CPUS' as make BOARD=X argument
This commit is contained in:
tlaurion 2020-09-29 13:25:11 -04:00 committed by GitHub
commit f009acb4a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.circleci/config.yml
View File

@ -50,7 +50,7 @@ jobs:
# command: |
# ./build/make-4.2.1/make \
# CROSS=/cross/bin/x86_64-linux-musl- \
# --load 2 \
# CPUS=4 \
# V=1 \
# BOARD=qemu-linuxboot \
#
@ -59,11 +59,29 @@ jobs:
# - store-artifacts:
# path: build/qemu-linuxboot/hashes.txt
- run:
name: librem_mini-NoTPM
command: |
rm -rf build/librem_mini-NoTPM/* build/log/* && make CPUS=4 \
V=1 \
BOARD=librem_mini-NoTPM || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput librem_mini-NoTPM hashes
command: |
cat build/librem_mini-NoTPM/hashes.txt \
- run:
name: Archiving build logs for librem_mini-NoTPM
command: |
tar zcvf build/librem_mini-NoTPM/logs.tar.gz build/log/*
- store-artifacts:
path: build/librem_mini-NoTPM
- run:
name: x230-flash
#We delete build/make-4.2.1/ directory until issue #799 is fixed.
command: |
rm -rf build/x230-flash/* build/log/* && make --load 2 \
rm -rf build/x230-flash/* build/log/* && make CPUS=4 \
V=1 \
BOARD=x230-flash || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
@ -81,7 +99,7 @@ jobs:
- run:
name: t430-flash
command: |
rm -rf build/t430-flash/* build/log/* && make --load 2 \
rm -rf build/t430-flash/* build/log/* && make CPUS=4 \
V=1 \
BOARD=t430-flash || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
@ -99,7 +117,7 @@ jobs:
- run:
name: t430
command: |
rm -rf build/t430/* build/log/* && make --load 2 \
rm -rf build/t430/* build/log/* && make CPUS=4 \
V=1 \
BOARD=t430 || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
@ -117,7 +135,7 @@ jobs:
- run:
name: x230
command: |
rm -rf build/x230/* build/log/* && make --load 2 \
rm -rf build/x230/* build/log/* && make CPUS=4 \
V=1 \
BOARD=x230 || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
@ -135,7 +153,7 @@ jobs:
- run:
name: x230-hotp-verification
command: |
rm -rf build/x230-hotp-verification/* build/log/* && make --load 2 \
rm -rf build/x230-hotp-verification/* build/log/* && make CPUS=4 \
V=1 \
BOARD=x230-hotp-verification || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
@ -150,28 +168,10 @@ jobs:
- store-artifacts:
path: build/x230-hotp-verification
- run:
name: librem_mini-NoTPM
command: |
rm -rf build/librem_mini-NoTPM/* build/log/* && make --load 2 \
V=1 \
BOARD=librem_mini-NoTPM || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput librem_mini-NoTPM hashes
command: |
cat build/librem_mini-NoTPM/hashes.txt \
- run:
name: Archiving build logs for librem_mini-NoTPM
command: |
tar zcvf build/librem_mini-NoTPM/logs.tar.gz build/log/*
- store-artifacts:
path: build/librem_mini-NoTPM
- run:
name: qemu-coreboot
command: |
rm -rf build/qemu-coreboot/* build/log/* && make --load 2 \
rm -rf build/qemu-coreboot/* build/log/* && make CPUS=4 \
V=1 \
BOARD=qemu-coreboot || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h

2
Makefile
View File

@ -16,7 +16,7 @@ INSTALL := $(pwd)/install
log_dir := $(build)/log
# Controls how many parallel jobs are invoked in subshells
CPUS := $(shell nproc)
CPUS ?= $(shell nproc)
#MAKE_JOBS ?= -j$(CPUS) --max-load 16
# Create the log directory if it doesn't already exist

4
modules/coreboot
View File

@ -67,12 +67,12 @@ $(COREBOOT_TOOLCHAIN):
else
COREBOOT_TOOLCHAIN="$(build)/$(coreboot_base_dir)/.xcompile"
$(COREBOOT_TOOLCHAIN): $(build)/$(coreboot_base_dir)/.canary
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=`nproc` crossgcc-i386
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$CPUS crossgcc-i386
endif
$(build)/$(coreboot_dir)/.configured: $(COREBOOT_IASL) $(COREBOOT_TOOLCHAIN)
$(COREBOOT_IASL): $(build)/$(coreboot_base_dir)/.canary
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=`nproc` iasl
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$CPUS iasl
# Force a rebuild if the inputs have changed
$(build)/$(coreboot_dir)/.build: \

2
modules/linuxboot
View File

@ -21,7 +21,7 @@ linuxboot_configure := \
if [ "$(linuxboot_board)" = "qemu" ]; then \
echo >&2 "Pre-building edk2 OVMF" ; \
( cd $(build)/$(linuxboot_base_dir)/edk2/OvmfPkg ; \
./build.sh -n `nproc` \
./build.sh -n $$CPUS \
) || exit 1 ; \
fi ; \
touch .config ; \