Update ipxe, remove go-bindata use embed instead (#6)

Author: majst01

.gitignore

@@ -5,4 +5,3 @@ pcap/pcap.test
 pixiecore/pixiecore.test
 vendor/
 build/
-bin

Dockerfile

@@ -5,5 +5,5 @@ RUN make
 
 FROM alpine:3.15
 RUN apk -U add ca-certificates
-COPY --from=builder /work/bin/pixie /pixie
+COPY --from=builder /work/build/pixie /pixie
 ENTRYPOINT ["/pixie"]

Makefile

@@ -21,8 +21,8 @@ pixie: test
 								   -X 'github.com/metal-stack/v.Revision=$(GITVERSION)' \
 								   -X 'github.com/metal-stack/v.GitSHA1=$(SHA)' \
 								   -X 'github.com/metal-stack/v.BuildDate=$(BUILDDATE)'" \
-	   -o bin/pixie github.com/metal-stack/pixie/cmd
-	strip bin/pixie
+	   -o build/pixie github.com/metal-stack/pixie/cmd
+	strip build/pixie
 
 .PHONY: test
 test:

cmd/main.go

@@ -21,10 +21,10 @@ import (
 )
 
 func main() {
-	cli.Ipxe[pixiecore.FirmwareX86PC] = ipxe.MustAsset("undionly.kpxe")
-	cli.Ipxe[pixiecore.FirmwareEFI32] = ipxe.MustAsset("ipxe-i386.efi")
-	cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustAsset("ipxe-x86_64.efi")
-	cli.Ipxe[pixiecore.FirmwareEFIBC] = ipxe.MustAsset("ipxe-x86_64.efi")
-	cli.Ipxe[pixiecore.FirmwareX86Ipxe] = ipxe.MustAsset("ipxe.pxe")
+	cli.Ipxe[pixiecore.FirmwareX86PC] = ipxe.MustGet("undionly.kpxe")
+	cli.Ipxe[pixiecore.FirmwareEFI32] = ipxe.MustGet("ipxe-i386.efi")
+	cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustGet("ipxe-x86_64.efi")
+	cli.Ipxe[pixiecore.FirmwareEFIBC] = ipxe.MustGet("ipxe-x86_64.efi")
+	cli.Ipxe[pixiecore.FirmwareX86Ipxe] = ipxe.MustGet("ipxe.pxe")
 	cli.CLI()
 }

pixiecore/boot.ipxe

@@ -44,7 +44,7 @@ goto loop
 :boot
 chain ${filename}
 
-# Failure at this point probably means Pixiecore changed its mind
+# Failure at this point probably means Pixie changed its mind
 # about whether this machine should be booted in the middle of the
 # boot cycle, so we had already handed off to iPXE, but now we're
 # no longer serving a boot script for it.
@@ -59,8 +59,8 @@ chain ${filename}
 :fail
 echo Failed to get a ProxyDHCP response after ${attempts} attempts
 echo
-echo If you are sure that Pixiecore is still trying to boot this machine,
-echo please file a bug at https://github.com/google/netboot .
+echo If you are sure that Pixie is still trying to boot this machine,
+echo please file a bug at https://github.com/metal-stack/pixie .
 echo
 echo Rebooting in 5 seconds...
 sleep 5

third_party/Makefile

@@ -1,8 +1,9 @@
-.PHONY: ipxe
+# Not requires liblzma-dev package installed
 
+.PHONY: ipxe
 ipxe:
 	rm -rf ipxe
-	git clone https://git.ipxe.org/ipxe.git
+	git clone https://github.com/ipxe/ipxe.git
 	(cd ipxe && git rev-parse HEAD >COMMIT-ID)
 	rm -rf ipxe/.git
 	(cd ipxe/src &&\
@@ -12,6 +13,4 @@ ipxe:
 	mv -f ipxe/src/bin/undionly.kpxe ipxe/bin/undionly.kpxe
 	mv -f ipxe/src/bin-x86_64-efi/ipxe.efi ipxe/bin/ipxe-x86_64.efi
 	mv -f ipxe/src/bin-i386-efi/ipxe.efi ipxe/bin/ipxe-i386.efi
-	go-bindata -o ipxe/ipxe-bin.go -pkg ipxe -nometadata -nomemcopy -prefix ipxe/bin/ ipxe/bin
-	rm -rf ipxe/bin
 	(cd ipxe/src && make clean)

third_party/ipxe/.github/workflows/build.yml

@@ -0,0 +1,71 @@
+name: Build
+
+on: push
+
+jobs:
+
+  x86:
+    name: x86
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install packages
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          sudo apt install -y -o Acquire::Retries=50 \
+                           mtools syslinux isolinux \
+                           libc6-dev-i386 libc6-dbg:i386 valgrind
+      - name: Build (BIOS)
+        run: |
+          make -j 4 -C src
+      - name: Build (Everything)
+        run: |
+          make -j 4 -C src everything
+      - name: Test
+        run: |
+          valgrind ./src/bin-i386-linux/tests.linux
+          valgrind ./src/bin-x86_64-linux/tests.linux
+
+  arm32:
+    name: ARM32
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install packages
+        run: |
+          sudo apt update
+          sudo apt install -y -o Acquire::Retries=50 \
+                           mtools syslinux isolinux gcc-arm-none-eabi
+      - name: Build
+        run: |
+          make -j 4 -C src CROSS=arm-none-eabi- \
+               bin-arm32-efi/intel.efi \
+               bin-arm32-efi/intel.usb \
+               bin-arm32-efi/intel.iso
+
+  arm64:
+    name: ARM64
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install packages
+        run: |
+          sudo apt update
+          sudo apt install -y -o Acquire::Retries=50 \
+                           mtools syslinux isolinux gcc-aarch64-linux-gnu
+      - name: Build
+        run: |
+          make -j 4 -C src CROSS=aarch64-linux-gnu- \
+               bin-arm64-efi/ipxe.efi \
+               bin-arm64-efi/ipxe.usb \
+               bin-arm64-efi/ipxe.iso

third_party/ipxe/.github/workflows/coverity.yml

@@ -0,0 +1,37 @@
+name: Coverity Scan
+
+on:
+  push:
+    branches:
+      - coverity_scan
+
+jobs:
+  submit:
+    name: Submit
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Download Coverity Scan
+        run: |
+          curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
+               --form project=${{ github.repository }} \
+               --output coverity.tar.gz \
+               https://scan.coverity.com/download/cxx/linux64
+          mkdir -p /opt/coverity
+          sudo tar xvzf coverity.tar.gz --strip 1 --directory /opt/coverity
+      - name: Build via Coverity Scan
+        run: |
+          make -C src bin/deps
+          /opt/coverity/bin/cov-build --dir cov-int make -C src bin/blib.a
+      - name: Create submission
+        run : |
+          tar cvzf cov-int.tar.gz cov-int
+      - name: Submit to Coverity Scan
+        run: |
+          curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
+               --form email=${{ secrets.COVERITY_SCAN_EMAIL }} \
+               --form [email protected] \
+               --form version=${{ github.sha }} \
+               --form description=${{ github.ref }} \
+               https://scan.coverity.com/builds?project=${{ github.repository }}

third_party/ipxe/.travis.yml

@@ -1 +1 @@
-133f4c47baef6002b2ccb4904a035cda2303c6e5
+70995397e5bdfd3431e12971aa40630c7014785f