diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 09:11:48 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 09:11:48 +0100 |
| commit | 607c3fcd1d10a37c077c870df450b5389fb519bf (patch) | |
| tree | 9c7c0e209d6373efe2296e379c63c29d27a8847b /package/busybox | |
| parent | c16eb800d935d903d2ab38b3da8270324284e973 (diff) | |
| parent | f42fb988bae9d402b0b204614b54ba9b4261d877 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/Makefile | 8 | ||||
| -rw-r--r-- | package/busybox/config/shell/Config.in | 2 | ||||
| -rw-r--r-- | package/busybox/files/syslog.init | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index d4184a37a..c1923708e 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.21.1 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base @@ -36,12 +36,8 @@ INSTALL_STYLE:= manual BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \ HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ + CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' \ -C ${WRKBUILD} -ifneq (${ADK_NATIVE},y) -BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' -else -BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc" -endif do-configure: # get all symbols from top level config diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 52a96c7e2..488041e22 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -8,7 +8,7 @@ menu "Shells" config BUSYBOX_ASH bool "ash" - default y + default n depends on !BUSYBOX_NOMMU help Tha 'ash' shell adds about 60k in the default configuration and is diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init index 7a84815a6..7a85430ca 100644 --- a/package/busybox/files/syslog.init +++ b/package/busybox/files/syslog.init @@ -11,10 +11,14 @@ autostart) ;; start) /sbin/syslogd $syslogd_flags - /sbin/klogd + if [ -f /proc/sys/kernel/printk ];then + /sbin/klogd + fi ;; stop) - kill $(pgrep -f /sbin/klogd) + if [ -f /proc/sys/kernel/printk ];then + kill $(pgrep -f /sbin/klogd) + fi kill $(pgrep -f /sbin/syslogd) ;; restart) |