allow to hide packages, which are provided by busybox applets

26 files changed, 49 insertions, 27 deletions

diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index aa7f1d5fb..28e74dad1 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -322,7 +322,7 @@ int main() {
 	char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd;
 	char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_section, *pkg_descr, *pkg_url;
 	char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt;
-	char *pkgname, *sysname, *pkg_debug;
+	char *pkgname, *sysname, *pkg_debug, *pkg_bb;
 	char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
 	char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
 	char *saveptr, *p_ptr, *s_ptr, *pkg_helper, *sname, *sname2;
@@ -353,6 +353,7 @@ int main() {
 	sysname = NULL;
 	pkg_helper = NULL;
 	pkg_debug = NULL;
+	pkg_bb = NULL;
 
 	p_ptr = NULL;
 	s_ptr = NULL;
@@ -553,6 +554,8 @@ int main() {
 						continue;
 					if ((parse_var(buf, "PKG_CXX", NULL, &pkg_cxx)) == 0)
 						continue;
+					if ((parse_var(buf, "PKG_BB", NULL, &pkg_bb)) == 0)
+						continue;
 					if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0)
 						continue;
 					if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_system, &pkg_depends_system, &sysname, 12)) == 0)
@@ -724,6 +727,11 @@ int main() {
 				if (cfg == NULL)
 					perror("Can not open Config.in file");
 
+				if (pkg_bb != NULL) {
+					fprintf(cfg, "comment \"%s... %s (disabled, provided by busybox)\"\n", token, pkg_descr);
+					fprintf(cfg, "depends on ADK_PACKAGE_BUSYBOX_HIDE\n\n");
+				}
+
 				/* save token in pkg_debug */
 				pkg_debug = strdup(token);
 				fprintf(cfg, "config ADK_PACKAGE_%s\n", toupperstr(token));
@@ -883,6 +891,9 @@ int main() {
 					pkg_depends_system = NULL;
 				}
 
+				if (pkg_bb != NULL) {
+					fprintf(cfg, "\tdepends on !ADK_PACKAGE_BUSYBOX_HIDE\n");
+				}
 				fprintf(cfg, "\tselect ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name));
 
 				if (pkg_dflt != NULL) {
@@ -1159,6 +1170,7 @@ int main() {
 			free(pkg_cxx);
 			free(pkg_dflt);
 			free(pkg_cfline);
+			free(pkg_bb);
 			pkg_name = NULL;
 			pkg_libname = NULL;
 			pkg_descr = NULL;
@@ -1176,6 +1188,7 @@ int main() {
 			pkg_cxx = NULL;
 			pkg_dflt = NULL;
 			pkg_cfline = NULL;
+			pkg_bb = NULL;
 
 			strmap_delete(pkgmap);
 			nobinpkgs = 0;
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 9fec7c28a..38f5ee38f 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		bridge
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Bridge
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index 829a0d82f..a037749ae 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -16,7 +16,8 @@ config ADK_PACKAGE_BUSYBOX
 config ADK_PACKAGE_BUSYBOX_HIDE
 	prompt "hide packages provided by busybox applets"
 	boolean
-	default y
+	depends on ADK_PACKAGE_BUSYBOX
+	default n
 	help
 	  Do not show packages which are provided as busybox applets
 
@@ -48,12 +49,6 @@ config BUSYBOX_DISABLE_TAR
 	depends on ADK_PACKAGE_TAR
 	default n
 
-config BUSYBOX_DISABLE_RPM
-	boolean
-	default y if ADK_PACKAGE_RPM
-	depends on ADK_PACKAGE_RPM
-	default n
-
 config BUSYBOX_DISABLE_BZIP2
 	boolean
 	default y if ADK_PACKAGE_BZIP2
@@ -162,12 +157,6 @@ config BUSYBOX_DISABLE_UNXZ
 	depends on ADK_PACKAGE_XZ
 	default n
 
-config BUSYBOX_DISABLE_UNZIP
-	boolean
-	default y if ADK_PACKAGE_UNZIP
-	depends on ADK_PACKAGE_UNZIP
-	default n
-
 config BUSYBOX_DISABLE_FBSET
 	boolean
 	default y if ADK_PACKAGE_FBSET
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index da0a3609a..0dca61217 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		bzip2
 PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		00b516f4704d4a7cb50a1d97e6e8e15b
-PKG_DESCR:=		bzip2 compression utility
+PKG_DESCR:=		compression utility
 PKG_SECTION:=		archive
 PKG_BUILDDEP:=		bzip2-host
 PKG_DEPENDS:=		libbz2
@@ -15,6 +15,7 @@ PKG_URL:=		http://www.bzip.org/
 PKG_SITES:=		http://www.bzip.org/${PKG_VERSION}/
 PKG_LIBNAME:=		libbz2
 PKG_OPTS:=		dev
+PKG_BB:=		1
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 1bbdbc6aa..855e99a1e 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		coreutils
 PKG_VERSION:=		8.22
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		8fb0ae2267aa6e728958adc38f8163a2
-PKG_DESCR:=		basic file, shell and text manipulation utilities (also provided by busybox)
+PKG_DESCR:=		basic file, shell and text manipulation utilities
 PKG_SECTION:=		core
 PKG_BUILDDEP:=		gmp autotool
 PKG_URL:=		http://www.gnu.org/software/coreutils/
diff --git a/package/cpio/Makefile b/package/cpio/Makefile
index da9148cc0..cbe8cc380 100644
--- a/package/cpio/Makefile
+++ b/package/cpio/Makefile
@@ -7,10 +7,11 @@ PKG_NAME:=		cpio
 PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1112bb6c45863468b5496ba128792f6c
-PKG_DESCR:=		cpio archive utility
+PKG_DESCR:=		archive utility
 PKG_SECTION:=		archive
 PKG_URL:=		http://www.gnu.org/software/cpio/
 PKG_SITES:=		${MASTER_SITE_GNU:=cpio/}
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index cc0e4f17a..d0502b60a 100644
--- a/package/diffutils/Makefile
+++ b/package/diffutils/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		show differences between two files
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/diffutils/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/ed/Makefile b/package/ed/Makefile
index 1c991a9cd..70a4a5d3f 100644
--- a/package/ed/Makefile
+++ b/package/ed/Makefile
@@ -10,7 +10,8 @@ PKG_MD5SUM:=		e66c03d7e4c67b025d5b6093ec678267
 PKG_DESCR:=		unix editor
 PKG_SECTION:=		editor
 PKG_URL:=		http://www.gnu.org/software/ed/ed.html
-PKG_SITES:=		http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ed/
+PKG_SITES:=		${MASTER_SITE_GNU:=ed/}
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index 55f62d9c7..9e82c316d 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -6,8 +6,9 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ether-wake
 PKG_VERSION:=		1.09
 PKG_RELEASE:=		1
-PKG_DESCR:=		A Wake-On-LAN (WOL) client
+PKG_DESCR:=		Wake-On-LAN (WOL) client
 PKG_SECTION:=		net
+PKG_BB:=		1
 
 PKG_LIBC_DEPENDS:=	uclibc glibc
 
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index 08011aafb..7aa761ddf 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		framebuffer utility
 PKG_DEPENDS:=		bison-host flex-host
 PKG_SECTION:=		utils
 PKG_SITES:=		http://users.telenet.be/geertu/Linux/fbdev/
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 8c4350522..93f0d3d9c 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
 PKG_RELEASE:=		6
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
-PKG_DESCR:=		utilities for finding files (also provided by busybox)
+PKG_DESCR:=		utilities for finding files
 PKG_SECTION:=		core
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		autotool
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index 1ae20cbc9..f1a5386e7 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -7,10 +7,11 @@ PKG_NAME:=		gawk
 PKG_VERSION:=		4.1.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a2a26543ce410eb74bc4a508349ed09a
-PKG_DESCR:=		GNU awk
+PKG_DESCR:=		AWK programming language interpreter
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/gawk/
 PKG_SITES:=		${MASTER_SITE_GNU:=gawk/}
+PKG_BB:=		1
 
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
diff --git a/package/grep/Makefile b/package/grep/Makefile
index d518ee48e..df89f4040 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		pcre
 PKG_URL:=		http://www.gnu.org/software/grep/
 PKG_SITES:=		ftp://ftp.gnu.org/gnu/grep/
 PKG_NOPARALLEL:=	1
+PKG_BB:=		1
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/gzip/Makefile b/package/gzip/Makefile
index 81326fbd8..c7c09b9c5 100644
--- a/package/gzip/Makefile
+++ b/package/gzip/Makefile
@@ -7,10 +7,11 @@ PKG_NAME:=		gzip
 PKG_VERSION:=		1.2.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		618b61219aa2d812893281bf6c66f158
-PKG_DESCR:=		GZIP compression utility
+PKG_DESCR:=		compression utility
 PKG_SECTION:=		archive
 PKG_URL:=		http://www.gzip.org/
 PKG_SITES:=		${MASTER_SITE_GNU:=gzip/}
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index 9c1a758bf..6f2c9f2a8 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		get/set ATA/SATA drive parameters
 PKG_SECTION:=		fs
 PKG_URL:=		http://sourceforge.net/projects/hdparm
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=hdparm/}
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/less/Makefile b/package/less/Makefile
index a3b246a40..de2ac7732 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:=		libncurses
 PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.greenwoodsoftware.com/less/
 PKG_SITES:=		http://www.greenwoodsoftware.com/less/
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/lzop/Makefile b/package/lzop/Makefile
index 09ebad265..3f10aced8 100644
--- a/package/lzop/Makefile
+++ b/package/lzop/Makefile
@@ -7,13 +7,14 @@ PKG_NAME:=		lzop
 PKG_VERSION:=		1.03
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		006c5e27fb78cdd14a628fdfa5aa1905
-PKG_DESCR:=		LZO compression utility
+PKG_DESCR:=		compression utility
 PKG_SECTION:=		archive
 PKG_DEPENDS:=		liblzo
 PKG_BUILDDEP:=		liblzo
 HOST_BUILDDEP:=		liblzo-host
 PKG_URL:=		http://www.lzop.org/
 PKG_SITES:=		http://www.lzop.org/download/
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/pam/Makefile b/package/pam/Makefile
index d22a05fd7..68d038e06 100644
--- a/package/pam/Makefile
+++ b/package/pam/Makefile
@@ -13,6 +13,7 @@ PKG_SECTION:=		misc
 PKG_URL:=		http://www.linux-pam.org/
 PKG_SITES:=		http://www.linux-pam.org/library/
 PKG_OPTS:=		dev
+PKG_BB:=		1
 
 DISTFILES:=		Linux-PAM-$(PKG_VERSION).tar.gz
 WRKDIST=                ${WRKDIR}/Linux-PAM-${PKG_VERSION}
diff --git a/package/patch/Makefile b/package/patch/Makefile
index 44ad4e0e8..bdc55060f 100644
--- a/package/patch/Makefile
+++ b/package/patch/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		GNU patch utility
 PKG_SECTION:=		utils
 PKG_URL:=		http://www.gnu.org/software/patch/
 PKG_SITES:=		${MASTER_SITE_GNU:=patch/}
+PKG_BB:=		1
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index a085cd280..6dac7a769 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -7,12 +7,13 @@ PKG_NAME:=		pciutils
 PKG_VERSION:=		3.1.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		72ebc3624ccb43ae2ddf872b5dfdb3c9
-PKG_DESCR:=		PCI utilities
+PKG_DESCR:=		PCI utilities (lspci/setpci)
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.kernel.org/pub/software/utils/pciutils/
 PKG_SITES:=		http://www.kernel.org/pub/software/utils/pciutils/
+PKG_BB:=		1
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/rfkill/Makefile b/package/rfkill/Makefile
index a38b65135..a51b23148 100644
--- a/package/rfkill/Makefile
+++ b/package/rfkill/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		radio frequency kill utility
 PKG_SECTION:=		wifi
 PKG_URL:=		https://www.kernel.org/pub/software/network/rfkill/
 PKG_SITES:=		https://www.kernel.org/pub/software/network/rfkill/
+PKG_BB:=		1
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/sed/Makefile b/package/sed/Makefile
index e8c723eb2..95e170669 100644
--- a/package/sed/Makefile
+++ b/package/sed/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		stream editor
 PKG_SECTION:=		editor
 PKG_URL:=		http://www.gnu.org/software/sed/
 PKG_SITES:=		${MASTER_SITE_GNU:=sed/}
+PKG_BB:=		1
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/tar/Makefile b/package/tar/Makefile
index f227047cc..e63257fe2 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		archiving application
 PKG_SECTION:=		archive
 PKG_URL:=		http://mirrors.kernel.org/gnu/tar/
 PKG_SITES:=		http://mirrors.kernel.org/gnu/tar/
+PKG_BB:=		1
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index bcadb9182..7d0daeec5 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -12,8 +12,7 @@ PKG_SECTION:=		utils
 PKG_DEPENDS:=		libusb libusb-compat libpthread zlib librt
 PKG_BUILDDEP:=		libusb libusb-compat zlib
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/usb/usbutils/
-
-PKG_SUBPKGS:=		LSUSB
+PKG_BB:=		1
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/wget/Makefile b/package/wget/Makefile
index fcc74f30d..1757b64fa 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		www
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/wget/
 PKG_SITES:=		${MASTER_SITE_GNU:=wget/}
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/xz/Makefile b/package/xz/Makefile
index b95f0b28f..f17347cb7 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -7,11 +7,12 @@ PKG_NAME:=		xz
 PKG_VERSION:=		5.0.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		19d924e066b6fff0bc9d1981b4e53196
-PKG_DESCR:=		xz compression utility
+PKG_DESCR:=		compression utility
 PKG_SECTION:=		archive
 PKG_URL:=		http://tukaani.org/xz/
 PKG_SITES:=		http://tukaani.org/xz/
 PKG_OPTS:=		dev
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz