Fix root cert location (again)

This commit is contained in:
Peter Šurda 2022-09-20 19:39:53 +08:00
parent a54d3a5a69
commit 90081ecc3a
Signed by: PeterSurda
GPG Key ID: 3E47497CF67ABB95

View File

@ -82,7 +82,7 @@ function make_ipxe_lkrn() {
curr="$(pwd)" curr="$(pwd)"
cd "${ipxe_src_dir}/src/" || return 1 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" cd "$curr"
return 0 return 0
@ -118,7 +118,7 @@ function make_ipxe_iso() {
curr="$(pwd)" curr="$(pwd)"
cd "${ipxe_src_dir}/src/" || return 1 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" cd "$curr"
return 0 return 0
@ -154,7 +154,7 @@ function make_ipxe_dsk() {
curr="$(pwd)" curr="$(pwd)"
cd "${ipxe_src_dir}/src/" || return 1 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" cd "$curr"
return 0 return 0
@ -190,7 +190,7 @@ function make_ipxe_pxe() {
curr="$(pwd)" curr="$(pwd)"
cd "${ipxe_src_dir}/src/" || return 1 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" cd "$curr"
return 0 return 0
@ -230,7 +230,7 @@ function make_ipxe_efi() {
curr="$(pwd)" curr="$(pwd)"
cd "${ipxe_src_dir}/src/" || return 1 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/ mv bin-x86_64-efi/ipxe.efi bin/
sbsign --key ${efi_key} --cert ${efi_cert} --output bin/ipxe.efi bin/ipxe.efi sbsign --key ${efi_key} --cert ${efi_cert} --output bin/ipxe.efi bin/ipxe.efi