Skip to content

Commit

Permalink
Update to latest iPXE (#142)
Browse files Browse the repository at this point in the history
## Description
Update to the latest iPXE

This release includes ipxe/ipxe#1152 which resolves #117.

I've also included the workaround for #115 as specified from ipxe/ipxe#1091 (comment) to keep Mellanox cards working.

## Why is this needed

Fixes: #117
Relates to: #115

## How Has This Been Tested?

I am drafting this PR as the first step towards testing. The plan is:
- [x] Test on an affected Mellanox card
- [x] Confirm that LetsEncrypt is working
  • Loading branch information
mergify[bot] authored Mar 1, 2024
2 parents 32b7c85 + 62314e0 commit 3cd7f25
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 96 deletions.
3 changes: 0 additions & 3 deletions binary/script/build_and_pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ set -uxo pipefail
tracked_files=(
"./script/build_ipxe.sh"
"./script/build_and_pr.sh"
"./script/ipxe-customizations/ca.pem"
"./script/ipxe-customizations/isrgrootx1.pem"
"./script/ipxe-customizations/lets-encrypt-r3.pem"
"./script/ipxe-customizations/console.h"
"./script/ipxe-customizations/isa.h"
"./script/ipxe-customizations/colour.h"
Expand Down
10 changes: 2 additions & 8 deletions binary/script/build_ipxe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

set -eux

#XXX Workaround for https://github.com/ipxe/ipxe/issues/606
CERT=ca.pem,isrgrootx1.pem,lets-encrypt-r3.pem
TRUST=ca.pem,isrgrootx1.pem,lets-encrypt-r3.pem

# build_ipxe will run the make target in the upstream ipxe source
# that will build an ipxe binary.
function build_ipxe() {
Expand All @@ -17,9 +13,9 @@ function build_ipxe() {
local embed_path="$4"

if [ -z "${env_opts}" ]; then
make -C "${ipxe_dir}"/src EMBED="${embed_path}" CERT="${CERT}" TRUST="${TRUST}" "${ipxe_bin}"
make -C "${ipxe_dir}"/src EMBED="${embed_path}" "${ipxe_bin}"
else
make -C "${ipxe_dir}"/src "${env_opts}" EMBED="${embed_path}" CERT="${CERT}" TRUST="${TRUST}" "${ipxe_bin}"
make -C "${ipxe_dir}"/src "${env_opts}" EMBED="${embed_path}" "${ipxe_bin}"
fi
}

Expand Down Expand Up @@ -47,8 +43,6 @@ function copy_common_files() {
cp -a binary/script/ipxe-customizations/common.h "${ipxe_dir}"/src/config/local/
cp -a binary/script/ipxe-customizations/console.h "${ipxe_dir}"/src/config/local/
cp -a binary/script/ipxe-customizations/crypto.h "${ipxe_dir}"/src/config/local/
#XXX Workaround for https://github.com/ipxe/ipxe/issues/606
cp -a binary/script/ipxe-customizations/{ca.pem,isrgrootx1.pem,lets-encrypt-r3.pem} "${ipxe_dir}"/src
}

# copy_custom_files will copy in any custom header files based on a requested ipxe binary.
Expand Down
23 changes: 0 additions & 23 deletions binary/script/ipxe-customizations/ca.pem

This file was deleted.

5 changes: 5 additions & 0 deletions binary/script/ipxe-customizations/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,9 @@
#undef USB_HCD_XHCI /* xHCI USB host controller */
#undef USB_KEYBOARD /* USB keyboards */

//Workaround for Mellanox issue
// https://github.com/tinkerbell/ipxedust/issues/115
// https://github.com/ipxe/ipxe/issues/1091#issuecomment-1946152615
#undef NET_PROTO_EAPOL

#define MAX_MODULES 17
31 changes: 0 additions & 31 deletions binary/script/ipxe-customizations/isrgrootx1.pem

This file was deleted.

30 changes: 0 additions & 30 deletions binary/script/ipxe-customizations/lets-encrypt-r3.pem

This file was deleted.

2 changes: 1 addition & 1 deletion binary/script/ipxe.commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fbc3b4a104698658202c2a83217ca8722453bf49
182ee909313fc60875d3f1741cd4a0bb7dfd15e1

0 comments on commit 3cd7f25

Please sign in to comment.