Merge remote-tracking branch 'x/master'

* x/master:
  base-busybox: provides usbutils, remove e2fsprogs applets.
This commit is contained in:
davehome 2012-01-29 14:42:14 -07:00
commit 5588e9dfdc
2 changed files with 4 additions and 4 deletions

View file

@ -481,7 +481,7 @@ CONFIG_GETTY=y
CONFIG_CHATTR=y
CONFIG_FSCK=y
CONFIG_LSATTR=y
CONFIG_TUNE2FS=y
# CONFIG_TUNE2FS is not set
#
# Linux Module Utilities
@ -543,7 +543,7 @@ CONFIG_FINDFS=y
CONFIG_FLOCK=y
CONFIG_FREERAMDISK=y
CONFIG_FSCK_MINIX=y
CONFIG_MKFS_EXT2=y
# CONFIG_MKFS_EXT2 is not set
CONFIG_MKFS_MINIX=y
CONFIG_FEATURE_MINIX2=y
# CONFIG_MKFS_REISER is not set

View file

@ -4,7 +4,7 @@ version=1.19.3
wrksrc="busybox-${version}"
homepage="http://www.busybox.net"
distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
revision=1
revision=2
short_desc="The Swiss Army Knife of Embedded Linux - for base system"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@ -18,7 +18,7 @@ long_desc="
very much like their GNU counterparts. BusyBox provides a fairly complete
environment for any small or embedded system."
provides="busybox-${version}"
provides="busybox-${version} usbutils-002"
replaces="busybox>=0"
Add_dependency build coreutils