diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/busybox/Makefile | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox/Makefile')
| -rw-r--r-- | package/busybox/Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 4a8e8ea68..7941fff37 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.20.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= e025414bc6cd79579cc7a32a45d3ae1c -PKG_DESCR:= Core utilities for embedded systems +PKG_VERSION:= 1.21.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e +PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base PKG_URL:= http://www.busybox.net/ PKG_SITES:= http://www.busybox.net/downloads/ @@ -20,7 +20,7 @@ PKGSC_UDHCPD:= net 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,BUSYBOX,busybox,${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})) # This is how to extract the Config.in files from a _built_ busybox source tree: @@ -43,17 +43,17 @@ else BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc" endif -# XXX: Although this looks like all new symbols are enabled when 'make oldconfig' runs, they're not. -# In fact, you can pipe "yes ''" as well as "yes n", each time leading to the default value being -# chosen for each unknown symbol. -# A real solution for that task (disabling everything that's unknown, as we know better) is to -# upgrade ${TOPDIR}/config so it understands the oldnoconfig target, and using that to update -# the busybox config before compiling. -# The workaround for now is to patch all busybox symbols to default n inside the busybox source -# which do depend on non-existance of other packages outside the busybox source. do-configure: + # get all symbols from top level config grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \ ${WRKBUILD}/.config + # remove all disabled symbols + for i in $$(grep "BUSYBOX_DISABLE" $(TOPDIR)/.config);do \ + test -s "$$i" || continue; \ + grep -v $${i#BUSYBOX_DISABLE} ${WRKBUILD}/.config > \ + ${WRKBUILD}/.config.tmp; \ + cp ${WRKBUILD}/.config.tmp ${WRKBUILD}/.config; \ + done $(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config yes '' | $(MAKE) ${BB_MAKE_FLAGS} oldconfig $(MAKE_TRACE) |