diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/busybox | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (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/miscutils/Config.in | 11 | ||||
| -rw-r--r-- | package/busybox/patches/007-missing-headers.patch | 10 |
3 files changed, 23 insertions, 6 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 6145cb780..bcd582179 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.18.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base @@ -23,10 +23,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_UDHCPD}+= udhcpd-install - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -56,7 +52,7 @@ else IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index e28539204..bb7fb2aa7 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -547,6 +547,17 @@ config BUSYBOX_READAHEAD As readahead(2) blocks until each file has been read, it is best to run this applet as a background job. +config BUSYBOX_RFKILL + bool "rfkill" + default y # doesn't build on Ubuntu 9.04 + help + Enable/disable wireless devices. + + rfkill list : list all wireless devices + rfkill list bluetooth : list all bluetooth devices + rfkill list 1 : list device corresponding to the given index + rfkill block|unblock wlan : block/unblock all wlan(wifi) devices + config BUSYBOX_RUNLEVEL bool "runlevel" default n diff --git a/package/busybox/patches/007-missing-headers.patch b/package/busybox/patches/007-missing-headers.patch new file mode 100644 index 000000000..cba28970f --- /dev/null +++ b/package/busybox/patches/007-missing-headers.patch @@ -0,0 +1,10 @@ +--- busybox-1.18.1/include/platform.h~ Mon Dec 20 00:41:03 2010 ++++ busybox-1.18.1/include/platform.h Thu Jan 6 20:03:58 2011 +@@ -155,6 +155,7 @@ + # include <sex.h> + #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ + || defined(__APPLE__) ++# include <sys/param.h> /* contains needed types for the following */ + # include <sys/resource.h> /* rlimit */ + # include <machine/endian.h> + # define bswap_64 __bswap64 |