From bac02c00022880fa3ae6c966edd88d0d55c931ae Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 7 Sep 2024 15:55:28 +0000 Subject: Apply some of the j_v changes Signed-off-by: Laurent Bercot --- .gitignore | 2 ++ Makefile | 1 - sub/bearssl/Makefile | 4 +++- sub/busybox/Makefile | 4 ++-- sub/busybox/host-full-config | 8 ++++++-- sub/dev/Makefile.curl | 5 +---- sub/dev/Makefile.git | 2 +- sub/dev/Makefile.libressl | 2 +- sub/dev/Makefile.make | 2 +- sub/dev/Makefile.strace | 2 +- sub/dev/Makefile.zlib | 2 +- sub/dropbear/Makefile | 3 ++- sub/e2fsprogs/Makefile | 2 +- sub/kmod/Makefile | 3 ++- 14 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 5044272..da6ad5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ lh-config +output/ +*.log diff --git a/Makefile b/Makefile index 2346211..e2035df 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,6 @@ $(OUTPUT)/build-build/.lh_done: $(OUTPUT)/build-build/.lh_skarnet_installed $(OU # The filesystems $(OUTPUT)/tmp/.lh_rootfs_installed: $(OUTPUT)/tmp/.lh_layout_installed $(OUTPUT)/build-$(TRIPLE)/.lh_skarnet_installed $(OUTPUT)/build-$(TRIPLE)/.lh_bb_installed $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_installed $(LH_DEV_TARGETS) - exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/tmp/.lh_rwfs_installed: $(OUTPUT)/tmp/.lh_layout_installed diff --git a/sub/bearssl/Makefile b/sub/bearssl/Makefile index 84048ca..71faa0d 100644 --- a/sub/bearssl/Makefile +++ b/sub/bearssl/Makefile @@ -1,7 +1,9 @@ BEARSSL_NAME := bearssl # latest version from 2022-06-22 -BEARSSL_VERSION := 46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0 +#BEARSSL_VERSION := 46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0 +# latest version from 2024-06-12 +BEARSSL_VERSION := 3c040368f6791553610e362401db1efff4b4c5b8 BEARSSL_URLDIR := https://www.bearssl.org/git $(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled: | $(OUTPUT)/build-build/.lh_skarnet_installed diff --git a/sub/busybox/Makefile b/sub/busybox/Makefile index 95491dd..cb5ef8b 100644 --- a/sub/busybox/Makefile +++ b/sub/busybox/Makefile @@ -1,5 +1,5 @@ -# Version from 2023-02-10 -BUSYBOX_VERSION := 93ae7464e6e460f25b73e4ffefd2d9a6499eae30 +# Version from 2024-07-14 +BUSYBOX_VERSION := 371fe9f71d445d18be28c82a2a6d82115c8af19d clean-busybox: rm -f $(OUTPUT)/sources/.lh_bb_cloned diff --git a/sub/busybox/host-full-config b/sub/busybox/host-full-config index 661a06c..bd130a7 100644 --- a/sub/busybox/host-full-config +++ b/sub/busybox/host-full-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.37.0.git -# Fri Feb 10 00:11:46 2023 +# Sat Sep 7 17:53:14 2024 # CONFIG_HAVE_DOT_CONFIG=y @@ -17,6 +17,7 @@ CONFIG_SHOW_USAGE=y # CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_COMPRESS_USAGE is not set CONFIG_LFS=y +CONFIG_TIME64=y # CONFIG_PAM is not set CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y @@ -465,6 +466,7 @@ CONFIG_FEATURE_ALLOW_EXEC=y # CONFIG_FEATURE_FIND_SAMEFILE is not set # CONFIG_FEATURE_FIND_EXEC is not set # CONFIG_FEATURE_FIND_EXEC_PLUS is not set +# CONFIG_FEATURE_FIND_EXEC_OK is not set # CONFIG_FEATURE_FIND_USER is not set # CONFIG_FEATURE_FIND_GROUP is not set # CONFIG_FEATURE_FIND_NOT is not set @@ -791,6 +793,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set # CONFIG_FLASHCP is not set +CONFIG_GETFATTR=y # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -929,6 +932,7 @@ CONFIG_IP=y # CONFIG_IPNEIGH is not set CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_LINK_CAN=y CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" # CONFIG_FEATURE_IP_TUNNEL is not set @@ -1003,6 +1007,7 @@ CONFIG_FEATURE_WGET_OPENSSL=y # CONFIG_WHOIS is not set # CONFIG_ZCIP is not set # CONFIG_UDHCPD is not set +# CONFIG_FEATURE_UDHCPD_BOOTP is not set # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="" @@ -1143,7 +1148,6 @@ CONFIG_ASH_EXPAND_PRMT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y -CONFIG_ASH_SLEEP=y # CONFIG_ASH_HELP is not set CONFIG_ASH_GETOPTS=y # CONFIG_ASH_CMDCMD is not set diff --git a/sub/dev/Makefile.curl b/sub/dev/Makefile.curl index 9c7ea64..ac3978f 100644 --- a/sub/dev/Makefile.curl +++ b/sub/dev/Makefile.curl @@ -1,5 +1,5 @@ -CURL_VERSION ?= 7.87.0 +CURL_VERSION ?= 8.9.1 CURL_STATIC := $(if $(filter true,$(TARGET_STATIC)),-all-static,) CURL_CONF_ARGS := \ @@ -59,17 +59,14 @@ CURL_CONF_ARGS := \ --with-default-ssl-backend=bearssl \ --without-winssl \ --without-schannel \ - --without-darwinssl \ --without-secure-transport \ --without-amissl \ - --without-ssl \ --without-gnutls \ --without-mbedtls \ --without-wolfssl \ --without-mesalink \ --with-bearssl=$(OUTPUT)/rootfs/opt/bearssl \ --without-nss \ - --without-libmetalink \ --without-ca-bundle \ --without-ca-path \ --without-ca-fallback \ diff --git a/sub/dev/Makefile.git b/sub/dev/Makefile.git index 26bb086..785b9eb 100644 --- a/sub/dev/Makefile.git +++ b/sub/dev/Makefile.git @@ -1,5 +1,5 @@ -GIT_VERSION ?= 2.39.1 +GIT_VERSION ?= 2.46.0 GIT_STATIC := $(if $(filter true,$(TARGET_STATIC)),-static,) GIT_CONF_ARGS := --enable-pthreads --without-expat --without-iconv --with-shell=/bin/sh --with-perl=/bin/perl --without-python --with-zlib=$(OUTPUT)/rootfs/opt/zlib --without-tcltk --with-openssl=$(OUTPUT)/rootfs/opt/libressl ac_cv_fread_reads_directories=true ac_cv_snprintf_returns_bogus=false diff --git a/sub/dev/Makefile.libressl b/sub/dev/Makefile.libressl index 3c10d79..e62baaa 100644 --- a/sub/dev/Makefile.libressl +++ b/sub/dev/Makefile.libressl @@ -1,5 +1,5 @@ -LIBRESSL_VERSION ?= 3.7.0 +LIBRESSL_VERSION ?= 3.9.2 LIBRESSL_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),LDFLAGS="-s -all-static",LDFLAGS=-s) clean-libressl: diff --git a/sub/dev/Makefile.make b/sub/dev/Makefile.make index e8c3aae..88a380a 100644 --- a/sub/dev/Makefile.make +++ b/sub/dev/Makefile.make @@ -1,5 +1,5 @@ -MAKE_VERSION ?= 4.4 +MAKE_VERSION ?= 4.4.1 MAKE_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),LDFLAGS=-static,) clean-make: diff --git a/sub/dev/Makefile.strace b/sub/dev/Makefile.strace index 8df589e..542741e 100644 --- a/sub/dev/Makefile.strace +++ b/sub/dev/Makefile.strace @@ -1,5 +1,5 @@ -STRACE_VERSION ?= 6.1 +STRACE_VERSION ?= 6.10 STRACE_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),LDFLAGS=-static,) clean-strace: diff --git a/sub/dev/Makefile.zlib b/sub/dev/Makefile.zlib index a208955..79c8501 100644 --- a/sub/dev/Makefile.zlib +++ b/sub/dev/Makefile.zlib @@ -1,5 +1,5 @@ -ZLIB_VERSION ?= 1.2.13 +ZLIB_VERSION ?= 1.3.1 clean-zlib: rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_* diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile index 6d52952..dddc6c4 100644 --- a/sub/dropbear/Makefile +++ b/sub/dropbear/Makefile @@ -1,5 +1,6 @@ -DROPBEAR_VERSION ?= 2024.84 +#DROPBEAR_VERSION ?= 2024.84 +DROPBEAR_VERSION ?= 2024.85 # DROPBEAR_VERSION ?= 2020.81 # previous working version DROPBEAR_SITE := https://mirror.dropbear.nl/mirror/releases # DROPBEAR_SITE := https://matt.ucc.asn.au/dropbear/releases diff --git a/sub/e2fsprogs/Makefile b/sub/e2fsprogs/Makefile index f42b12d..a414620 100644 --- a/sub/e2fsprogs/Makefile +++ b/sub/e2fsprogs/Makefile @@ -6,7 +6,7 @@ E2FSPROGS_TAREXT := tar.xz E2FSPROGS_TARLETTER := J E2FSPROGS_CONFIGURE_OPTIONS := --with-gnu-ld --without-libiconv-prefix --disable-gtk-doc-html --with-xz --disable-manpages --enable-largefile --with-udev-rules-dir=no --with-crond-dir=no --with-systemd-unit-dir=no -E2FSPROGS_CFLAGS := +E2FSPROGS_CFLAGS := -Wno-implicit-function-declaration E2FSPROGS_LDFLAGS := -s -static E2FSPROGS_LIBS := -llzma diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile index b73e5e6..a8c6146 100644 --- a/sub/kmod/Makefile +++ b/sub/kmod/Makefile @@ -1,6 +1,7 @@ KMOD_NAME := kmod -KMOD_VERSION := 32 +#KMOD_VERSION := 32 +KMOD_VERSION := 33 KMOD_URLDIR := https://kernel.org/pub/linux/utils/kernel/$(KMOD_NAME) KMOD_TAREXT := tar.xz KMOD_TARLETTER := J -- cgit v1.2.3