Skip to content

Commit 0782f77

Browse files
tlauriontlaurion
committed
Fix merge conflicts and make sure all boards are inside of CircleCI builds. PoC build for #867 
1 parent 32b87aa commit 0782f77

2 files changed

Lines changed: 73 additions & 15 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Install dependencies
99
command: |
1010
apt update
11-
apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev
11+
apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool
1212
- checkout
1313

1414
- run:
@@ -24,7 +24,7 @@ jobs:
2424
- run:
2525
name: Creating musl-cross-make and musl-cross-make patches digest
2626
command: |
27-
find ./patches/musl-cross-* modules/musl-cross* -type f | sort -h | xargs sha256sum > /tmp/musl-cross_module_and_patches.sha256sums \
27+
find modules/musl-cross* -type f | sort -h | xargs sha256sum > /tmp/musl-cross_module_and_patches.sha256sums \
2828
2929
3030
- restore_cache:
@@ -63,7 +63,8 @@ jobs:
6363
name: kgpe-d16_workstation
6464
command: |
6565
rm -rf build/kgpe-d16_workstation/* build/log/* && \
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) \
66+
make CPUS=4 V=1 BOARD=kgpe-d16_workstation || \
67+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
6768
no_output_timeout: 3h
6869
- run:
6970
name: Ouput kgpe-d16_workstation hashes
@@ -80,7 +81,8 @@ jobs:
8081
name: kgpe-d16_workstation-usb_keyboard
8182
command: |
8283
rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && \
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) \
84+
make CPUS=4 V=1 BOARD=kgpe-d16_workstation-usb_keyboard || \
85+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
8486
no_output_timeout: 3h
8587
- run:
8688
name: Ouput kgpe-d16_workstation-usb_keyboard hashes
@@ -97,7 +99,8 @@ jobs:
9799
name: kgpe-d16_server
98100
command: |
99101
rm -rf build/kgpe-d16_server/* build/log/* && \
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) \
102+
make CPUS=4 V=1 BOARD=kgpe-d16_server || \
103+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
101104
no_output_timeout: 3h
102105
- run:
103106
name: Ouput kgpe-d16_server hashes
@@ -113,8 +116,9 @@ jobs:
113116
- run:
114117
name: kgpe-d16_server-whiptail
115118
command: |
116-
rm -rf build/kgpe-d16_server-whiptail/* build/log/* && /
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) \
119+
rm -rf build/kgpe-d16_server-whiptail/* build/log/* && \
120+
make CPUS=4 V=1 BOARD=kgpe-d16_server-whiptail || \
121+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
118122
no_output_timeout: 3h
119123
- run:
120124
name: Ouput kgpe-d16_server-whiptail hashes
@@ -126,11 +130,30 @@ jobs:
126130
tar zcvf build/kgpe-d16_server-whiptail/logs.tar.gz build/log/*
127131
- store-artifacts:
128132
path: build/kgpe-d16_server-whiptail
133+
- run:
134+
name: librem_l1um
135+
command: |
136+
rm -rf build/kgpe-d16_server-whiptail/* build/log/* && \
137+
make CPUS=4 V=1 BOARD=librem_l1um || \
138+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
139+
no_output_timeout: 3h
140+
- run:
141+
name: Ouput librem_l1um hashes
142+
command: |
143+
cat build/librem_l1um/hashes.txt \
144+
- run:
145+
name: Archiving build logs for librem_l1um
146+
command: |
147+
tar zcvf build/librem_l1um/logs.tar.gz build/log/*
148+
- store-artifacts:
149+
path: build/librem_l1um
129150

130151
- run:
131152
name: librem_mini
132153
command: |
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) \
154+
rm -rf build/librem_mini/* build/log/* && \
155+
make CPUS=4 V=1 BOARD=librem_mini || \
156+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
134157
no_output_timeout: 3h
135158
- run:
136159
name: Ouput librem_mini hashes
@@ -146,7 +169,9 @@ jobs:
146169
- run:
147170
name: x230-flash
148171
command: |
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) \
172+
rm -rf build/x230-flash/* build/log/* && \
173+
make CPUS=4 V=1 BOARD=x230-flash || \
174+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
150175
no_output_timeout: 3h
151176
- run:
152177
name: Ouput x230-flash hashes
@@ -162,7 +187,9 @@ jobs:
162187
- run:
163188
name: t430-flash
164189
command: |
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) \
190+
rm -rf build/t430-flash/* build/log/* && \
191+
make CPUS=4 V=1 BOARD=t430-flash || \
192+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
166193
no_output_timeout: 3h
167194
- run:
168195
name: Ouput t430-flash hashes
@@ -178,7 +205,9 @@ jobs:
178205
- run:
179206
name: t430
180207
command: |
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) \
208+
rm -rf build/t430/* build/log/* && \
209+
make CPUS=4 V=1 BOARD=t430 || \
210+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
182211
no_output_timeout: 3h
183212
- run:
184213
name: Ouput t430 hashes
@@ -194,7 +223,9 @@ jobs:
194223
- run:
195224
name: x230
196225
command: |
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) \
226+
rm -rf build/x230/* build/log/* && \
227+
make CPUS=4 V=1 BOARD=x230 || \
228+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
198229
no_output_timeout: 3h
199230
- run:
200231
name: Ouput x230 hashes
@@ -210,7 +241,9 @@ jobs:
210241
- run:
211242
name: x230-hotp-verification
212243
command: |
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) \
244+
rm -rf build/x230-hotp-verification/* build/log/* && \
245+
make CPUS=4 V=1 BOARD=x230-hotp-verification || \
246+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
214247
no_output_timeout: 3h
215248
- run:
216249
name: Ouput x230-hotp-verification hashes
@@ -223,10 +256,30 @@ jobs:
223256
- store-artifacts:
224257
path: build/x230-hotp-verification
225258

259+
- run:
260+
name: x230-nkstorecli
261+
command: |
262+
rm -rf build/x230-nkstorecli/* build/log/* && \
263+
make CPUS=4 V=1 BOARD=x230-nkstorecli || \
264+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
265+
no_output_timeout: 3h
266+
- run:
267+
name: Ouput x230-nkstorecli hashes
268+
command: |
269+
cat build/x230-nkstorecli/hashes.txt \
270+
- run:
271+
name: Archiving build logs for x230-nkstorecli
272+
command: |
273+
tar zcvf build/x230-nkstorecli/logs.tar.gz build/log/*
274+
- store-artifacts:
275+
path: build/x230-nkstorecli
276+
226277
- run:
227278
name: qemu-coreboot
228279
command: |
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) \
280+
rm -rf build/qemu-coreboot/* build/log/* && \
281+
make CPUS=4 V=1 BOARD=qemu-coreboot || \
282+
(find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
230283
no_output_timeout: 3h
231284
- run:
232285
name: Output qemu-coreboot hashes

‎modules/coreboot‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ else ifeq "$(CONFIG_COREBOOT_VERSION)" "4.11"
88
coreboot_version := 4.11
99
coreboot_hash := 97fd859b4c39a25534fe33c30eb86e54a233952e08a024c55858d11598a8ad87
1010
coreboot-blobs_hash := aa7855c5bd385b3360dadc043ea6bc93f564e6e4840d9b3ee5b9e696bbd055db
11+
coreboot_depends := $(if $(CONFIG_PURISM_BLOBS), purism-blobs)
1112
else ifeq "$(CONFIG_COREBOOT_VERSION)" "4.12"
1213
coreboot_version := 4.12
1314
coreboot_hash := edcad000ee9b73183c396ea76155629b3d27c693e0f1ae83e3424c4d936e2be2
@@ -36,6 +37,8 @@ EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches -Wno-err
3637
coreboot_configure := \
3738
mkdir -p "$(build)/$(coreboot_dir)" \
3839
&& cp "$(pwd)/$(CONFIG_COREBOOT_CONFIG)" "$(build)/$(coreboot_dir)/.config" \
40+
&& echo 'CONFIG_LOCALVERSION="Heads-$(HEADS_GIT_VERSION)"' >> $(build)/$(coreboot_dir)/.config \
41+
&& echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(BOARD)"' >> $(build)/$(coreboot_dir)/.config \
3942
&& $(MAKE) olddefconfig \
4043
-C "$(build)/$(coreboot_base_dir)" \
4144
obj="$(build)/$(coreboot_dir)" \
@@ -75,10 +78,12 @@ $(build)/$(coreboot_dir)/.build: \
7578
$(build)/$(BOARD)/initrd.cpio.xz \
7679

7780
# This produces a ROM image that is written with the flashrom program
78-
$(build)/$(BOARD)/coreboot.rom: $(build)/$(coreboot_dir)/.build
81+
ifneq ($(CONFIG_COREBOOT),)
82+
$(build)/$(BOARD)/$(CB_OUTPUT_FILE): $(build)/$(coreboot_dir)/.build
7983
"$(build)/$(coreboot_dir)/cbfstool" "$(dir $<)coreboot.rom" print
8084
$(call do-copy,$(dir $<)coreboot.rom,$@)
8185
@touch $@ # update the time stamp
86+
endif
8287

8388
#
8489
# Helpful target for reconfiguring the coreboot target

0 commit comments

Comments
 (0)