Merge pull request #1197 from nmeum/base-system-busybox

base-system-busybox update and misc
This commit is contained in:
Juan RP 2015-03-27 04:59:05 +01:00
commit 60e3222dab
2 changed files with 13 additions and 13 deletions

View file

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.23.1 # Busybox version: 1.23.2
# Tue Mar 17 23:00:21 2015 # Wed Mar 25 21:45:04 2015
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -138,7 +138,7 @@ CONFIG_FEATURE_SEAMLESS_GZ=y
# CONFIG_AR is not set # CONFIG_AR is not set
# CONFIG_FEATURE_AR_LONG_FILENAMES is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
# CONFIG_FEATURE_AR_CREATE is not set # CONFIG_FEATURE_AR_CREATE is not set
# CONFIG_UNCOMPRESS is not set CONFIG_UNCOMPRESS=y
CONFIG_GUNZIP=y CONFIG_GUNZIP=y
# CONFIG_BUNZIP2 is not set # CONFIG_BUNZIP2 is not set
CONFIG_UNLZMA=y CONFIG_UNLZMA=y
@ -885,11 +885,11 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
CONFIG_UDPSVD=y CONFIG_UDPSVD=y
CONFIG_VCONFIG=y CONFIG_VCONFIG=y
CONFIG_WGET=y # CONFIG_WGET is not set
CONFIG_FEATURE_WGET_STATUSBAR=y # CONFIG_FEATURE_WGET_STATUSBAR is not set
CONFIG_FEATURE_WGET_AUTHENTICATION=y # CONFIG_FEATURE_WGET_AUTHENTICATION is not set
CONFIG_FEATURE_WGET_LONG_OPTIONS=y # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
CONFIG_FEATURE_WGET_TIMEOUT=y # CONFIG_FEATURE_WGET_TIMEOUT is not set
CONFIG_ZCIP=y CONFIG_ZCIP=y
# #

View file

@ -1,7 +1,7 @@
# Build template for 'base-system-busybox'. # Build template for 'base-system-busybox'.
pkgname=base-system-busybox pkgname=base-system-busybox
version=1.23.1 version=1.23.2
revision=2 revision=5
wrksrc="busybox-${version}" wrksrc="busybox-${version}"
homepage="http://www.busybox.net" homepage="http://www.busybox.net"
hostmakedepends="perl" hostmakedepends="perl"
@ -9,7 +9,7 @@ short_desc="The Swiss Army Knife of Embedded Linux - base-system replacements"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2" license="GPL-2"
distfiles="${homepage}/downloads/busybox-$version.tar.bz2" distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
checksum=300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf checksum=05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a
register_shell="/bin/sh" register_shell="/bin/sh"
conflicts="base-system>=0" conflicts="base-system>=0"
@ -24,13 +24,13 @@ conflicts="base-system>=0"
_FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils awk _FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils awk
grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
patch powertop psmisc rfkill run-parts sed tar 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 for f in ${_FEATURES}; do
provides+=" ${f}-${version}_${revision}" provides+=" ${f}-${version}_${revision}"
conflicts+=" ${f}>=0" conflicts+=" ${f}>=0"
done 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 ethtool"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) depends+=" musl";; *-musl) depends+=" musl";;