Skip to content

Commit d0a8fa3

Browse files
tlauriontlaurion
committed
Retry CircleCI for 4.11 on Debian 11 docker
- Add kgpe-d16 patch to remove HID for PCI devices (successful build on top of linuxboot#1101 and linuxboot#1012 per https://app.circleci.com/pipelines/github/tlaurion/heads/937/workflows/de49bea0-3f58-4a91-8891-87622f5a0eed) - CircleCI modified to build for coreboot 4.11 kgpe-d16_workstation on top of 4.15 passed workspace - CircleCI modified so that we still archive all the logs in artifacts for the current build even if failing. We now exit 1 after having archived all the log files under build/ - Add xx30 vbios extract scripts to test. Expecting musl-cross target to fail since make and gawk aren't built
1 parent 48f4709 commit d0a8fa3

4 files changed

Lines changed: 71 additions & 46 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,39 @@ commands:
1111
- run:
1212
name: Install dependencies
1313
command: |
14+
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
1415
apt update
1516
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 python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo
1617
- run:
1718
name: Make Board
1819
command: |
1920
rm -rf build/<<parameters.target>>/* build/log/* && make V=1 BOARD=<<parameters.target>> <<parameters.subcommand>> || touch ./tmpDir/failed_build
2021
no_output_timeout: 3h
21-
- run:
22-
name: Output build failing logs
23-
command: |
24-
if [[ -f ./tmpDir/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 \
2522
- run:
2623
name: Output hashes
2724
command: |
2825
cat build/<<parameters.target>>/hashes.txt || echo "No hashes for this build step..."\
2926
- run:
3027
name: Archiving build logs.
3128
command: |
32-
tar zcvf build/<<parameters.target>>/logs.tar.gz build/log/*
29+
tar zcvf build/<<parameters.target>>/logs.tar.gz $(find build/ -name "*.log")
30+
- run:
31+
name: Output build failing logs
32+
command: |
33+
if [[ -f ./tmpDir/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 "Step hasn't failed. Continuing with next step..."; fi \
3334
- store_artifacts:
3435
path: build/<<parameters.target>>
3536

3637
jobs:
3738
prep_env:
3839
docker:
39-
- image: debian:10
40+
- image: debian:11
4041
resource_class: large
4142
steps:
4243
- run:
4344
name: Install dependencies
4445
command: |
46+
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
4547
apt update
4648
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 python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo
4749
- checkout
@@ -110,7 +112,7 @@ jobs:
110112

111113
build_and_persist:
112114
docker:
113-
- image: debian:10
115+
- image: debian:11
114116
resource_class: large
115117
parameters:
116118
target:
@@ -130,7 +132,8 @@ jobs:
130132

131133
build:
132134
docker:
133-
- image: debian:10
135+
- image: debian:11
136+
resource_class: large
134137
parameters:
135138
target:
136139
type: string
@@ -145,7 +148,8 @@ jobs:
145148

146149
save_cache:
147150
docker:
148-
- image: debian:10
151+
- image: debian:11
152+
resource_class: large
149153
steps:
150154
- attach_workspace:
151155
at: ~/
@@ -211,16 +215,18 @@ workflows:
211215
- x230-hotp-maximized
212216

213217
# Coreboot 4.11
214-
#- build_and_persist:
215-
# name: librem_l1um
216-
# target: librem_l1um
217-
# subcommand: ""
218-
# requires:
219-
# - x230-hotp-maximized
218+
- build_and_persist:
219+
name: kgpe-d16_workstation
220+
target: kgpe-d16_workstation
221+
subcommand: ""
222+
requires:
223+
- librem_14
220224

225+
#Cache one workspace per Coreboot version, ideally the boards including the highest number of modules, since not rebuilt across builds.
226+
#Below, 4.11, 4.13, 4.15
221227
- save_cache:
222228
requires:
223-
- librem_14
229+
- kgpe-d16_workstation
224230

225231
#
226232
#
@@ -452,34 +458,33 @@ workflows:
452458
requires:
453459
- librem_14
454460

455-
#KGPE-D16 turned off because CircleCI built time needs to be optimized. Kernel doesn't seem to enforce MAKE_JOBS properly
456-
#- build:
457-
# name: kgpe-d16_workstation-usb_keyboard
458-
# target: kgpe-d16_workstation-usb_keyboard
459-
# subcommand: ""
460-
# requires:
461-
# - librem_l1um
462-
463-
#- build:
464-
# name: kgpe-d16_server
465-
# target: kgpe-d16_server
466-
# subcommand: ""
467-
# requires:
468-
# - librem_l1um
469-
470-
#- build:
471-
# name: kgpe-d16_server-whiptail
472-
# target: kgpe-d16_server-whiptail
473-
# subcommand: ""
474-
# requires:
475-
# - librem_l1um
476-
477-
#- build:
478-
# name: kgpe-d16_workstation
479-
# target: kgpe-d16_workstation
480-
# subcommand: ""
481-
# requires:
482-
# - librem_l1um
461+
- build:
462+
name: kgpe-d16_workstation-usb_keyboard
463+
target: kgpe-d16_workstation-usb_keyboard
464+
subcommand: ""
465+
requires:
466+
- kgpe-d16_workstation
467+
468+
- build:
469+
name: kgpe-d16_server
470+
target: kgpe-d16_server
471+
subcommand: ""
472+
requires:
473+
- kgpe-d16_workstation
474+
475+
- build:
476+
name: kgpe-d16_server-whiptail
477+
target: kgpe-d16_server-whiptail
478+
subcommand: ""
479+
requires:
480+
- kgpe-d16_workstation
481+
482+
- build:
483+
name: librem_l1um
484+
target: librem_l1um
485+
subcommand: ""
486+
requires:
487+
- kgpe-d16_workstation
483488

484489
########################
485490
########################

‎blobs/xx30/vbios_t530.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ extractdir=$(mktemp -d)
1717
cd "$extractdir"
1818

1919
echo "### Installing basic dependencies"
20-
sudo apt update && sudo apt install -y wget ruby ruby-dev ruby-bundler p7zip-full upx-ucl
20+
sudo apt update && sudo apt install -y wget ruby ruby-dev bundler ruby-bundler p7zip-full upx-ucl
21+
sudo gem install bundler:1.17.3
2122

2223
echo "### Downloading rom-parser dependency"
2324
wget https://github.com/awilliam/rom-parser/archive/"$ROMPARSER".zip

‎blobs/xx30/vbios_w530.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ extractdir=$(mktemp -d)
1818
cd "$extractdir"
1919

2020
echo "### Installing basic dependencies"
21-
sudo apt update && sudo apt install -y wget ruby ruby-dev ruby-bundler p7zip-full upx-ucl
21+
sudo apt update && sudo apt install -y wget ruby ruby-dev bundler ruby-bundler p7zip-full upx-ucl
22+
sudo gem install bundler:1.17.3
2223

2324
echo "### Downloading rom-parser dependency"
2425
wget https://github.com/awilliam/rom-parser/archive/"$ROMPARSER".zip

‎patches/coreboot-4.11/0022-kgpe-d16_dstd-asl_Remove-HID-for-PCI-devices.patch‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--- ./src/mainboard/asus/kgpe-d16/dsdt.asl.orig 2021-10-15 16:17:56.496000000 -0400
2+
+++ ./src/mainboard/asus/kgpe-d16/dsdt.asl 2021-10-15 16:27:27.393000000 -0400
3+
@@ -126,7 +126,6 @@
4+
{
5+
/* BUS0 root bus */
6+
7+
- Name (_HID, EisaId ("PNP0A08")) /* PCI-e root bus (SR5690) */
8+
Name (_CID, EisaId ("PNP0A03")) /* PCI root bus (SP5100) */
9+
Name (_ADR, 0x00180001)
10+
Name (_UID, 0x00)
11+
@@ -483,7 +482,6 @@
12+
13+
/* 0:14.3 SP5100 LPC */
14+
Device (LPC) {
15+
- Name (_HID, EisaId ("PNP0A05"))
16+
Name (_ADR, 0x00140003)
17+
18+
/* Real Time Clock Device */

0 commit comments

Comments
 (0)