Merge branch 'master' of git+ssh://openadk.org/git/openadk

87 files changed, 6213 insertions, 291 deletions

diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index fba5ee1a2..e5870f331 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -71,7 +71,7 @@ endif
 	touch $@
 
 # do a parallel build if requested && package doesn't force disable it
-ifeq (${PKG_BUILD_PARALLEL},y)
+ifeq (${ADK_MAKE_PARALLEL},y)
 ifeq ($(strip ${PKG_NOPARALLEL}),)
 MAKE_FLAGS+=		-j${ADK_MAKE_JOBS}
 endif
diff --git a/package/Config.in b/package/Config.in
index 08dbd2fa9..1fd7c6559 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -9,6 +9,7 @@ menu "Basesystem"
 source "package/base-files/Config.in"
 source "package/busybox/Config.in"
 source "package/cfgfs/Config.in"
+source "package/cfinstall/Config.in"
 source "package/cryptinit/Config.in"
 source "package/uclibc/Config.in"
 source "package/glibc/Config.in"
@@ -94,6 +95,7 @@ source "package/sane-backends/Config.in"
 source "package/screen/Config.in"
 source "package/scsi-spin/Config.in"
 source "package/ser2net/Config.in"
+source "package/sqlite/Config.in"
 source "package/syslog-ng/Config.in"
 source "package/tar/Config.in"
 source "package/xz/Config.in"
@@ -201,6 +203,7 @@ source "package/updatedd/Config.in"
 endmenu
 
 menu "HTTP / FTP"
+source "package/curl/Config.in"
 source "package/gatling/Config.in"
 source "package/lighttpd/Config.in"
 source "package/mini_httpd/Config.in"
@@ -365,7 +368,6 @@ source "package/autoconf/Config.in"
 source "package/automake/Config.in"
 source "package/binutils/Config.in"
 source "package/bison/Config.in"
-source "package/cxxtools/Config.in"
 source "package/diffutils/Config.in"
 source "package/flex/Config.in"
 source "package/gcc/Config.in"
@@ -380,7 +382,6 @@ source "package/perl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
 source "package/ruby/Config.in"
-source "package/libffi/Config.in"
 source "package/tcl/Config.in"
 endmenu
 
@@ -393,7 +394,9 @@ source "package/apr-util/Config.in"
 source "package/avahi/Config.in.lib"
 source "package/axtls/Config.in.lib"
 source "package/cgilib/Config.in"
+source "package/cxxtools/Config.in"
 source "package/dbus/Config.in"
+source "package/e2fsprogs/Config.in.lib"
 source "package/gettext/Config.in"
 source "package/glib/Config.in"
 source "package/id3lib/Config.in"
@@ -401,12 +404,13 @@ source "package/libao/Config.in"
 source "package/libaudiofile/Config.in"
 source "package/libart/Config.in"
 source "package/libcli/Config.in"
-source "package/curl/Config.in" # libcurl
+source "package/curl/Config.in.lib"
 source "package/libdaemon/Config.in"
 source "package/libdb/Config.in"
 source "package/libdnet/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
+source "package/libffi/Config.in"
 source "package/expat/Config.in" # libexpat
 source "package/faad2/Config.in"  # libfaad2
 source "package/flac/Config.in"  # libflac
@@ -454,7 +458,7 @@ source "package/libthread_db/Config.in"
 source "package/readline/Config.in"  # libreadline
 source "package/cyrus-sasl/Config.in"  # libsasl2
 source "package/speex/Config.in" # libspeex
-source "package/sqlite/Config.in" # libsqlite
+source "package/sqlite/Config.in.lib"
 source "package/librpcsecgss/Config.in"
 source "package/libshout/Config.in"
 source "package/libsigc++/Config.in"
@@ -472,6 +476,7 @@ source "package/libvorbisidec/Config.in"
 source "package/tcp_wrappers/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
+source "package/lua/Config.in.lib"
 source "package/uclibc++/Config.in"
 source "package/ustl/Config.in"
 source "package/zlib/Config.in"
@@ -500,7 +505,7 @@ source "package/libXpm/Config.in"
 source "package/libXt/Config.in"
 source "package/libXxf86dga/Config.in"
 source "package/pixman/Config.in"
-source "package/xf86dga/Config.in"
+#source "package/xf86dga/Config.in"
 source "package/xkbcomp/Config.in"
 source "package/xkeyboard-config/Config.in"
 endmenu
diff --git a/package/Makefile b/package/Makefile
index 5cce2a31d..c12cf3067 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -39,6 +39,7 @@ package-$(ADK_PACKAGE_BISON) += bison
 package-$(ADK_PACKAGE_BZIP2) += bzip2
 package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates
 package-$(ADK_PACKAGE_CFGFS) += cfgfs
+package-$(ADK_PACKAGE_CFINSTALL) += cfinstall
 package-$(ADK_PACKAGE_CPIO) += cpio
 package-$(ADK_PACKAGE_CRYPTINIT) += cryptinit
 package-$(ADK_PACKAGE_BIGREQSPROTO) += bigreqsproto
@@ -442,7 +443,6 @@ package-$(ADK_PACKAGE_ZLIB_DEV) += zlib
 package-$(ADK_PACKAGE_ZSH) += zsh
 # kernel addon packages
 package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx
-package-$(ADK_PACKAGE_KMOD_MAC80211) += mac80211
 package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g
 
 DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m))
diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 6276ba489..fcefe3c5f 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_ALSA_LIB
-	prompt "alsa-lib............................ alsa library"
+	prompt "alsa-lib.......................... alsa library"
 	tristate
 	default n
 	help
diff --git a/package/bison/Config.in b/package/bison/Config.in
index a78712f64..870ce4b8f 100644
--- a/package/bison/Config.in
+++ b/package/bison/Config.in
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_BISON
-	prompt "bison.............................. GNU parser generator"
+	prompt "bison............................. GNU parser generator"
 	tristate
 	default n
 	help
diff --git a/package/cfinstall/Config.in b/package/cfinstall/Config.in
new file mode 100644
index 000000000..e553d2f77
--- /dev/null
+++ b/package/cfinstall/Config.in
@@ -0,0 +1,10 @@
+config ADK_PACKAGE_CFINSTALL
+	prompt "cfinstall............................ compact flash installer"
+	tristate
+	select ADK_PACKAGE_SFDISK
+	select ADK_PACKAGE_PARTED
+	select ADK_PACKAGE_GRUB_BIN
+	depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS_RB532
+	default n
+	help
+	  Installs a rootfs tar archive onto a Compact Flash disk.
diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile
new file mode 100644
index 000000000..7f10dba27
--- /dev/null
+++ b/package/cfinstall/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		cfinstall
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		1
+PKG_DESCR:=		compact flash installer
+PKG_SECTION:=		base
+
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
+NO_DISTFILES:=		1
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,CFINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+pre-configure:
+	mkdir -p ${WRKBUILD}
+
+do-install:
+	${INSTALL_DIR} $(IDIR_CFINSTALL)/sbin
+	${INSTALL_BIN} ./src/cfinstall.sh $(IDIR_CFINSTALL)/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cfinstall/src/cfinstall.sh b/package/cfinstall/src/cfinstall.sh
new file mode 100644
index 000000000..1ff908963
--- /dev/null
+++ b/package/cfinstall/src/cfinstall.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
+
+
diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in
index 862b8c460..fa6f355d5 100644
--- a/package/ctorrent/Config.in
+++ b/package/ctorrent/Config.in
@@ -24,6 +24,7 @@ config ADK_COMPILE_CTORRENT_WITH_STDCXX
 config ADK_COMPILE_CTORRENT_WITH_UCLIBCXX
 	bool "Embedded uClibc++ library"
 	select ADK_PACKAGE_UCLIBCXX
+	depends on ADK_BROKEN
 	help
 
 endchoice
diff --git a/package/curl/Config.in b/package/curl/Config.in
index c9d34b5c8..f8b8da8e6 100644
--- a/package/curl/Config.in
+++ b/package/curl/Config.in
@@ -3,30 +3,8 @@ config ADK_COMPILE_CURL
 	default n
 	depends on ADK_PACKAGE_LIBCURL
 
-config ADK_PACKAGE_LIBCURL
-	prompt "libcurl........................... A client-side URL transfer library"
-	tristate
-	default n
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
-config ADK_PACKAGE_LIBCURL_DEV
-	prompt "libcurl-dev....................... development files for libcurl"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBCURL
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
-
 config ADK_PACKAGE_CURL
-	prompt   "curl............................ A client-side URL transfer tool"
+	prompt   "curl.............................. A client-side URL transfer tool"
 	tristate
 	default n
 	depends on ADK_PACKAGE_LIBCURL
diff --git a/package/curl/Config.in.lib b/package/curl/Config.in.lib
new file mode 100644
index 000000000..1e49d8521
--- /dev/null
+++ b/package/curl/Config.in.lib
@@ -0,0 +1,20 @@
+config ADK_PACKAGE_LIBCURL
+	prompt "libcurl........................... A client-side URL transfer library"
+	tristate
+	default n
+	select ADK_COMPILE_CURL
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_ZLIB
+	help
+	  http://curl.haxx.se/
+
+config ADK_PACKAGE_LIBCURL_DEV
+	prompt "libcurl-dev....................... development files for libcurl"
+	tristate
+	default n
+	select ADK_COMPILE_CURL
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_ZLIB
+	help
+	  http://curl.haxx.se/
+
diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in
index bdc0168a7..566d2e6cb 100644
--- a/package/cxxtools/Config.in
+++ b/package/cxxtools/Config.in
@@ -10,7 +10,7 @@ config ADK_PACKAGE_CXXTOOLS
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_CXXTOOLS
-default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_CXXTOOLS_WITH_STDCXX
@@ -21,6 +21,7 @@ config ADK_COMPILE_CXXTOOLS_WITH_STDCXX
 config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX
 	bool "Embedded uClibc++ library"
 	select ADK_PACKAGE_UCLIBCXX
+	depends on ADK_BROKEN
 	help
 
 endchoice
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index f3a270aa8..36e91f35c 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -24,8 +24,8 @@ endif
 $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++
-TLDFLAGS+=		-luClibc++ -liconv -lm -nodefaultlibs 
+TCXXFLAGS+=		-fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E
+TLDFLAGS+=		-luClibc++ -liconv -lm -nodefaultlibs -shared
 else
 TLDFLAGS+=		-liconv -shared
 endif
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 4f80a07dc..2c0b4da90 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -13,30 +13,3 @@ config ADK_PACKAGE_E2FSPROGS
 
 	  http://e2fsprogs.sourceforge.net/
 
-config ADK_PACKAGE_LIBUUID
-	prompt "libuuid......................... UUID library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBBLKID
-	prompt "libblkid........................ BlockID library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBCOM_ERR
-	prompt "libcom_err...................... Common error library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBSS
-	prompt "libss........................... Subsystem command parsing library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
diff --git a/package/e2fsprogs/Config.in.lib b/package/e2fsprogs/Config.in.lib
new file mode 100644
index 000000000..23630894f
--- /dev/null
+++ b/package/e2fsprogs/Config.in.lib
@@ -0,0 +1,28 @@
+config ADK_PACKAGE_LIBUUID
+	prompt "libuuid......................... UUID library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
+
+config ADK_PACKAGE_LIBBLKID
+	prompt "libblkid........................ BlockID library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
+
+config ADK_PACKAGE_LIBCOM_ERR
+	prompt "libcom_err...................... Common error library"
+	depends on ADK_PACKAGE_E2FSPRO