Skip to content

Commit

Permalink
Revert coreboot module to not use musl-cross-make but use per coreboo…
Browse files Browse the repository at this point in the history
…t toolchain for its compilation

- remove coreboot patches to build coreboot against musl-cross-make directly
- musl-cross-make only responsible to build the rest of the modules
  • Loading branch information
tlaurion committed Dec 12, 2020
1 parent 7208ec1 commit 4012895
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 100 deletions.
33 changes: 21 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ jobs:
- run:
name: kgpe-d16_workstation
command: |
rm -rf build/kgpe-d16_workstation/* build/log/* && \
make CPUS=4 V=1 BOARD=kgpe-d16_workstation || \
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
rm -rf build/kgpe-d16_workstation/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_workstation || touch /tmp/failed_build
no_output_timeout: 3h
- run:
name: Output build failing logs
command: |
if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi \
- run:
name: Ouput kgpe-d16_workstation hashes
command: |
Expand All @@ -80,10 +82,12 @@ jobs:
- run:
name: kgpe-d16_workstation-usb_keyboard
command: |
rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && \
make CPUS=4 V=1 BOARD=kgpe-d16_workstation-usb_keyboard || \
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_workstation-usb_keyboard || touch /tmp/failed_build
no_output_timeout: 3h
- run:
name: Output build failing logs
command: |
if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi \
- run:
name: Ouput kgpe-d16_workstation-usb_keyboard hashes
command: |
Expand All @@ -98,10 +102,12 @@ jobs:
- run:
name: kgpe-d16_server
command: |
rm -rf build/kgpe-d16_server/* build/log/* && \
make CPUS=4 V=1 BOARD=kgpe-d16_server || \
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
rm -rf build/kgpe-d16_server/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_server || touch /tmp/failed_build
no_output_timeout: 3h
- run:
name: Output build failing logs
command: |
if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi \
- run:
name: Ouput kgpe-d16_server hashes
command: |
Expand All @@ -116,10 +122,12 @@ jobs:
- run:
name: kgpe-d16_server-whiptail
command: |
rm -rf build/kgpe-d16_server-whiptail/* build/log/* && \
make CPUS=4 V=1 BOARD=kgpe-d16_server-whiptail || \
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
rm -rf build/kgpe-d16_server-whiptail/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_server-whiptail || touch /tmp/failed_build
no_output_timeout: 3h
- run:
name: Output build failing logs
command: |
if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi \
- run:
name: Ouput kgpe-d16_server-whiptail hashes
command: |
Expand All @@ -130,6 +138,7 @@ jobs:
tar zcvf build/kgpe-d16_server-whiptail/logs.tar.gz build/log/*
- store-artifacts:
path: build/kgpe-d16_server-whiptail

- run:
name: librem_l1um
command: |
Expand Down
6 changes: 5 additions & 1 deletion modules/coreboot
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ coreboot_target := \
coreboot_output := coreboot.rom
coreboot_depend += linux initrd $(musl_dep)

$(build)/$(coreboot_dir)/.configured: $(COREBOOT_IASL)
COREBOOT_TOOLCHAIN="$(build)/$(coreboot_base_dir)/.xcompile"
$(COREBOOT_TOOLCHAIN): $(build)/$(coreboot_base_dir)/.canary
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$CPUS crossgcc-i386

$(build)/$(coreboot_dir)/.configured: $(COREBOOT_IASL) $(COREBOOT_TOOLCHAIN)
$(COREBOOT_IASL): $(build)/$(coreboot_base_dir)/.canary
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$CPUS iasl

Expand Down
32 changes: 0 additions & 32 deletions patches/coreboot-4.11/0010-cross-compiler-support.patch

This file was deleted.

28 changes: 0 additions & 28 deletions patches/coreboot-4.12/0010-cross-compiler-support.patch

This file was deleted.

27 changes: 0 additions & 27 deletions patches/coreboot-4.8.1/0010-cross-compiler-support.patch

This file was deleted.

0 comments on commit 4012895

Please sign in to comment.