Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rev 3rd_party apps to latest versions #279

Merged
merged 3 commits into from
Sep 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion provision/3rd_party/BSD/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
EXTRA_DIST = unionfs-fuse-0.24.tar.bz2 libarchive-3.3.1.tar.gz
EXTRA_DIST = unionfs-fuse-0.24.tar.bz2 libarchive-3.5.2.tar.gz

MAINTAINERCLEANFILES = Makefile.in
Binary file removed provision/3rd_party/BSD/libarchive-3.3.1.tar.gz
Binary file not shown.
Binary file added provision/3rd_party/BSD/libarchive-3.5.2.tar.gz
Binary file not shown.
15 changes: 15 additions & 0 deletions provision/3rd_party/GPL/0000-ipxe-revert-3fb3ffc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- a/ipxe-2265a65/src/include/errno.h 2021-09-23 01:01:07.372658000 +0000
+++ b/ipxe-2265a65/src/include/errno.h 2021-09-23 01:01:18.089527000 +0000
@@ -262,10 +262,10 @@
".balign 8\n\t" \
"\n1:\n\t" \
".long ( 4f - 1b )\n\t" \
- ".long %c0\n\t" \
+ ".long %a0\n\t" \
".long ( 2f - 1b )\n\t" \
".long ( 3f - 1b )\n\t" \
- ".long %c1\n\t" \
+ ".long %a1\n\t" \
"\n2:\t.asciz \"" __einfo_desc ( einfo ) "\"\n\t" \
"\n3:\t.asciz \"" __FILE__ "\"\n\t" \
".balign 8\n\t" \
2 changes: 1 addition & 1 deletion provision/3rd_party/GPL/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist_gplsrc_DATA = README busybox-1.26.2.tar.bz2 e2fsprogs-1.42.12.tar.gz ipxe-133f4c4.tar.xz parted-3.2.tar.xz
dist_gplsrc_DATA = 0000-ipxe-revert-3fb3ffc.patch README busybox-1.33.1.tar.bz2 e2fsprogs-1.46.4.tar.gz ipxe-2265a65.tar.xz parted-3.4.tar.xz

gplsrcdir = $(prefix)/src/warewulf/3rd_party/GPL/

Expand Down
Binary file removed provision/3rd_party/GPL/busybox-1.26.2.tar.bz2
Binary file not shown.
Binary file added provision/3rd_party/GPL/busybox-1.33.1.tar.bz2
Binary file not shown.
Binary file removed provision/3rd_party/GPL/e2fsprogs-1.42.12.tar.gz
Binary file not shown.
Binary file added provision/3rd_party/GPL/e2fsprogs-1.46.4.tar.gz
Binary file not shown.
Binary file removed provision/3rd_party/GPL/ipxe-133f4c4.tar.xz
Binary file not shown.
Binary file added provision/3rd_party/GPL/ipxe-2265a65.tar.xz
Binary file not shown.
Binary file removed provision/3rd_party/GPL/parted-3.2.tar.xz
Binary file not shown.
Binary file added provision/3rd_party/GPL/parted-3.4.tar.xz
Binary file not shown.
2 changes: 1 addition & 1 deletion provision/3rd_party/MIT/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
EXTRA_DIST = curl-7.75.0.tar.gz
EXTRA_DIST = curl-7.79.1.tar.gz

MAINTAINERCLEANFILES = Makefile.in
Binary file removed provision/3rd_party/MIT/curl-7.75.0.tar.gz
Binary file not shown.
Binary file added provision/3rd_party/MIT/curl-7.79.1.tar.gz
Binary file not shown.
10 changes: 7 additions & 3 deletions provision/3rd_party/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ MAINTAINERCLEANFILES = Makefile.in

all: $(IPXETARGETS)

IPXE_VERSION = 133f4c4
IPXE_VERSION = 2265a65
IPXE_SOURCE = $(top_srcdir)/3rd_party/GPL/ipxe-$(IPXE_VERSION).tar.xz
IPXE_DIR = ipxe-$(IPXE_VERSION)
IPXE_PATCH = GPL/0000-ipxe-revert-3fb3ffc.patch


prep:
Expand Down Expand Up @@ -59,13 +60,16 @@ endif
bin-arm64-efi/snp.efi: prep

if BUILD_ARM64
@ if [ -n "@local_ipxe_snp_arm64_path@" -a -f "@local_ipxe_snp_arm64_path@" ]; then \
@ if [ `$(CROSS_COMPILE_ARM64)gcc -dumpversion` == 4.8.5 ]; then \
( cd _work && pwd && patch -N -p1 < ../$(IPXE_PATCH) ) ; \
fi ; \
if [ -n "@local_ipxe_snp_arm64_path@" -a -f "@local_ipxe_snp_arm64_path@" ]; then \
echo "Detected local install of arm64 snp.efi boot image. Bypassing build process." ;\
mkdir -p _work/$(IPXE_DIR)/src/bin-arm64-efi ;\
cp "@local_ipxe_snp_arm64_path@" _work/$(IPXE_DIR)/src/bin-arm64-efi/snp.efi ;\
else \
$(MAKE) -C _work/$(IPXE_DIR)/src CROSS_COMPILE=$(CROSS_COMPILE_ARM64) bin-arm64-efi/snp.efi; \
fi
fi
endif

install-data-local: $(IPXETARGETS)
Expand Down
10 changes: 5 additions & 5 deletions provision/initramfs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ top_srcdir = @top_srcdir@

MACHINE:=$(shell uname -m)

BUSYBOX_VERSION = 1.26.2
BUSYBOX_VERSION = 1.33.1
BUSYBOX_SOURCE = $(top_srcdir)/3rd_party/GPL/busybox-$(BUSYBOX_VERSION).tar.bz2
BUSYBOX_DIR = busybox-$(BUSYBOX_VERSION)
BUSYBOX_PATCHES =

E2FSPROGS_VERSION = 1.42.12
E2FSPROGS_VERSION = 1.46.4
E2FSPROGS_SOURCE = $(top_srcdir)/3rd_party/GPL/e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
E2FSPROGS_DIR = e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_CONFIGARGS = --disable-testio-debug --disable-debugfs --disable-imager --disable-resizer --disable-defrag --disable-fsck --disable-tls --disable-uuidd --disable-nls --disable-profile

LIBARCHIVE_VERSION = 3.3.1
LIBARCHIVE_VERSION = 3.5.2
LIBARCHIVE_SOURCE = $(top_srcdir)/3rd_party/BSD/libarchive-$(LIBARCHIVE_VERSION).tar.gz
LIBARCHIVE_DIR = libarchive-$(LIBARCHIVE_VERSION)
LIBARCHIVE_CONFIGARGS = --enable-bsdtar=static --disable-bsdcpio --enable-xattr --enable-acl --enable-static --disable-shared --without-zlib --without-bz2lib --without-iconv --without-lzma --without-lzo2 --without-lz4 --without-nettle --without-openssl --without-xml2 --without-expat

PARTED_VERSION = 3.2
PARTED_VERSION = 3.4
PARTED_SOURCE = $(top_srcdir)/3rd_party/GPL/parted-$(PARTED_VERSION).tar.xz
PARTED_DIR = parted-$(PARTED_VERSION)
PARTED_CONFIGARGS = --prefix=/ --libdir=/lib64 --without-readline --disable-static --disable-nls --disable-dynamic-loading --disable-debug

CURL_VERSION = 7.75.0
CURL_VERSION = 7.79.1
CURL_SOURCE = $(top_srcdir)/3rd_party/MIT/curl-$(CURL_VERSION).tar.gz
CURL_DIR = curl-$(CURL_VERSION)
CURL_CONFIGARGS = --prefix=/usr --disable-shared --enable-static --without-ssl --without-gnutls --without-wolfssl --without-bearssl --with-mbedtls --with-ca-bundle=/etc/ca-bundle.crt --disable-ares --disable-cookies --disable-crypto-auth --disable-ipv6 --disable-manual --disable-proxy --disable-unix-sockets --disable-verbose --disable-versioned-symbols --enable-hidden-symbols --without-libidn --without-librtmp --without-zlib --disable-alt-svc --disable-hsts --disable-tls-srp --disable-ldap --disable-ldaps --disable-imap --disable-mqtt --disable-pop3 --disable-rtsp --disable-smtp --disable-gopher --disable-telnet --disable-tftp --disable-ftp --disable-libcurl-option
Expand Down