diff core/busybox/busybox.sh @ 1223:9be1651dcfaf

core/busybox: upgrade to 1.34.1
author David Demelier <markand@malikania.fr>
date Fri, 29 Oct 2021 09:06:10 +0200
parents 325631424c65
children dbe5116fb25d
line wrap: on
line diff
--- a/core/busybox/busybox.sh	Wed Oct 27 11:32:16 2021 +0200
+++ b/core/busybox/busybox.sh	Fri Oct 29 09:06:10 2021 +0200
@@ -16,9 +16,9 @@
 #
 
 PKGNAME=busybox
-PKGVERSION=1.30.1
+PKGVERSION=1.34.1
 PKGREVISION=1
-PKGLICENSE="GPLv2"
+PKGLICENSE="GPL-2.0-only"
 PKGSUMMARY="swiss army knife for embedded"
 PKGWWW="https://busybox.net"
 PKGDOWNLOAD="https://busybox.net/downloads/$PKGNAME-$PKGVERSION.tar.bz2"
@@ -44,7 +44,7 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	tar -xvf $PKGNAME-$PKGVERSION.tar.bz2
 	cd $PKGNAME-$PKGVERSION
 
 	#
@@ -92,30 +92,13 @@
 	#
 	sed -i -e 's|/etc/init.d/rcS|/etc/rc.init|' init/init.c
 
-	#
-	# Change the redirection limit which is too small for vpk download.
-	# Upstream: yes in Git.
-	#
-	sed -i -e "/redir_limit = 5/ s/5/16/" networking/wget.c
-
-	#
-	# TODO: this is temporary, to build under clang.
-	#
-	# CFLAGS="": fix build under clang by removing all non-standard
-	# options.
-	#
-	# -O0: disable optimizations for the same reasons.
-	#
-	# See http://lists.busybox.net/pipermail/busybox/2019-October/087558.html
-	#
 	make \
 		AR="$AR" \
 		AS="$AS" \
 		CC="$CC" \
-		CFLAGS="-DBB_GLOBAL_CONST=''" \
 		HOSTCC="$CC" \
 		HOSTCFLAGS="" \
-		EXTRA_CFLAGS="$CFLAGS -O0" \
+		EXTRA_CFLAGS="$CFLAGS" \
 		EXTRA_LDFLAGS="$LDFLAGS" \
 		NM="$NM" \
 		OBJCOPY="$OBJCOPY" \