From 90081ecc3a94bdc515a1b5bb3a38e65c592bc332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0urda?= Date: Tue, 20 Sep 2022 19:39:53 +0800 Subject: [PATCH] Fix root cert location (again) --- buildbot/buildbot_steps.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildbot/buildbot_steps.sh b/buildbot/buildbot_steps.sh index 93b1769..a415355 100755 --- a/buildbot/buildbot_steps.sh +++ b/buildbot/buildbot_steps.sh @@ -82,7 +82,7 @@ function make_ipxe_lkrn() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - make bin/ipxe.lkrn EMBED="${embed_file}" CERT="../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../ipxe_root_ca.crt,${ca_cert}" || return 2 + make bin/ipxe.lkrn EMBED="${embed_file}" CERT="../../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../../ipxe_root_ca.crt,${ca_cert}" || return 2 cd "$curr" return 0 @@ -118,7 +118,7 @@ function make_ipxe_iso() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - make bin/ipxe.iso EMBED="${embed_file}" CERT="../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../ipxe_root_ca.crt,${ca_cert}" || return 2 + make bin/ipxe.iso EMBED="${embed_file}" CERT="../../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../../ipxe_root_ca.crt,${ca_cert}" || return 2 cd "$curr" return 0 @@ -154,7 +154,7 @@ function make_ipxe_dsk() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - make bin/ipxe.usb EMBED="${embed_file}" CERT="../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../ipxe_root_ca.crt,${ca_cert}" || return 2 + make bin/ipxe.usb EMBED="${embed_file}" CERT="../../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../../ipxe_root_ca.crt,${ca_cert}" || return 2 cd "$curr" return 0 @@ -190,7 +190,7 @@ function make_ipxe_pxe() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - make bin/ipxe.pxe EMBED="${embed_file}" CERT="../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../ipxe_root_ca.crt,${ca_cert}" || return 2 + make bin/ipxe.pxe EMBED="${embed_file}" CERT="../../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../../ipxe_root_ca.crt,${ca_cert}" || return 2 cd "$curr" return 0 @@ -230,7 +230,7 @@ function make_ipxe_efi() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - make bin-x86_64-efi/ipxe.efi EMBED="${embed_file}" CERT="../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../ipxe_root_ca.crt,${ca_cert}" || return 2 + make bin-x86_64-efi/ipxe.efi EMBED="${embed_file}" CERT="../../ipxe_root_ca.crt,${signing_cert},${ca_cert}" TRUST="../../ipxe_root_ca.crt,${ca_cert}" || return 2 mv bin-x86_64-efi/ipxe.efi bin/ sbsign --key ${efi_key} --cert ${efi_cert} --output bin/ipxe.efi bin/ipxe.efi