update to latest upstream, cleanup makefile

package/busybox/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.21.1
-PKG_RELEASE:=		7
-PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
+PKG_VERSION:=		1.22.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		337d1a15ab1cb1d4ed423168b1eb7d7e
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		core
 PKG_BUILDDEP:=		bzip2-host
@@ -15,33 +15,20 @@ PKG_SITES:=		http://www.busybox.net/downloads/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-PKG_SUBPKGS:=		BUSYBOX UDHCPD
-PKGSD_UDHCPD:=		uDHCPD meta package
-PKGSC_UDHCPD:=		net
-
 include $(TOPDIR)/mk/package.mk
 
 $(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:
-#|for c in $(find build_viprinux_arm_glibc/w-busybox-1.18.1-4/busybox-1.18.1/ -name Config.in); do
-#|	c=$(sed s,build_viprinux_arm_glibc/w-busybox-1.18.1-4/busybox-1.18.1/,, <<< $c)
-#|	mkdir -p package/busybox/config_new/$(dirname $c)
-#|	cp build_viprinux_arm_glibc/w-busybox-1.18.1-4/busybox-1.18.1/$c package/busybox/config_new/$c
-#|done
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-BB_MAKE_FLAGS:=		V=1 IPKG_ARCH="${CPU_ARCH}" \
+BB_MAKE_FLAGS:=		V=1 \
 			ARCH="${ARCH}" \
-			GCC_HONOUR_COPTS=s \
+			IPKG_ARCH="${CPU_ARCH}" \
 			HOSTCC="${CC_FOR_BUILD}" \
 			HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
-			CROSS_COMPILE="$(TARGET_CROSS)" \
-			-C ${WRKBUILD} 
+			CROSS_COMPILE="$(TARGET_CROSS)"
 
 do-configure:
 	# get all symbols from top level config
@@ -55,10 +42,10 @@ do-configure:
 		cp ${WRKBUILD}/.config.tmp ${WRKBUILD}/.config; \
 	done
 	$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
-	yes '' | PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} oldconfig $(MAKE_TRACE)
+	yes '' | PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} oldconfig $(MAKE_TRACE)
 
 do-build:
-	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} busybox
+	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} busybox
 
 BBDEFS:=(
 define BBDEF
@@ -71,7 +58,7 @@ endef
 $(foreach OPTION,CROND WATCHDOG SYSLOGD INETD NTPD,$(eval $(call BBDEF,$(OPTION))))
 
 do-install:
-	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} install $(MAKE_TRACE)
+	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} install $(MAKE_TRACE)
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 	$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc
 	${BBDEFS} :) >$(IDIR_BUSYBOX)/etc/.bb_defaults
@@ -87,8 +74,4 @@ ifneq ($(strip ${ADK_PACKAGE_CFGFS}),)
 	cd ${IDIR_BUSYBOX}/sbin && rm -f halt poweroff reboot
 endif
 
-udhcpd-install:
-	${INSTALL_DIR} ${IDIR_UDHCPD}/etc/
-	${INSTALL_DATA} ./files/udhcpd.conf ${IDIR_UDHCPD}/etc/
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/busybox/patches/003-defaults.patch

@@ -1,259 +0,0 @@
-diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src
---- busybox-1.20.2.orig//archival/Config.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/Config.src	2012-08-28 11:52:12.000000000 +0200
-@@ -79,7 +79,7 @@
- 
- config BUNZIP2
- 	bool "bunzip2"
--	default y
-+	default n
- 	help
- 	  bunzip2 is a compression utility using the Burrows-Wheeler block
- 	  sorting text compression algorithm, and Huffman coding. Compression
-@@ -92,7 +92,7 @@
- 
- config BZIP2
- 	bool "bzip2"
--	default y
-+	default n
- 	help
- 	  bzip2 is a compression utility using the Burrows-Wheeler block
- 	  sorting text compression algorithm, and Huffman coding. Compression
-@@ -105,7 +105,7 @@
- 
- config CPIO
- 	bool "cpio"
--	default y
-+	default n
- 	help
- 	  cpio is an archival utility program used to create, modify, and
- 	  extract contents from archives.
-@@ -216,19 +216,19 @@
- 
- config RPM2CPIO
- 	bool "rpm2cpio"
--	default y
-+	default n
- 	help
- 	  Converts a RPM file into a CPIO archive.
- 
- config RPM
- 	bool "rpm"
--	default y
-+	default n
- 	help
- 	  Mini RPM applet - queries and extracts RPM packages.
- 
- config TAR
- 	bool "tar"
--	default y
-+	default n
- 	help
- 	  tar is an archiving program. It's commonly used with gzip to
- 	  create compressed archives. It's probably the most widely used
-@@ -335,7 +335,7 @@
- 
- config UNLZMA
- 	bool "unlzma"
--	default y
-+	default n
- 	help
- 	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
- 	  compression algorithm, and range coding. Compression
-@@ -363,7 +363,7 @@
- 
- config UNXZ
- 	bool "unxz"
--	default y
-+	default n
- 	help
- 	  unxz is a unlzma successor.
- 
-diff -Nur busybox-1.20.2.orig//Config.in busybox-1.20.2/Config.in
---- busybox-1.20.2.orig//Config.in	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/Config.in	2012-08-28 11:52:12.000000000 +0200
-@@ -15,7 +15,7 @@
- 
- config DESKTOP
- 	bool "Enable options for full-blown desktop systems"
--	default y
-+	default n
- 	help
- 	  Enable options and features which are not essential.
- 	  Select this only if you plan to use busybox on full-blown
-@@ -32,7 +32,7 @@
- 
- config INCLUDE_SUSv2
- 	bool "Enable obsolete features removed before SUSv3"
--	default y
-+	default n
- 	help
- 	  This option will enable backwards compatibility with SuSv2,
- 	  specifically, old-style numeric options ('command -1 <file>')
-diff -Nur busybox-1.20.2.orig//editors/Config.src busybox-1.20.2/editors/Config.src
---- busybox-1.20.2.orig//editors/Config.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/editors/Config.src	2012-08-28 11:52:12.000000000 +0200
-@@ -31,7 +31,7 @@
- 
- config DIFF
- 	bool "diff"
--	default y
-+	default n
- 	help
- 	  diff compares two files or directories and outputs the
- 	  differences between them in a form that can be given to
-@@ -62,7 +62,7 @@
- 
- config SED
- 	bool "sed"
--	default y
-+	default n
- 	help
- 	  sed is used to perform text transformations on a file
- 	  or input from a pipeline.
-diff -Nur busybox-1.20.2.orig//editors/patch.c busybox-1.20.2/editors/patch.c
---- busybox-1.20.2.orig//editors/patch.c	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/editors/patch.c	2012-08-28 11:52:12.000000000 +0200
-@@ -24,7 +24,7 @@
- 
- //config:config PATCH
- //config:	bool "patch"
--//config:	default y
-+//config:	default n
- //config:	help
- //config:	  Apply a unified diff formatted patch.
- 
-diff -Nur busybox-1.20.2.orig//findutils/find.c busybox-1.20.2/findutils/find.c
---- busybox-1.20.2.orig//findutils/find.c	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/findutils/find.c	2012-08-28 11:52:12.000000000 +0200
-@@ -55,7 +55,7 @@
- 
- //config:config FIND
- //config:	bool "find"
--//config:	default y
-+//config:	default n
- //config:	help
- //config:	  find is used to search your system to find specified files.
- //config:
-diff -Nur busybox-1.20.2.orig//findutils/grep.c busybox-1.20.2/findutils/grep.c
---- busybox-1.20.2.orig//findutils/grep.c	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/findutils/grep.c	2012-08-28 11:52:12.000000000 +0200
-@@ -26,7 +26,7 @@
- 
- //config:config GREP
- //config:	bool "grep"
--//config:	default y
-+//config:	default n
- //config:	help
- //config:	  grep is used to search files for a specified pattern.
- //config:
-diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/applets.src.h
---- busybox-1.20.2.orig//include/applets.src.h	2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/include/applets.src.h	2012-08-28 11:52:12.000000000 +0200
-@@ -242,9 +242,9 @@
- IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
- IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
--IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
-+//IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
- IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo))
--IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
-+//IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
- //IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext3))
- IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix))
- IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, BB_DIR_SBIN, BB_SUID_DROP, mkfs_reiser))
-diff -Nur busybox-1.20.2.orig//miscutils/Config.src busybox-1.20.2/miscutils/Config.src
---- busybox-1.20.2.orig//miscutils/Config.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/miscutils/Config.src	2012-08-28 11:52:12.000000000 +0200
-@@ -362,7 +362,7 @@
- 
- config HDPARM
- 	bool "hdparm"
--	default y
-+	default n
- 	select PLATFORM_LINUX
- 	help
- 	  Get/Set hard drive parameters. Primarily intended for ATA
-@@ -600,7 +600,7 @@
- 
- config WATCHDOG
- 	bool "watchdog"
--	default y
-+	default n
- 	select PLATFORM_LINUX
- 	help
- 	  The watchdog utility is used with hardware or software watchdog
-diff -Nur busybox-1.20.2.orig//networking/Config.src busybox-1.20.2/networking/Config.src
---- busybox-1.20.2.orig//networking/Config.src	2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/networking/Config.src	2012-08-28 11:52:12.000000000 +0200
-@@ -64,7 +64,7 @@
- 
- config BRCTL
- 	bool "brctl"
--	default y
-+	default n
- 	select PLATFORM_LINUX
- 	help
- 	  Manage ethernet bridges.
-@@ -97,7 +97,7 @@
- 
- config ETHER_WAKE
- 	bool "ether-wake"
--	default y
-+	default n
- 	select PLATFORM_LINUX
- 	help
- 	  Send a magic packet to wake up sleeping machines.
-@@ -506,7 +506,7 @@
- 
- config IP
- 	bool "ip"
--	default y
-+	default n
- 	select PLATFORM_LINUX
- 	help
- 	  The "ip" applet is a TCP/IP interface configuration and routing
-@@ -943,7 +943,7 @@
- 
- config WGET
- 	bool "wget"
--	default y
-+	default n
- 	help
- 	  wget is a utility for non-interactive download of files from HTTP,
- 	  HTTPS, and FTP servers.
-diff -Nur busybox-1.20.2.orig//util-linux/Config.src busybox-1.20.2/util-linux/Config.src
---- busybox-1.20.2.orig//util-linux/Config.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/util-linux/Config.src	2012-08-28 11:52:12.000000000 +0200
-@@ -246,13 +246,6 @@
- 	  check for and attempt to repair any corruption that occurs to a minix
- 	  filesystem.
- 
--config MKFS_EXT2
--	bool "mkfs_ext2"
--	default y
--	select PLATFORM_LINUX
--	help
--	  Utility to create EXT2 filesystems.
--
- config MKFS_MINIX
- 	bool "mkfs_minix"
- 	default y
-@@ -386,7 +379,7 @@
- 
- config LSPCI
- 	bool "lspci"
--	default y
-+	default n
- 	#select PLATFORM_LINUX
- 	help
- 	  lspci is a utility for displaying information about PCI buses in the
-@@ -396,7 +389,7 @@
- 
- config LSUSB
- 	bool "lsusb"
--	default y
-+	default n
- 	#select PLATFORM_LINUX
- 	help
- 	  lsusb is a utility for displaying information about USB buses in the

package/busybox/patches/003-disable-cflags.patch

@@ -0,0 +1,22 @@
+diff -Nur busybox-1.22.1.orig/Makefile.flags busybox-1.22.1/Makefile.flags
+--- busybox-1.22.1.orig/Makefile.flags	2014-01-09 19:15:44.000000000 +0100
++++ busybox-1.22.1/Makefile.flags	2014-05-23 21:31:04.000000000 +0200
+@@ -61,18 +61,6 @@
+ # be fixed..
+ #CFLAGS += $(call cc-option,-Wconversion,)
+ 
+-ifneq ($(CONFIG_DEBUG),y)
+-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+-else
+-CFLAGS += $(call cc-option,-g,)
+-#CFLAGS += "-D_FORTIFY_SOURCE=2"
+-ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
+-CFLAGS += $(call cc-option,-O0,)
+-else
+-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+-endif
+-endif
+-
+ # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
+ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie

package/busybox/patches/013-musl.patch

@@ -1,11 +0,0 @@
-diff -Nur busybox-1.20.2.orig/networking/libiproute/iplink.c busybox-1.20.2/networking/libiproute/iplink.c
---- busybox-1.20.2.orig/networking/libiproute/iplink.c	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/networking/libiproute/iplink.c	2013-08-12 13:00:33.000000000 +0200
-@@ -5,7 +5,6 @@
-  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-  */
- #include <net/if.h>
--#include <net/if_packet.h>
- #include <netpacket/packet.h>
- #include <netinet/if_ether.h>
- 

package/busybox/patches/015-path_h_musl.patch

@@ -1,11 +0,0 @@
-diff -Nur busybox-1.20.2.orig/networking/ifplugd.c busybox-1.20.2/networking/ifplugd.c
---- busybox-1.20.2.orig/networking/ifplugd.c	2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/networking/ifplugd.c	2013-09-22 11:43:24.000000000 +0200
-@@ -34,6 +34,7 @@
- #include "libbb.h"
- 
- #include "fix_u32.h"
-+#include <paths.h>
- #include <linux/if.h>
- #include <linux/mii.h>
- #include <linux/ethtool.h>

package/busybox/patches/016-fix-musl-warning.patch

@@ -1,12 +0,0 @@
-diff -Nur busybox-1.21.1.orig/include/libbb.h busybox-1.21.1/include/libbb.h
---- busybox-1.21.1.orig/include/libbb.h	2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/libbb.h	2013-11-02 16:55:04.000000000 +0100
-@@ -37,7 +37,7 @@
- #include <libgen.h> /* dirname,basename */
- #undef basename
- #define basename dont_use_basename
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/socket.h>