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 | |
parent | 6ac2877e011b8c5af70d3cfc36d36dca7c1b9df1 (diff) | |
download | alpine_aports-7f3e98913b36d3254e0000765c9822423c0364e0.tar.bz2 alpine_aports-7f3e98913b36d3254e0000765c9822423c0364e0.tar.xz alpine_aports-7f3e98913b36d3254e0000765c9822423c0364e0.zip |
main/busybox: fix bad config that made bb static
-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 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=busybox | 2 | pkgname=busybox |
3 | pkgver=1.17.0 | 3 | pkgver=1.17.0 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Size optimized toolbox of many common UNIX utilities" | 5 | pkgdesc="Size optimized toolbox of many common UNIX utilities" |
6 | url=http://busybox.net | 6 | url=http://busybox.net |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -82,4 +82,4 @@ ea127206741f9785dd2e8fcce2c32ad8 busybox-1.17.0-build_system.patch | |||
82 | b159ecc8954369ec3d2320212c075a69 busybox-1.17.0-modprobe-l.patch | 82 | b159ecc8954369ec3d2320212c075a69 busybox-1.17.0-modprobe-l.patch |
83 | 97cccda27dbf4181ca32a58f5d61e5a9 busybox-1.17.0-volumeid.patch | 83 | 97cccda27dbf4181ca32a58f5d61e5a9 busybox-1.17.0-volumeid.patch |
84 | aecc8dcaff560e1334d2788d588f6ea5 busybox-1.17.0-wget.patch | 84 | aecc8dcaff560e1334d2788d588f6ea5 busybox-1.17.0-wget.patch |
85 | 2db136224b6d4869b0744ef2d27c14e1 busyboxconfig" | 85 | 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 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Busybox version: 1.17.0 | 3 | # Busybox version: 1.17.0 |
4 | # Tue Jul 13 11:18:29 2010 | 4 | # Thu Jul 15 14:12:18 2010 |
5 | # | 5 | # |
6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
7 | 7 | ||
@@ -52,8 +52,8 @@ CONFIG_FEATURE_SYSLOG=y | |||
52 | # | 52 | # |
53 | # Build Options | 53 | # Build Options |
54 | # | 54 | # |
55 | CONFIG_STATIC=y | 55 | # CONFIG_STATIC is not set |
56 | # CONFIG_PIE is not set | 56 | CONFIG_PIE=y |
57 | # CONFIG_NOMMU is not set | 57 | # CONFIG_NOMMU is not set |
58 | # CONFIG_BUILD_LIBBUSYBOX is not set | 58 | # CONFIG_BUILD_LIBBUSYBOX is not set |
59 | # CONFIG_FEATURE_INDIVIDUAL is not set | 59 | # CONFIG_FEATURE_INDIVIDUAL is not set |
@@ -551,24 +551,6 @@ CONFIG_MKSWAP=y | |||
551 | CONFIG_FEATURE_MKSWAP_UUID=y | 551 | CONFIG_FEATURE_MKSWAP_UUID=y |
552 | CONFIG_MORE=y | 552 | CONFIG_MORE=y |
553 | CONFIG_FEATURE_USE_TERMIOS=y | 553 | CONFIG_FEATURE_USE_TERMIOS=y |
554 | CONFIG_VOLUMEID=y | ||
555 | CONFIG_FEATURE_VOLUMEID_EXT=y | ||
556 | CONFIG_FEATURE_VOLUMEID_BTRFS=y | ||
557 | CONFIG_FEATURE_VOLUMEID_REISERFS=y | ||
558 | CONFIG_FEATURE_VOLUMEID_FAT=y | ||
559 | # CONFIG_FEATURE_VOLUMEID_HFS is not set | ||
560 | # CONFIG_FEATURE_VOLUMEID_JFS is not set | ||
561 | CONFIG_FEATURE_VOLUMEID_XFS=y | ||
562 | CONFIG_FEATURE_VOLUMEID_NTFS=y | ||
563 | CONFIG_FEATURE_VOLUMEID_ISO9660=y | ||
564 | CONFIG_FEATURE_VOLUMEID_UDF=y | ||
565 | CONFIG_FEATURE_VOLUMEID_LUKS=y | ||
566 | CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y | ||
567 | CONFIG_FEATURE_VOLUMEID_CRAMFS=y | ||
568 | # CONFIG_FEATURE_VOLUMEID_ROMFS is not set | ||
569 | # CONFIG_FEATURE_VOLUMEID_SYSV is not set | ||
570 | CONFIG_FEATURE_VOLUMEID_OCFS2=y | ||
571 | CONFIG_FEATURE_VOLUMEID_LINUXRAID=y | ||
572 | CONFIG_MOUNT=y | 554 | CONFIG_MOUNT=y |
573 | CONFIG_FEATURE_MOUNT_FAKE=y | 555 | CONFIG_FEATURE_MOUNT_FAKE=y |
574 | CONFIG_FEATURE_MOUNT_VERBOSE=y | 556 | CONFIG_FEATURE_MOUNT_VERBOSE=y |
@@ -598,6 +580,28 @@ CONFIG_FEATURE_UMOUNT_ALL=y | |||
598 | CONFIG_FEATURE_MOUNT_LOOP=y | 580 | CONFIG_FEATURE_MOUNT_LOOP=y |
599 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y | 581 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y |
600 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | 582 | # CONFIG_FEATURE_MTAB_SUPPORT is not set |
583 | CONFIG_VOLUMEID=y | ||
584 | |||
585 | # | ||
586 | # Filesystem/Volume identification | ||
587 | # | ||
588 | CONFIG_FEATURE_VOLUMEID_EXT=y | ||
589 | CONFIG_FEATURE_VOLUMEID_BTRFS=y | ||
590 | CONFIG_FEATURE_VOLUMEID_REISERFS=y | ||
591 | CONFIG_FEATURE_VOLUMEID_FAT=y | ||
592 | # CONFIG_FEATURE_VOLUMEID_HFS is not set | ||
593 | # CONFIG_FEATURE_VOLUMEID_JFS is not set | ||
594 | CONFIG_FEATURE_VOLUMEID_XFS=y | ||
595 | CONFIG_FEATURE_VOLUMEID_NTFS=y | ||
596 | CONFIG_FEATURE_VOLUMEID_ISO9660=y | ||
597 | CONFIG_FEATURE_VOLUMEID_UDF=y | ||
598 | CONFIG_FEATURE_VOLUMEID_LUKS=y | ||
599 | CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y | ||
600 | CONFIG_FEATURE_VOLUMEID_CRAMFS=y | ||
601 | # CONFIG_FEATURE_VOLUMEID_ROMFS is not set | ||
602 | # CONFIG_FEATURE_VOLUMEID_SYSV is not set | ||
603 | CONFIG_FEATURE_VOLUMEID_OCFS2=y | ||
604 | CONFIG_FEATURE_VOLUMEID_LINUXRAID=y | ||
601 | 605 | ||
602 | # | 606 | # |
603 | # Miscellaneous Utilities | 607 | # Miscellaneous Utilities |