diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-07-15 14:17:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-07-15 14:17:44 +0000 |
| commit | 7f3e98913b36d3254e0000765c9822423c0364e0 (patch) | |
| tree | 82944a0cec1c027e8e48c30ece15f8814e08574b /main/busybox | |
| parent | 6ac2877e011b8c5af70d3cfc36d36dca7c1b9df1 (diff) | |
| download | aports-7f3e98913b36d3254e0000765c9822423c0364e0.tar.bz2 aports-7f3e98913b36d3254e0000765c9822423c0364e0.tar.xz | |
main/busybox: fix bad config that made bb static
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/APKBUILD | 4 | ||||
| -rw-r--r-- | main/busybox/busyboxconfig | 46 |
2 files changed, 27 insertions, 23 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index a8ace8d51f..324fa5c0d2 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.17.0 -pkgrel=0 +pkgrel=1 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net license="GPL-2" @@ -82,4 +82,4 @@ ea127206741f9785dd2e8fcce2c32ad8 busybox-1.17.0-build_system.patch b159ecc8954369ec3d2320212c075a69 busybox-1.17.0-modprobe-l.patch 97cccda27dbf4181ca32a58f5d61e5a9 busybox-1.17.0-volumeid.patch aecc8dcaff560e1334d2788d588f6ea5 busybox-1.17.0-wget.patch -2db136224b6d4869b0744ef2d27c14e1 busyboxconfig" +e4c9f09bcc27b57f8f0344c69607f4c4 busyboxconfig" diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig index 725e88247f..f950be73cf 100644 --- a/main/busybox/busyboxconfig +++ b/main/busybox/busyboxconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.17.0 -# Tue Jul 13 11:18:29 2010 +# Thu Jul 15 14:12:18 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -52,8 +52,8 @@ CONFIG_FEATURE_SYSLOG=y # # Build Options # -CONFIG_STATIC=y -# CONFIG_PIE is not set +# CONFIG_STATIC is not set +CONFIG_PIE=y # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_INDIVIDUAL is not set @@ -551,24 +551,6 @@ CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_VOLUMEID=y -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -CONFIG_FEATURE_VOLUMEID_XFS=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_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y CONFIG_MOUNT=y CONFIG_FEATURE_MOUNT_FAKE=y CONFIG_FEATURE_MOUNT_VERBOSE=y @@ -598,6 +580,28 @@ CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set +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_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +CONFIG_FEATURE_VOLUMEID_XFS=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_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y # # Miscellaneous Utilities |