summaryrefslogtreecommitdiff
path: root/package/busybox/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-01-09 12:02:17 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-01-09 12:08:32 -0600
commit86098e08d81361365729c0d65ec320ac48269646 (patch)
tree49a64ac1d875387f8f40390a01e301e4a82cafeb /package/busybox/Makefile
parent2f6b24f42d1ab900fd29b03c0f8b1f15e0303b04 (diff)
update busybox to 2.23.0
add upstream patches. Fix the busybox disable mechanism. When you choose less or lsusb full blown version, be sure busybox applet is disabled.
Diffstat (limited to 'package/busybox/Makefile')
-rw-r--r--package/busybox/Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 05d9eea31..271ceb5b7 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= busybox
-PKG_VERSION:= 1.22.1
-PKG_RELEASE:= 2
-PKG_HASH:= ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b
+PKG_VERSION:= 1.23.0
+PKG_RELEASE:= 1
+PKG_HASH:= 483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base/apps
PKG_BUILDDEP:= bzip2-host
@@ -32,20 +32,20 @@ BB_MAKE_FLAGS:= V=1 \
do-configure:
# get all symbols from top level config
- grep BUSYBOX_ $(ADK_TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
+ grep "^BUSYBOX_\|# BUSYBOX" $(ADK_TOPDIR)/.config|grep -v BUSYBOX_DISABLE|sed -e 's/BUSYBOX_/CONFIG_/' > \
${WRKBUILD}/.config
- # remove all disabled symbols
- for i in $$(grep "BUSYBOX_DISABLE" $(ADK_TOPDIR)/.config);do \
- test -s "$$i" || continue; \
- grep -v $${i#BUSYBOX_DISABLE} ${WRKBUILD}/.config > \
- ${WRKBUILD}/.config.tmp; \
- cp ${WRKBUILD}/.config.tmp ${WRKBUILD}/.config; \
+ cp ${WRKBUILD}/.config ${WRKBUILD}/.config.step1
+ # convert all disabled symbols
+ for i in $$(grep ^BUSYBOX_DISABLE $(ADK_TOPDIR)/.config);do \
+ echo "$$i"; \
+ sym=$${i#BUSYBOX_DISABLE_}; \
+ symbol=$$(echo $$sym|sed -e "s#=y##"); \
+ printf "# CONFIG_$${symbol} is not set\n" >> ${WRKBUILD}/.config; \
done
ifeq ($(ADK_TARGET_UCLINUX),y)
- echo 'BUSYBOX_NOMMU=y' >> ${WRKBUILD}/.config
+ echo 'CONFIG_NOMMU=y' >> ${WRKBUILD}/.config
endif
$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
- yes '' | PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} oldconfig $(MAKE_TRACE)
do-build:
PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} busybox