diff options
| -rw-r--r-- | Config.in | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 4 | ||||
| -rw-r--r-- | package/busybox/config/coreutils/Config.in | 4 | ||||
| -rw-r--r-- | target/Config.in | 6 |
4 files changed, 11 insertions, 5 deletions
@@ -53,6 +53,8 @@ config ADK_DEVELSYSTEM select ADK_PACKAGE_MICROPERL select ADK_PACKAGE_TAR select ADK_PACKAGE_TSORT + select BUSYBOX_TR + select BUSYBOX_FEATURE_TR_CLASSES select ADK_PACKAGE_ZLIB select ADK_PACKAGE_ZLIB_DEV select ADK_PACKAGE_XZ diff --git a/mk/vars.mk b/mk/vars.mk index 4ebc1ebf6..d1db19759 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -118,11 +118,11 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ - gzip -dc $$file | cpio -i -d ;; \ + gzip -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ - bzip2 -dc $$file | cpio -i -d ;; \ + bzip2 -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index edccc86d0..e22c7d566 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -727,7 +727,7 @@ config BUSYBOX_TR config BUSYBOX_FEATURE_TR_CLASSES bool "Enable character classes (such as [:upper:])" - default n + default y depends on BUSYBOX_TR help Enable character classes, enabling commands such as: @@ -735,7 +735,7 @@ config BUSYBOX_FEATURE_TR_CLASSES config BUSYBOX_FEATURE_TR_EQUIV bool "Enable equivalence classes" - default n + default y depends on BUSYBOX_TR help Enable equivalence classes, which essentially add the enclosed diff --git a/target/Config.in b/target/Config.in index 4d93ece16..9d4b352f5 100644 --- a/target/Config.in +++ b/target/Config.in @@ -201,12 +201,15 @@ config ADK_eglibc config ADK_glibc tristate +config ADK_libc + tristate + config ADK_LIBC string default "uclibc" if ADK_uclibc default "eglibc" if ADK_eglibc default "glibc" if ADK_glibc - default "native" if ADK_NATIVE + default "libc" if ADK_libc menu "Target system" choice @@ -231,6 +234,7 @@ default ADK_LINUX_X86 config ADK_LINUX_NATIVE bool "native build" + select ADK_libc select ADK_NATIVE select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB |