From 9bb6f198e2091b5527e130230264f965abc2191f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 25 Mar 2015 21:33:03 +0100 Subject: [PATCH 1/5] base-system-busybox: update to 1.23.2. --- srcpkgs/base-system-busybox/files/dotconfig | 4 ++-- srcpkgs/base-system-busybox/template | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/base-system-busybox/files/dotconfig b/srcpkgs/base-system-busybox/files/dotconfig index 94e4620ceae..d51c544ccb8 100644 --- a/srcpkgs/base-system-busybox/files/dotconfig +++ b/srcpkgs/base-system-busybox/files/dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.23.1 -# Tue Mar 17 23:00:21 2015 +# Busybox version: 1.23.2 +# Wed Mar 25 21:32:46 2015 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index 043379a39c1..2708290a498 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -1,7 +1,7 @@ # Build template for 'base-system-busybox'. pkgname=base-system-busybox -version=1.23.1 -revision=2 +version=1.23.2 +revision=1 wrksrc="busybox-${version}" homepage="http://www.busybox.net" hostmakedepends="perl" @@ -9,7 +9,7 @@ short_desc="The Swiss Army Knife of Embedded Linux - base-system replacements" maintainer="Juan RP " license="GPL-2" distfiles="${homepage}/downloads/busybox-$version.tar.bz2" -checksum=300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf +checksum=05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a register_shell="/bin/sh" conflicts="base-system>=0" From 7ba5d69ab0a7a8e763c02e7ab26486c75e9b6117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 25 Mar 2015 21:38:44 +0100 Subject: [PATCH 2/5] base-system-busybox: Don't ship with wget Since it isn't shipped by base-system either. --- srcpkgs/base-system-busybox/files/dotconfig | 12 ++++++------ srcpkgs/base-system-busybox/template | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/base-system-busybox/files/dotconfig b/srcpkgs/base-system-busybox/files/dotconfig index d51c544ccb8..cd715928217 100644 --- a/srcpkgs/base-system-busybox/files/dotconfig +++ b/srcpkgs/base-system-busybox/files/dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.23.2 -# Wed Mar 25 21:32:46 2015 +# Wed Mar 25 21:38:22 2015 # CONFIG_HAVE_DOT_CONFIG=y @@ -885,11 +885,11 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" CONFIG_UDPSVD=y CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_WGET is not set +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +# CONFIG_FEATURE_WGET_TIMEOUT is not set CONFIG_ZCIP=y # diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index 2708290a498..623640f4071 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -1,7 +1,7 @@ # Build template for 'base-system-busybox'. pkgname=base-system-busybox version=1.23.2 -revision=1 +revision=2 wrksrc="busybox-${version}" homepage="http://www.busybox.net" hostmakedepends="perl" @@ -24,7 +24,7 @@ conflicts="base-system>=0" _FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils awk grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi patch powertop psmisc rfkill run-parts sed tar - traceroute util-linux wget which whois xz ncurses" + traceroute util-linux which whois xz ncurses" for f in ${_FEATURES}; do provides+=" ${f}-${version}_${revision}" conflicts+=" ${f}>=0" From 8c2eabe17ee1811dde12852c61d79f0a682877b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 25 Mar 2015 21:42:17 +0100 Subject: [PATCH 3/5] base-system-busybox: depend on tzdata too --- srcpkgs/base-system-busybox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index 623640f4071..308b505bda7 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -1,7 +1,7 @@ # Build template for 'base-system-busybox'. pkgname=base-system-busybox version=1.23.2 -revision=2 +revision=3 wrksrc="busybox-${version}" homepage="http://www.busybox.net" hostmakedepends="perl" @@ -30,7 +30,7 @@ for f in ${_FEATURES}; do conflicts+=" ${f}>=0" done -depends="base-files runit-void xbps kbd eudev shadow kmod ncurses-base procps-ng" +depends="base-files runit-void xbps kbd eudev shadow kmod ncurses-base procps-ng tzdata" case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl";; From 8292fe0776f6780dd1a88e3af27f84b824345345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 25 Mar 2015 21:43:50 +0100 Subject: [PATCH 4/5] base-system-busybox: depend on ethtool too --- srcpkgs/base-system-busybox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index 308b505bda7..86c7ffe6733 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -1,7 +1,7 @@ # Build template for 'base-system-busybox'. pkgname=base-system-busybox version=1.23.2 -revision=3 +revision=4 wrksrc="busybox-${version}" homepage="http://www.busybox.net" hostmakedepends="perl" @@ -30,7 +30,7 @@ for f in ${_FEATURES}; do conflicts+=" ${f}>=0" done -depends="base-files runit-void xbps kbd eudev shadow kmod ncurses-base procps-ng tzdata" +depends="base-files runit-void xbps kbd eudev shadow kmod ncurses-base procps-ng tzdata ethtool" case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl";; From 1424af2412ab29a021f427970ba16731a2af1ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 25 Mar 2015 21:45:40 +0100 Subject: [PATCH 5/5] base-system-busybox: ship with uncompress Since uncompress is provided by gzip (a package which busybox conflicts with). --- srcpkgs/base-system-busybox/files/dotconfig | 4 ++-- srcpkgs/base-system-busybox/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/base-system-busybox/files/dotconfig b/srcpkgs/base-system-busybox/files/dotconfig index cd715928217..411654a9b6b 100644 --- a/srcpkgs/base-system-busybox/files/dotconfig +++ b/srcpkgs/base-system-busybox/files/dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.23.2 -# Wed Mar 25 21:38:22 2015 +# Wed Mar 25 21:45:04 2015 # CONFIG_HAVE_DOT_CONFIG=y @@ -138,7 +138,7 @@ CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set # CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_UNCOMPRESS is not set +CONFIG_UNCOMPRESS=y CONFIG_GUNZIP=y # CONFIG_BUNZIP2 is not set CONFIG_UNLZMA=y diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index 86c7ffe6733..cd1f3cab31b 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -1,7 +1,7 @@ # Build template for 'base-system-busybox'. pkgname=base-system-busybox version=1.23.2 -revision=4 +revision=5 wrksrc="busybox-${version}" homepage="http://www.busybox.net" hostmakedepends="perl"