From 7740a6847fb7306dc348304927cbf5fc6e3af32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20BURGHARD?= <eric.burghard@itsufficient.me>
Date: Sat, 4 Mar 2023 15:22:38 +0100
Subject: [PATCH] chore(version): 1.21.1
---
main/matchbox-ipxe/APKBUILD | 44 +++++++++++++++------------
main/matchbox-ipxe/DST_Root_CA_X3.pem | 20 ------------
main/matchbox-ipxe/boot.ipxe | 2 +-
main/matchbox-ipxe/gcc-10.patch | 40 ------------------------
main/matchbox-ipxe/gcc-11.patch | 23 --------------
5 files changed, 25 insertions(+), 104 deletions(-)
delete mode 100644 main/matchbox-ipxe/DST_Root_CA_X3.pem
delete mode 100644 main/matchbox-ipxe/gcc-10.patch
delete mode 100644 main/matchbox-ipxe/gcc-11.patch
diff --git a/main/matchbox-ipxe/APKBUILD b/main/matchbox-ipxe/APKBUILD
index 7382dc4..825b592 100644
--- a/main/matchbox-ipxe/APKBUILD
+++ b/main/matchbox-ipxe/APKBUILD
@@ -1,24 +1,23 @@
-# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
-# Maintainer: Eric BURGHARD <eric.burghard@solarsis.co.ao>
+# Maintainer: Eric BURGHARD <eric@itsufficient.me>
pkgname=matchbox-ipxe
-pkgver=1.20.1
+pkgver=1.21.1
+_pkgver=master
pkgrel=1
pkgdesc="iPXE build for matchbox netboot"
url="https://github.com/ipxe"
arch="x86_64"
license="GPL-2.0-or-later"
-makedepends="xz-dev perl coreutils bash syslinux xorriso"
+makedepends="xz-dev perl coreutils bash syslinux xorriso jq curl"
options="!strip !check !archcheck !tracedeps" # no tests
install=""
subpackages=""
-source="ipxe-$pkgver.tar.gz::https://github.com/ipxe/ipxe/archive/v$pkgver.tar.gz
- gcc-10.patch
- gcc-11.patch
- DST_Root_CA_X3.pem
+source="ipxe-$pkgver.tar.gz::https://github.com/ipxe/ipxe/archive/refs/heads/$_pkgver.tar.gz
+ ISRG_Root_X1.pem::https://crt.sh/?d=9314791
+ ISRG_Root_X2.pem::https://crt.sh/?d=3334561878
+
alpine-netboot-ca.crt
- boot.ipxe
- "
-builddir="$srcdir/ipxe-$pkgver/src"
+ boot.ipxe"
+builddir="$srcdir/ipxe-$_pkgver/src"
# default build targets for x86 systems
_targets="bin/ipxe.iso bin/ipxe.lkrn bin/ipxe.pxe bin/undionly.kpxe bin/ipxe.usb bin/ipxe.dsk"
@@ -27,7 +26,7 @@ case $CARCH in
x86)
_targets="$_targets bin-i386-efi/ipxe.efi";;
x86_64)
- _targets="$_targets bin-x86_64-efi/ipxe.efi";;
+ _targets="$_targets bin-x86_64-efi/ipxe.efi bin-x86_64-efi/snponly.efi";;
aarch64)
_targets="bin-arm64-efi/snp.efi"
makedepends="xz-dev perl coreutils bash";;
@@ -51,18 +50,24 @@ prepare() {
done
# need to disable OCSP else letsencrypt will fail.
sed -i '/OCSP_CHECK/d' config/crypto.h
+ # no git tree
+ sed -i "s/VERSION_MAJOR\s*=.*/VERSION_MAJOR = $(echo -n $pkgver | cut -f1 -d.)/" Makefile
+ sed -i "s/VERSION_MINOR\s*=.*/VERSION_MINOR = $(echo -n $pkgver | cut -f2 -d.)/" Makefile
+ sed -i "s/VERSION_PATCH\s*=.*/VERSION_PATCH = $(echo -n $pkgver | cut -f3 -d.)/" Makefile
+ sed -i "s/EXTRAVERSION\s*=.*/EXTRAVERSION = +$(curl -s https://api.github.com/repos/ipxe/ipxe/commits/$_pkgver | jq -r '.sha|capture("(?<sha>.{6})").sha')/" Makefile
}
build() {
cd "$builddir"
- make EMBED="$srcdir/boot.ipxe" \
- CERT="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/DST_Root_CA_X3.pem \
- TRUST="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/DST_Root_CA_X3.pem \
+ make -j "$(nproc)" DEBUG=x509 EMBED="$srcdir/boot.ipxe" \
+ CERT="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/ISRG_Root_X1.pem,"$srcdir"/ISRG_Root_X2.pem \
+ TRUST="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/ISRG_Root_X1.pem,"$srcdir"/ISRG_Root_X2.pem \
EXTRA_CFLAGS="-fcommon" \
$_targets
}
package() {
+ install -Dm644 -t "$pkgdir/usr/share/$pkgname" "$srcdir/boot.ipxe"
local target; for target in $_targets; do
install -Dm644 "$builddir"/$target \
"$pkgdir"/usr/share/$pkgname/${target##*/}
@@ -80,10 +85,9 @@ _split() {
}
sha512sums="
-39142187c7b84e81ed95865b2c6ca6624fd10ee49350741bcf4beff47cd4ebdce91eca9d7b4d3d91e45b96bd50fa554fa6b71e8e3ea6bcc474b0a71f5d35e5cd ipxe-1.20.1.tar.gz
-99d6dfbfe3a1a5c3792246c18976d7aab708301a4a1163978a22ae2c3052ca59c10fa5a418d131b783f2c230d78c05aad8f295e87cf82e48479dfb345d8793be gcc-10.patch
-83469bf56d9bd344eb686dbd1cae85c731794c506ac7bbaecdd00d15f7a2497f512ef1364ecccf0f58099d6c4b9ed86eb8614fa0373c262f7a8b5a5bd3460d5a gcc-11.patch
-1f52b62aa9e3ec0656ea3cb5c8e52eda924d58728e64bb03ca6c112858b91b13cf0a9328b105bb232973e240406b240ed14e72b5bd325e82e6fddf3126dbcc58 DST_Root_CA_X3.pem
+d93cf8363565150fa8f7652f9c91204747735ae1f673801e46a032b04a3cb399bac5c9128a93e60766c6a352e6bbf5ef12b7baf676b19d46b050c136bac52728 ipxe-1.21.1.tar.gz
+b819e7965412dbeecc6417b1e57356d9b10e8e2feb0db1165947e7e1b7d882de226afb8457475f5107393a981d902c7f405500cadb6f61bd2acbca5d8c7cc1f4 ISRG_Root_X1.pem
+c415b9970b201f2e416cd90ce68bac8ef5c741584b36ca4455e494de7cf8f44933854be171c179d9391775c2b7aaafe2db958ff616d7da8abaeaf810b66293a0 ISRG_Root_X2.pem
68030e3f30983ee45c7f740445a246ea0df225becdd0644e06ffdbd84682ac576934dab79fecceb31b70929d81ce85b40301a977862bf7beb042270be21e6d34 alpine-netboot-ca.crt
-337a438e173312285a2823a6aa1556c40e998e3af81660e18e2746f5314c114d24ecbcc9a240cb2681ecbaf89d443b1bf6e22a8657ddcee1206fe49f63f42980 boot.ipxe
+9d19497df9dd502f8c21b60b1df45c5805f84f536f858abd51dde4b46eec91cad1b0449891eb9fe6cf1cdd5ae88ce2c33c4666e612bc53149c64810e3a59bae1 boot.ipxe
"
diff --git a/main/matchbox-ipxe/DST_Root_CA_X3.pem b/main/matchbox-ipxe/DST_Root_CA_X3.pem
deleted file mode 100644
index b2e43c9..0000000
--- a/main/matchbox-ipxe/DST_Root_CA_X3.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
diff --git a/main/matchbox-ipxe/boot.ipxe b/main/matchbox-ipxe/boot.ipxe
index 715de78..2f25907 100644
--- a/main/matchbox-ipxe/boot.ipxe
+++ b/main/matchbox-ipxe/boot.ipxe
@@ -1,3 +1,3 @@
#!ipxe
ifconf
-chain http://matchbox.itsufficient.me/boot.ipxe || shell
+chain https://matchbox.itsufficient.me/boot.ipxe || shell
diff --git a/main/matchbox-ipxe/gcc-10.patch b/main/matchbox-ipxe/gcc-10.patch
deleted file mode 100644
index 0462db6..0000000
--- a/main/matchbox-ipxe/gcc-10.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8a1d66c7aec020f3e90254ed2fa55ecd9494fcc3 Mon Sep 17 00:00:00 2001
-From: Michael Brown <mcb30@ipxe.org>
-Date: Sat, 27 Jun 2020 20:43:32 +0100
-Subject: [PATCH] [golan] Add explicit type casts for nodnic_queue_pair_type
-
-GCC 10 emits warnings for implicit conversions of enumerated types.
-
-The flexboot_nodnic code defines nodnic_queue_pair_type with values
-identical to those of ib_queue_pair_type, and implicitly casts between
-them. Add an explicit cast to fix the warning.
-
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- drivers/infiniband/flexboot_nodnic.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/drivers/infiniband/flexboot_nodnic.c b/src/drivers/infiniband/flexboot_nodnic.c
-index 93bb05446..7d039fffc 100644
---- a/drivers/infiniband/flexboot_nodnic.c
-+++ b/drivers/infiniband/flexboot_nodnic.c
-@@ -365,7 +365,8 @@ static int flexboot_nodnic_create_qp ( struct ib_device *ibdev,
- goto qp_alloc_err;
- }
-
-- status = nodnic_port_create_qp(&port->port_priv, qp->type,
-+ status = nodnic_port_create_qp(&port->port_priv,
-+ (nodnic_queue_pair_type) qp->type,
- qp->send.num_wqes * sizeof(struct nodnic_send_wqbb),
- qp->send.num_wqes,
- qp->recv.num_wqes * sizeof(struct nodnic_recv_wqe),
-@@ -406,7 +407,8 @@ static void flexboot_nodnic_destroy_qp ( struct ib_device *ibdev,
- struct flexboot_nodnic_port *port = &flexboot_nodnic->port[ibdev->port - 1];
- struct flexboot_nodnic_queue_pair *flexboot_nodnic_qp = ib_qp_get_drvdata ( qp );
-
-- nodnic_port_destroy_qp(&port->port_priv, qp->type,
-+ nodnic_port_destroy_qp(&port->port_priv,
-+ (nodnic_queue_pair_type) qp->type,
- flexboot_nodnic_qp->nodnic_queue_pair);
-
- free(flexboot_nodnic_qp);
diff --git a/main/matchbox-ipxe/gcc-11.patch b/main/matchbox-ipxe/gcc-11.patch
deleted file mode 100644
index a793cdb..0000000
--- a/main/matchbox-ipxe/gcc-11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fixes maybe-used-uninitialised errors
---- a/tests/bigint_test.c
-+++ b/tests/bigint_test.c
-@@ -210,7 +210,7 @@
- static const uint8_t addend_raw[] = addend; \
- static const uint8_t value_raw[] = value; \
- static const uint8_t expected_raw[] = expected; \
-- uint8_t result_raw[ sizeof ( expected_raw ) ]; \
-+ uint8_t result_raw[ sizeof ( expected_raw ) ] = {0}; \
- unsigned int size = \
- bigint_required_size ( sizeof ( value_raw ) ); \
- bigint_t ( size ) addend_temp; \
---- a/drivers/net/ath/ath5k/ath5k_eeprom.c
-+++ b/drivers/net/ath/ath5k/ath5k_eeprom.c
-@@ -410,7 +410,7 @@
- {
- struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
- u32 o = *offset;
-- u16 val;
-+ u16 val = 0;
- int ret;
-
- if (ee->ee_version < AR5K_EEPROM_VERSION_5_0)
--
GitLab