From 693f37195ae262dfccdfbb304be38f8399551bef Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Mon, 2 Apr 2012 11:41:42 +0200 Subject: busybox: Add Android.mk to 1.19 branch Re-add Android.mk after pulling in upstream 1_19_stable branch Signed-off-by: Bernhard Rosenkraenzer --- Android.mk | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Android.mk diff --git a/Android.mk b/Android.mk new file mode 100644 index 000000000..77df92efd --- /dev/null +++ b/Android.mk @@ -0,0 +1,26 @@ +include $(CLEAR_VARS) + +BB_TC_DIR := $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX))) +BB_TC_PREFIX := $(shell basename $(TARGET_TOOLS_PREFIX)) +BB_LDFLAGS := -Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker -T../../$(BUILD_SYSTEM)/armelf.x -Xlinker -dynamic-linker -Xlinker /system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined ../../$(TARGET_CRTBEGIN_DYNAMIC_O) ../../$(TARGET_CRTEND_O) -L../../$(TARGET_OUT_STATIC_LIBRARIES) +# FIXME remove -fno-strict-aliasing once all aliasing violations are fixed +BB_COMPILER_FLAGS := $(subst -I ,-I../../,$(subst -include ,-include ../../,$(TARGET_GLOBAL_CFLAGS))) -I../../bionic/libc/include -I../../bionic/libc/kernel/common -I../../bionic/libc/arch-arm/include -I../../bionic/libc/kernel/arch-arm -I../../bionic/libm/include -fno-stack-protector -Wno-error=format-security -fno-strict-aliasing +BB_LDLIBS := dl m c gcc +ifneq ($(strip $(SHOW_COMMANDS)),) +BB_VERBOSE="V=1" +endif + +.PHONY: busybox + +droid: busybox + +systemtarball: busybox + +busybox: $(TARGET_CRTBEGIN_DYNAMIC_O) $(TARGET_CRTEND_O) $(TARGET_OUT_STATIC_LIBRARIES)/libm.so $(TARGET_OUT_STATIC_LIBRARIES)/libc.so $(TARGET_OUT_STATIC_LIBRARIES)/libdl.so + cd external/busybox && \ + sed -e "s|^CONFIG_CROSS_COMPILER_PREFIX=.*|CONFIG_CROSS_COMPILER_PREFIX=\"$(BB_TC_PREFIX)\"|;s|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS=\"$(BB_COMPILER_FLAGS)\"|" configs/android_defconfig >.config && \ + export PATH=$(BB_TC_DIR):$(PATH) && \ + $(MAKE) oldconfig && \ + $(MAKE) $(BB_VERBOSE) EXTRA_LDFLAGS="$(BB_LDFLAGS)" LDLIBS="$(BB_LDLIBS)" && \ + mkdir -p ../../$(PRODUCT_OUT)/system/bin && \ + cp busybox ../../$(PRODUCT_OUT)/system/bin/ -- cgit v1.2.3 From acdfaff665699cac64391d2b54c92b7fbe6790f7 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Mon, 2 Apr 2012 11:44:25 +0200 Subject: busybox: Pull in Linaro changes to android_defconfig Signed-off-by: Bernhard Rosenkraenzer Conflicts: configs/android_defconfig --- configs/android_defconfig | 56 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/configs/android_defconfig b/configs/android_defconfig index a9a8d5e1f..fe39d203a 100644 --- a/configs/android_defconfig +++ b/configs/android_defconfig @@ -110,18 +110,19 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_SYSTEMD is not set # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 CONFIG_MD5_SMALL=1 # CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y # CONFIG_FEATURE_EDITING is not set CONFIG_FEATURE_EDITING_MAX_LEN=0 -# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_VI=y CONFIG_FEATURE_EDITING_HISTORY=0 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -# CONFIG_FEATURE_REVERSE_SEARCH is not set -# CONFIG_FEATURE_TAB_COMPLETION is not set +CONFIG_FEATURE_REVERSE_SEARCH=y +CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set @@ -158,6 +159,7 @@ CONFIG_DPKG_DEB=y # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y +CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set CONFIG_GZIP_FAST=0 CONFIG_LZOP=y @@ -421,7 +423,7 @@ CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_CONTEXT=y CONFIG_FEATURE_FIND_LINKS=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y @@ -740,7 +742,7 @@ CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set CONFIG_PING=y -# CONFIG_PING6 is not set +CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y CONFIG_WHOIS=y # CONFIG_FEATURE_IPV6 is not set @@ -843,10 +845,11 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y # CONFIG_TFTP_DEBUG is not set CONFIG_TRACEROUTE=y -# CONFIG_TRACEROUTE6 is not set +CONFIG_TRACEROUTE6=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y # CONFIG_UDHCPC6 is not set @@ -907,7 +910,7 @@ CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y CONFIG_FUSER=y -# CONFIG_KILL is not set +CONFIG_KILL=y # CONFIG_KILLALL is not set # CONFIG_KILLALL5 is not set # CONFIG_PGREP is not set @@ -916,11 +919,11 @@ CONFIG_FEATURE_PIDOF_SINGLE=y CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_LONG=y CONFIG_FEATURE_PS_TIME=y CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y CONFIG_RENICE=y CONFIG_BB_SYSCTL=y CONFIG_TOP=y @@ -931,6 +934,7 @@ CONFIG_FEATURE_TOP_DECIMALS=y CONFIG_FEATURE_TOP_SMP_PROCESS=y CONFIG_FEATURE_TOPMEM=y CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_UPTIME=y CONFIG_WATCH=y # @@ -966,20 +970,20 @@ CONFIG_SOFTLIMIT=y # # Shells # -# CONFIG_ASH is not set -# CONFIG_ASH_BASH_COMPAT is not set -# CONFIG_ASH_IDLE_TIMEOUT is not set -# CONFIG_ASH_JOB_CONTROL is not set -# CONFIG_ASH_ALIAS is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_BUILTIN_PRINTF is not set -# CONFIG_ASH_BUILTIN_TEST is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_IDLE_TIMEOUT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set -- cgit v1.2.3 From 4edad34456b911fe504342fa48120a557727c349 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Fri, 21 Oct 2011 11:46:48 +0159 Subject: busybox: Allow lines in .config to be > 1024 characters With the new compiler flags added, the CONFIG_EXTRA_CFLAGS parameter in .config can become larger than 1024 characters, resulting in a parse error. This patch allows lines up to 4096 characters, that should be enough even after adding some more flags. Signed-off-by: Bernhard Rosenkraenzer --- scripts/kconfig/confdata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index bd2d70e19..1a75d3459 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -87,7 +87,7 @@ char *conf_get_default_confname(void) int conf_read_simple(const char *name) { FILE *in = NULL; - char line[1024]; + char line[4096]; char *p, *p2; struct symbol *sym; int i; -- cgit v1.2.3 From 569e148827f8a0b562a3edd30246dd3cdfbad771 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Thu, 12 Jul 2012 22:59:04 +0159 Subject: busybox: Don't use -Tarmelf.x on JellyBean Change-Id: I6c7fdc5f261cd3a44eff3ad7c85235fd6e3170e8 Signed-off-by: Bernhard Rosenkraenzer --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 77df92efd..29cae51cd 100644 --- a/Android.mk +++ b/Android.mk @@ -2,7 +2,7 @@ include $(CLEAR_VARS) BB_TC_DIR := $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX))) BB_TC_PREFIX := $(shell basename $(TARGET_TOOLS_PREFIX)) -BB_LDFLAGS := -Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker -T../../$(BUILD_SYSTEM)/armelf.x -Xlinker -dynamic-linker -Xlinker /system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined ../../$(TARGET_CRTBEGIN_DYNAMIC_O) ../../$(TARGET_CRTEND_O) -L../../$(TARGET_OUT_STATIC_LIBRARIES) +BB_LDFLAGS := -Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker $(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -e '-T../../$(BUILD_SYSTEM)/armelf.x'; fi) -Xlinker -dynamic-linker -Xlinker /system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined ../../$(TARGET_CRTBEGIN_DYNAMIC_O) ../../$(TARGET_CRTEND_O) -L../../$(TARGET_OUT_STATIC_LIBRARIES) # FIXME remove -fno-strict-aliasing once all aliasing violations are fixed BB_COMPILER_FLAGS := $(subst -I ,-I../../,$(subst -include ,-include ../../,$(TARGET_GLOBAL_CFLAGS))) -I../../bionic/libc/include -I../../bionic/libc/kernel/common -I../../bionic/libc/arch-arm/include -I../../bionic/libc/kernel/arch-arm -I../../bionic/libm/include -fno-stack-protector -Wno-error=format-security -fno-strict-aliasing BB_LDLIBS := dl m c gcc -- cgit v1.2.3