Skip to content

Commit be7fac4

Browse files
tlauriontlaurion
committed
CircleCI & coreboot config: fix merge conflict rebasing on master
1 parent 73e62fd commit be7fac4

2 files changed

Lines changed: 22 additions & 48 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: git reset
1616
command: |
1717
git reset --hard "$CIRCLE_SHA1" \
18-
18+
1919
- run:
2020
name: Creating all modules and patches digest
2121
command: |
@@ -50,7 +50,7 @@ jobs:
5050
# command: |
5151
# ./build/make-4.2.1/make \
5252
# CROSS=/cross/bin/x86_64-linux-musl- \
53-
# --load 2 \
53+
# CPUS=4 \
5454
# V=1 \
5555
# BOARD=qemu-linuxboot \
5656
#
@@ -63,8 +63,7 @@ jobs:
6363
name: kgpe-d16_workstation
6464
command: |
6565
rm -rf build/kgpe-d16_workstation/* build/log/* && \
66-
make --load 2 BOARD=kgpe-d16_workstation || \
67-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
66+
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) \
6867
no_output_timeout: 3h
6968
- run:
7069
name: Ouput kgpe-d16_workstation hashes
@@ -81,8 +80,7 @@ jobs:
8180
name: kgpe-d16_workstation-usb_keyboard
8281
command: |
8382
rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && \
84-
make --load 2 BOARD=kgpe-d16_workstation-usb_keyboard) || \
85-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
83+
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) \
8684
no_output_timeout: 3h
8785
- run:
8886
name: Ouput kgpe-d16_workstation-usb_keyboard hashes
@@ -99,8 +97,7 @@ jobs:
9997
name: kgpe-d16_server
10098
command: |
10199
rm -rf build/kgpe-d16_server/* build/log/* && \
102-
make --load 2 BOARD=kgpe-d16_server || \
103-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
100+
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) \
104101
no_output_timeout: 3h
105102
- run:
106103
name: Ouput kgpe-d16_server hashes
@@ -117,8 +114,7 @@ jobs:
117114
name: kgpe-d16_server-whiptail
118115
command: |
119116
rm -rf build/kgpe-d16_server-whiptail/* build/log/* && /
120-
make --load 2 BOARD=kgpe-d16_server-whiptail || \
121-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
117+
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) \
122118
no_output_timeout: 3h
123119
- run:
124120
name: Ouput kgpe-d16_server-whiptail hashes
@@ -132,28 +128,25 @@ jobs:
132128
path: build/kgpe-d16_server-whiptail
133129

134130
- run:
135-
name: librem_mini-NoTPM
131+
name: librem_mini
136132
command: |
137-
rm -rf build/librem_mini-NoTPM/* build/log/* && /
138-
make --load 2 BOARD=librem_mini-NoTPM || \
139-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
133+
rm -rf build/librem_mini/* build/log/* && make CPUS=4 V=1 BOARD=librem_mini || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
140134
no_output_timeout: 3h
141135
- run:
142-
name: Ouput librem_mini-NoTPM hashes
136+
name: Ouput librem_mini hashes
143137
command: |
144-
cat build/librem_mini-NoTPM/hashes.txt \
138+
cat build/librem_mini/hashes.txt \
145139
- run:
146-
name: Archiving build logs for librem_mini-NoTPM
140+
name: Archiving build logs for librem_mini
147141
command: |
148-
tar zcvf build/librem_mini-NoTPM/logs.tar.gz build/log/*
142+
tar zcvf build/librem_mini/logs.tar.gz build/log/*
149143
- store-artifacts:
150-
path: build/librem_mini-NoTPM
144+
path: build/librem_mini
145+
151146
- run:
152147
name: x230-flash
153148
command: |
154-
rm -rf build/x230-flash/* build/log/* && /
155-
make --load 2 BOARD=x230-flash || \
156-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
149+
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) \
157150
no_output_timeout: 3h
158151
- run:
159152
name: Ouput x230-flash hashes
@@ -169,9 +162,7 @@ jobs:
169162
- run:
170163
name: t430-flash
171164
command: |
172-
rm -rf build/t430-flash/* build/log/* && /
173-
make --load 2 BOARD=t430-flash || \
174-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
165+
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) \
175166
no_output_timeout: 3h
176167
- run:
177168
name: Ouput t430-flash hashes
@@ -187,9 +178,7 @@ jobs:
187178
- run:
188179
name: t430
189180
command: |
190-
rm -rf build/t430/* build/log/* && /
191-
make --load 2 BOARD=t430 || \
192-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
181+
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) \
193182
no_output_timeout: 3h
194183
- run:
195184
name: Ouput t430 hashes
@@ -205,9 +194,7 @@ jobs:
205194
- run:
206195
name: x230
207196
command: |
208-
rm -rf build/x230/* build/log/* && /
209-
make --load 2 BOARD=x230 || \
210-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
197+
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) \
211198
no_output_timeout: 3h
212199
- run:
213200
name: Ouput x230 hashes
@@ -223,9 +210,7 @@ jobs:
223210
- run:
224211
name: x230-hotp-verification
225212
command: |
226-
rm -rf build/x230-hotp-verification/* build/log/* && /
227-
make --load 2 BOARD=x230-hotp-verification || \
228-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
213+
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) \
229214
no_output_timeout: 3h
230215
- run:
231216
name: Ouput x230-hotp-verification hashes
@@ -241,9 +226,7 @@ jobs:
241226
- run:
242227
name: qemu-coreboot
243228
command: |
244-
rm -rf build/qemu-coreboot/* build/log/* && /
245-
make --load 2 BOARD=qemu-coreboot || \
246-
EXIT_CODE=$? && find ./ -type f -name "*.log" -type f -mmin -1 -print0 | xargs -0 stat --format '%Y :%y %n' | sort -nr | cut -d ' ' -f5- | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit $EXIT_CODE \
229+
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) \
247230
no_output_timeout: 3h
248231
- run:
249232
name: Output qemu-coreboot hashes

‎modules/coreboot‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,9 @@ coreboot_target := \
6565
coreboot_output := coreboot.rom
6666
coreboot_depend += linux initrd $(musl_dep)
6767

68-
ifeq "$(CONFIG_COREBOOT_VERSION)" "4.8.1"
69-
COREBOOT_TOOLCHAIN=""
70-
$(COREBOOT_TOOLCHAIN):
71-
else
72-
COREBOOT_TOOLCHAIN="$(build)/$(coreboot_base_dir)/.xcompile"
73-
$(COREBOOT_TOOLCHAIN): $(build)/$(coreboot_base_dir)/.canary
74-
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$(expr $$(getconf PAGESIZE) \* $$(getconf _PHYS_PAGES) / 1024 / 1024 / 1024) crossgcc-i386
75-
endif
76-
77-
$(build)/$(coreboot_dir)/.configured: $(COREBOOT_IASL) $(COREBOOT_TOOLCHAIN)
68+
$(build)/$(coreboot_dir)/.configured: $(COREBOOT_IASL)
7869
$(COREBOOT_IASL): $(build)/$(coreboot_base_dir)/.canary
79-
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$(expr $$(getconf PAGESIZE) \* $$(getconf _PHYS_PAGES) / 1024 / 1024 / 1024) iasl
70+
$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$CPUS iasl
8071

8172
# Force a rebuild if the inputs have changed
8273
$(build)/$(coreboot_dir)/.build: \

0 commit comments

Comments
 (0)