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

110 files changed, 41801 insertions, 600 deletions

diff --git a/Config.in b/Config.in
index e22136582..8b7d40cd6 100644
--- a/Config.in
+++ b/Config.in
@@ -36,6 +36,7 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GIT
+	select ADK_PACKAGE_GREP
 	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
 	select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
diff --git a/Makefile b/Makefile
index 9959e3169..fa7faa6bb 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ help:
 	@echo '  menuconfig   - Update current config utilising a menu based program'
 	@echo '                 (default when .config does not exist)'
 	@echo '  oldconfig    - Update current config utilising a provided .configs base'
-	@echo '  wconfig      - Same as "oldconfig", but also writes out hidden symbols'
 	@echo '  allmodconfig - New config selecting all packages as modules when possible'
 	@echo '  allconfig    - New config selecting all packages when possible'
 	@echo '  allnoconfig  - New config where all options are answered with no'
@@ -86,9 +85,6 @@ config: .prereq_done
 oldconfig: .prereq_done
 	@${GMAKE_INV} _config W=-o
 
-wconfig: .prereq_done
-	@${GMAKE_INV} _config W=-A
-
 download: .prereq_done
 	@${GMAKE_INV} toolchain/download
 	@${GMAKE_INV} package/download
@@ -170,11 +166,11 @@ prereq-noerror:
 NO_ERROR=0
 .prereq_done:
 	@-rm -rf .prereq_done
-	@if ! bash --version 2>&1 | fgrep 'GNU bash' >/dev/null 2>&1; then \
+	@if ! bash --version 2>&1 | grep -F 'GNU bash' >/dev/null 2>&1; then \
 		echo "GNU bash needs to be installed."; \
 		exit 1; \
 	fi
-	@if ! mksh -c 'echo $$KSH_VERSION' 2>&1 | fgrep 'MIRBSD' >/dev/null 2>&1; then \
+	@if ! mksh -c 'echo $$KSH_VERSION' 2>&1 | grep -F 'MIRBSD' >/dev/null 2>&1; then \
 		echo "MirBSD ksh (mksh) needs to be installed."; \
 		exit 1; \
 	else \
diff --git a/README b/README
index 56a431146..6fe00f8f6 100644
--- a/README
+++ b/README
@@ -9,6 +9,7 @@ Before you can start you need to install some tools:
 - gcc 
 - binutils 
 - GNU make
+- GNU m4
 - GNU tar
 - GNU awk
 - GNU sed
diff --git a/TODO b/TODO
index e5a2e98e2..d03ca9dcc 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,9 @@
-- fix glibc build for MIPS targets
+- macos x build
+- test on OpenSuSE
+- test on CentOS
+- test on Fedora Core
+- help text for config/ needs adoption
 - implement update for MTD devices (ag241)
 - fix watchdog for alix1c (mfgpt timers problem)
-- macos x build
-- package drbd
-- new packages for openais and pacemaker
-- continuos build via hudson or sth. like that
 - implement rpm package backend 
 - implement dpkg package backend 
diff --git a/makefile b/makefile
deleted file mode 100644
index 760d123d6..000000000
--- a/makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-ADKVERSION=	0.1.0
-TOPDIR=		${.CURDIR}
-PWD=		${.CURDIR}
-
-.include "${.CURDIR}/Makefile.inc"
-
-GMAKE_ENV+=	ADKVERSION=${ADKVERSION:Q}
-
-.if defined(package) && !empty(package)
-subdir:=	package/${package}
-.  if !make(clean)
-_subdir_dep:=	${TOPDIR}/.ADK_HAVE_DOT_CONFIG
-.  endif
-.endif
-
-.if defined(subdir) && !empty(subdir)
-_subdir:=	${.TARGETS}
-${.TARGETS}: _subdir
-
-_subdir: ${_subdir_dep}
-	@if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \
-		echo >&2 Error: you must build with “umask 022”, sorry.; \
-		exit 1; \
-	fi
-	cd ${.CURDIR}/${subdir} && TOPDIR=${.CURDIR} DEVELOPER=1 \
-	    ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir}
-
-.  include "${.CURDIR}/prereq.mk"
-.  include "${.CURDIR}/mk/split-cfg.mk"
-.else
-.  include "${.CURDIR}/Makefile"
-.endif
diff --git a/mk/build.mk b/mk/build.mk
index 881acca62..a8ba19c72 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -16,7 +16,6 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_MAKE_PARALLEL=n \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_GRUB=n \
-			ADK_PACKAGE_GCC=n \
 			ADK_PACKAGE_AUFS2_UTIL=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_COMPILE_HEIMDAL=n \
diff --git a/mk/modules.mk b/mk/modules.mk
index 5ba6ab1e6..4747a4e16 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -608,6 +608,8 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\
     $(MODULES_DIR)/kernel/crypto/async_tx/async_tx \
     $(MODULES_DIR)/kernel/crypto/async_tx/async_xor \
     $(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \
+    $(MODULES_DIR)/kernel/drivers/md/raid6_pq \
+    $(MODULES_DIR)/kernel/crypto/async_tx/async_raid6_recov \
     $(MODULES_DIR)/kernel/drivers/md/raid456 \
 ,35))
 
@@ -776,6 +778,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
+    $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
     $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
     $(MODULES_DIR)/kernel/crypto/deflate \
 ,10))
diff --git a/package/Config.in b/package/Config.in
index 68c81aad1..29c32ede3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -260,6 +260,7 @@ source "package/libpcap/Config.in"
 source "package/libpcap/Config.in.lib"
 source "package/libpri/Config.in"
 source "package/libpri/Config.in.lib"
+source "package/lvm/Config.in.lib"
 source "package/pango/Config.in"
 source "package/pcre/Config.in"
 source "package/pcre/Config.in.lib"
@@ -551,6 +552,7 @@ source "package/cpufrequtils/Config.in"
 source "package/fbset/Config.in"
 source "package/file/Config.in"
 source "package/findutils/Config.in"
+source "package/grep/Config.in"
 source "package/hdparm/Config.in"
 source "package/usbutils/Config.in"
 source "package/patch/Config.in"
@@ -581,6 +583,8 @@ menu "X server and drivers"
 source "package/xorg-server/Config.in"
 source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
+source "package/xf86-video-fbdev/Config.in"
+source "package/xf86-video-siliconmotion/Config.in"
 source "package/xf86-input-mouse/Config.in"
 source "package/xf86-input-keyboard/Config.in"
 source "package/xf86-input-evtouch/Config.in"
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index bebd71ef9..595bae027 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.6.2.1
+PKG_VERSION:=		1.6.2.5