Skip to content

Commit 8884abc

Browse files
committed
Merge remote-tracking branch 'osresearch/master' into add_kconfig_to_use_blobs_on_2412_boards_coreboot_configs
2 parents 4035abb + 594abed commit 8884abc

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- run:
7373
name: Creating musl-cross-make and musl-cross-make patches digest (musl-cross-make cache digest)
7474
command: |
75-
find .circleci/config.yml ./Makefile ./flake.lock modules/musl-cross-make* -type f | sort -h | xargs sha256sum > ./tmpDir/musl-cross-make.sha256sums
75+
find ./flake.lock modules/musl-cross-make* -type f | sort -h | xargs sha256sum > ./tmpDir/musl-cross-make.sha256sums
7676
- restore_cache:
7777
# First matched/found key wins and following keys are not tried
7878
keys:
@@ -182,8 +182,8 @@ jobs:
182182
# CircleCI removed their wildcard support, so we have to list precise versions to cache in directory names
183183
key: nix-docker-heads-musl-cross-make-{{ checksum "./tmpDir/musl-cross-make.sha256sums" }}{{ .Environment.CACHE_VERSION }}
184184
paths:
185-
- build/ppc64/musl-cross-make-38e52db8358c043ae82b346a2e6e66bc86a53bc1
186-
- build/x86/musl-cross-make-38e52db8358c043ae82b346a2e6e66bc86a53bc1
185+
- build/ppc64/musl-cross-make-fd6be58297ee21fcba89216ccd0d4aca1e3f1c5c
186+
- build/x86/musl-cross-make-fd6be58297ee21fcba89216ccd0d4aca1e3f1c5c
187187
- crossgcc
188188
- packages
189189
- save_cache:
@@ -192,13 +192,13 @@ jobs:
192192
key: nix-docker-heads-coreboot-musl-cross-make-{{ checksum "./tmpDir/coreboot_musl-cross-make.sha256sums" }}{{ .Environment.CACHE_VERSION }}
193193
paths:
194194
- build/ppc64/coreboot-talos_2
195-
- build/ppc64/musl-cross-make-38e52db8358c043ae82b346a2e6e66bc86a53bc1
195+
- build/ppc64/musl-cross-make-fd6be58297ee21fcba89216ccd0d4aca1e3f1c5c
196196
- build/x86/coreboot-4.11
197197
- build/x86/coreboot-24.02.01
198198
- build/x86/coreboot-24.12
199199
- build/x86/coreboot-dasharo
200200
- build/x86/coreboot-purism
201-
- build/x86/musl-cross-make-38e52db8358c043ae82b346a2e6e66bc86a53bc1
201+
- build/x86/musl-cross-make-fd6be58297ee21fcba89216ccd0d4aca1e3f1c5c
202202
- crossgcc
203203
- packages
204204
- save_cache:

blobs/xx80/download_clean_deguard_me_pad_tb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function deguard() {
9090

9191
# Download the deguard tool into a temporary directory and apply the patch to the cleaned ME blob.
9292
pushd "$(mktemp -d)" || exit
93-
git clone https://review.coreboot.org/deguard.git
93+
git clone https://github.com/coreboot/deguard
9494
pushd deguard || exit
9595
git checkout 0ed3e4ff824fc42f71ee22907d0594ded38ba7b2
9696

@@ -196,4 +196,4 @@ if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
196196

197197
chk_sha256sum "$DEGUARDED_ME_BIN_HASH" "$me_deguarded"
198198
chk_sha256sum "$TB_BIN_HASH" "$tb_flashable"
199-
fi
199+
fi

modules/coreboot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ $(eval $(call coreboot_module,dasharo,24.02.01))
104104
# Therefore, patches/coreboot-2412 includes libreboot patches applied to 24.12 release
105105
# patches/coreboot-2412 also includes PR0 patchset, minus xeon support which don't apply to 24.12 as per https://review.coreboot.org/c/coreboot/+/85278
106106
# TODO: @miczyg1 rebase of patchset so that doenstream don't have to maintain, adapt work
107-
coreboot-24.12_repo := https://review.coreboot.org/coreboot.git
107+
coreboot-24.12_repo := https://github.com/coreboot/coreboot
108108
coreboot-24.12_commit_hash := 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a
109109
#Don't reuse any coreboot buildstack for now since nothing else is based on 24.12
110110
$(eval $(call coreboot_module,24.12,))

0 commit comments

Comments
 (0)