diff --git a/srcpkgs/base-system-busybox/files/dotconfig b/srcpkgs/base-system-busybox/files/dotconfig index 1be217fb9b..49f7d62089 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.21.1 -# Sun Dec 8 12:43:34 2013 +# Busybox version: 1.22.1 +# Mon Feb 10 11:52:54 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -135,7 +135,14 @@ 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_GUNZIP=y # CONFIG_BUNZIP2 is not set +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y # CONFIG_BZIP2 is not set CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y @@ -143,7 +150,6 @@ CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 @@ -163,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZ=y CONFIG_UNZIP=y # @@ -186,6 +186,7 @@ CONFIG_GROUPS=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -359,7 +360,16 @@ CONFIG_WHICH=y # # Editors # +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y CONFIG_PATCH=y +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set @@ -374,14 +384,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_SED=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -524,6 +526,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_FSTRIM=y CONFIG_MDEV=y CONFIG_FEATURE_MDEV_CONF=y CONFIG_FEATURE_MDEV_RENAME=y @@ -610,26 +613,27 @@ CONFIG_VOLUMEID=y # # Filesystem/Volume identification # -CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y # # Miscellaneous Utilities @@ -647,6 +651,7 @@ CONFIG_FEATURE_LESS_DASHCMD=y CONFIG_FEATURE_LESS_LINENUMS=y # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +CONFIG_RFKILL=y CONFIG_SETSERIAL=y CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y @@ -654,6 +659,7 @@ CONFIG_UBIMKVOL=y CONFIG_UBIRMVOL=y CONFIG_UBIRSVOL=y CONFIG_UBIUPDATEVOL=y +CONFIG_WALL=y CONFIG_ADJTIMEX=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -710,7 +716,6 @@ CONFIG_MOUNTPOINT=y CONFIG_MT=y CONFIG_RAIDAUTORUN=y CONFIG_READAHEAD=y -CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set # CONFIG_SETSID is not set @@ -721,7 +726,6 @@ CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y CONFIG_VOLNAME=y -CONFIG_WALL=y CONFIG_WATCHDOG=y # diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index 6c70dda62e..732e6b0b2d 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -1,15 +1,15 @@ # Build template for 'base-system-busybox'. pkgname=base-system-busybox -version=1.21.1 -revision=2 +version=1.22.1 +revision=1 wrksrc="busybox-${version}" homepage="http://www.busybox.net" -makedepends="perl" +hostmakedepends="perl" 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=cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 +checksum=ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b # Applets provided by this busybox version. # Keep this list updated with ${FILESDIR}/dotconfig. @@ -24,11 +24,14 @@ for f in ${_FEATURES}; do replaces+="${f}>=0 " done -do_build() { +pre_build() { cp -f ${FILESDIR}/dotconfig .config if [ "$CROSS_BUILD" ]; then sed -e "s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" -i .config fi +} + +do_build() { make ${makejobs} }