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

79 files changed, 644 insertions, 1710 deletions

diff --git a/package/Config.in b/package/Config.in
index 5f1a0bdd4..80717c15b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -56,6 +56,7 @@ source "package/xz/Config.in"
 endmenu
 
 menu "Cryptography"
+source "package/ccid/Config.in"
 source "package/cryptsetup/Config.in"
 source "package/gnupg/Config.in"
 source "package/gnutls/Config.in"
@@ -65,6 +66,7 @@ source "package/openct/Config.in"
 source "package/opensc/Config.in"
 source "package/openssl/Config.in"
 source "package/openssl-pkcs11/Config.in"
+source "package/pcsc-lite/Config.in"
 source "package/rng-tools/Config.in"
 endmenu
 
@@ -579,11 +581,12 @@ source "package/hdparm/Config.in"
 source "package/usbutils/Config.in"
 source "package/patch/Config.in"
 source "package/pciutils/Config.in"
+source "package/pcmciautils/Config.in"
 source "package/procps/Config.in"
 source "package/sispmctl/Config.in"
 source "package/stress/Config.in"
+source "package/sysfsutils/Config.in"
 source "package/sysstat/Config.in"
-source "package/swconfig/Config.in"
 source "package/udev/Config.in"
 source "package/watchdog/Config.in"
 endmenu
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 41506092d..d5ce04b77 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -9,14 +9,15 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		62e8e47cbd63741b4bbe634dcdc8a56a
 PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libxdamage libxfixes
-PKG_BUILDDEP+=		libXdamage libXfixes libXxf86vm
-PKG_URL:=		add project url
+PKG_DEPENDS:=		libxdamage libxfixes libdrm
+PKG_BUILDDEP+=		libXdamage libXfixes libXxf86vm libdrm 
+PKG_BUILDDEP+=		dri2proto glproto expat
+PKG_URL:=		http://www.mesa3d.org/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.1/
 
 WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 
-PKG_TARGET_DEPENDS:=  	x86 x86_64
+PKG_TARGET_DEPENDS:=  	ibmx40
 
 include $(TOPDIR)/mk/package.mk
 
@@ -24,10 +25,27 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-gallium \
+			--disable-glw \
+			--with-driver=dri \
 			--without-demos
 
 XAKE_FLAGS+=		APP_CC=${HOSTCC} HOST_CC=${HOSTCC}
 
+pre-configure:
+	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
+		./configure \
+		--disable-static \
+		--disable-glw \
+		--disable-gallium \
+		--with-driver=xlib \
+		--without-demos \
+	);
+	${MAKE} -C ${WRKBUILD}/src/glsl
+	${MAKE} -C ${WRKBUILD}/src/glsl/apps
+	cp ${WRKBUILD}/src/glsl/apps/compile \
+		${STAGING_TOOLS}/bin
+	${MAKE} -C ${WRKBUILD}/src/glsl clean
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \
diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile
new file mode 100644
index 000000000..baa023db4
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_glsl_Makefile
@@ -0,0 +1,11 @@
+--- Mesa-7.8.1.orig/src/glsl/Makefile	2010-04-05 01:46:26.000000000 +0200
++++ Mesa-7.8.1/src/glsl/Makefile	2010-05-21 17:17:54.621613561 +0200
+@@ -4,7 +4,7 @@ TOP = ../..
+ 
+ include $(TOP)/configs/current
+ 
+-SUBDIRS = pp cl apps
++SUBDIRS = pp cl
+ 
+ default install clean:
+ 	@for dir in $(SUBDIRS) ; do \
diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile_template b/package/MesaLib/patches/patch-src_glsl_Makefile_template
deleted file mode 100644
index bcb3256d6..000000000
--- a/package/MesaLib/patches/patch-src_glsl_Makefile_template
+++ /dev/null
@@ -1,11 +0,0 @@
---- Mesa-7.8.1.orig/src/glsl/Makefile.template	2010-04-05 01:46:26.000000000 +0200
-+++ Mesa-7.8.1/src/glsl/Makefile.template	2010-04-19 21:18:45.000000000 +0200
-@@ -44,7 +44,7 @@ install:
- ##### RULES #####
- 
- .c.o:
--	$(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
-+	$(HOST_CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
- 
- -include depend
- 
diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile
index 175965dc5..76d23d7bf 100644
--- a/package/MesaLib/patches/patch-src_glsl_apps_Makefile
+++ b/package/MesaLib/patches/patch-src_glsl_apps_Makefile
@@ -1,5 +1,5 @@
 --- Mesa-7.8.1.orig/src/glsl/apps/Makefile	2010-04-05 01:46:26.000000000 +0200
-+++ Mesa-7.8.1/src/glsl/apps/Makefile	2010-04-19 21:20:55.000000000 +0200
++++ Mesa-7.8.1/src/glsl/apps/Makefile	2010-05-25 17:38:03.594714854 +0200
 @@ -26,10 +26,10 @@ INCLUDES = -I.
  .SUFFIXES: .c
  
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index 5a1823cc3..e758b1f2f 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:=		installer for cf, mmc, sd or mtd devices
 PKG_SECTION:=		base
 PKG_DEPENDS:=		parted sfdisk e2fsprogs
 
-PKG_TARGET_DEPENDS:=	alix wrap rb532 foxg20
+PKG_TARGET_DEPENDS:=	alix wrap routerboard foxg20
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
@@ -34,6 +34,12 @@ ifeq ($(ADK_LINUX_MIPS_RB532),y)
 else ifeq ($(ADK_LINUX_ARM_FOXBOARD),y)
 	${INSTALL_BIN} ./src/adkinstall.foxg20 \
 		$(IDIR_ADKINSTALL)/sbin/adkinstall
+else ifeq ($(ADK_LINUX_MIPS_RB433),y)
+	${INSTALL_BIN} ./src/adkinstall.rb4xx \
+		$(IDIR_ADKINSTALL)/sbin/adkinstall
+else ifeq ($(ADK_LINUX_MIPS_RB411),y)
+	${INSTALL_BIN} ./src/adkinstall.rb4xx \
+		$(IDIR_ADKINSTALL)/sbin/adkinstall
 else
 	${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
 endif
diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx
new file mode 100644
index 000000000..f96cc7f05
--- /dev/null
+++ b/package/adkinstall/src/adkinstall.rb4xx
@@ -0,0 +1,36 @@
+#!/bin/sh
+# installs a rootfs tar archive from OpenADK onto 
+# a NAND device
+# special script for routerboard rb4xx
+
+if [ -z $1 ];then
+        printf "Please give your root tar archive as parameter\n"
+        exit 1
+fi
+
+printf "Preparing mountpoints\n"
+mount -t yaffs2 /dev/mtdblock2 /mnt
+rm -rf /mnt/* >/dev/null 2>&1
+mkdir /mnt/boot
+mount -t yaffs2 /dev/mtdblock1 /mnt/boot
+
+printf "Extracting install archive\n"
+tar -C /mnt -xzpf $1
+if [ $? -ne 0 ];then
+	printf "Extracting of install archive failed"
+	exit 1
+fi
+
+chmod 1777 /mnt/tmp
+chmod 4755 /mnt/bin/busybox
+
+sync
+umount /mnt/boot
+umount /mnt
+if [ $? -ne 0 ];then
+	printf "Unmounting filesystem failed"
+	exit 1
+else
+	printf "Successfully installed.\n"
+	exit 0
+fi
diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init
index de368c80c..eec8242a1 100644
--- a/package/base-files/src/lib/mdev/init
+++ b/package/base-files/src/lib/mdev/init
@@ -14,3 +14,9 @@ if [ "$SUBSYSTEM" == "firmware" ];then
                 fi
         fi
 fi
+if [ "$SUBSYSTEM" == "pcmcia_socket" ];then
+	logger "Setting up PCMCIA socket resource database"
+	if [ "$ACTION" == "add" ];then
+		/usr/sbin/pcmcia-socket-startup
+	fi
+fi
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index 1af188b41..dd8d3ecec 100755
--- a/package/base-files/src/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
@@ -34,6 +34,8 @@ prepare() {
 	mount -o remount,rw /
 	if [ "$system" == "RB532" ];then
 		mount -t yaffs2 /dev/mtdblock0 /boot
+	elif [ "$system" == "AR7130" ];then
+		mount -t yaffs2 /dev/mtdblock1 /boot
 	elif [ "$system" == "FOXG20" ];then
 		mount -t vfat /dev/mmcblk0p1 /boot
 	fi
@@ -89,6 +91,8 @@ if [ -x /sbin/cfgfs ];then
 fi
 if [ "$system" == "RB532" ];then
 	umount -f /boot
+elif [ "$system" == "AR7130" ];then
+	umount -f /boot
 elif [ "$system" == "FOXG20" ];then
 	umount -f /boot
 fi
diff --git a/package/bash/Makefile b/package/bash/Makefile
index b06ee4991..c0b55681e 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -16,6 +16,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ENV+=		bash_cv_getenv_redef=no
 XAKE_FLAGS+=		LIBS_FOR_BUILD=''
 
 post-install:
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 9d1df7793..3d54ff6ea 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/toolchain/binutils/Makefile.inc
 
 PKG_DESCR:=		binary utilities (nm, objdump, ar, as, ..)
 PKG_SECTION:=		comp
+PKG_HOST_DEPENDS:=      !cygwin
 
 include ${TOPDIR}/mk/package.mk
 
@@ -16,10 +17,6 @@ CONFIGURE_ARGS+=	--disable-werror \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME)
 
-post-patch:
-	${PREVENT_PATCH} ${PATCH} ${WRKDIST} \
-	    ${TOPDIR}/toolchain/binutils/patches \*.patch
-
 post-install:
 	${INSTALL_DIR} ${IDIR_BINUTILS}/usr/lib
 	$(CP) ${WRKINST}/usr/lib/*.so ${IDIR_BINUTILS}/usr/lib
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
new file mode 100644
index 000000000..98d36a3cd
--- /dev/null
+++ b/package/ccid/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:=		ccid
+PKG_VERSION:=		1.3.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		7fcdbacacd955659286f988fa9b6e0be
+PKG_DESCR:=		a generic USB CCID and ICCD driver
+PKG_SECTION:=		security
+PKG_BUILDDEP+=		pcsc-lite
+PKG_URL:=		http://pcsclite.alioth.debian.org/ccid.html
+PKG_SITES:=		https://alioth.debian.org/frs/download.php/3281/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--enable-twinserial
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_CCID)/usr/pcsc/drivers/serial
+	$(CP) $(WRKINST)/usr/pcsc/drivers/serial/libccidtwin.so* \
+		$(IDIR_CCID)/usr/pcsc/drivers/serial
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 1b9897807..b7ca8a67c 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 
-PKG_TARGET_DEPENDS:=	alix wrap foxboard ag241 rb532 foxg20
+PKG_TARGET_DEPENDS:=	alix wrap foxboard ag241 foxg20 routerboard
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 54dfc4195..d9724f2fc 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://asg.web.cmu.edu/sasl
 PKG_SITES:=		http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 
+PKG_NOPARALLEL:=	1
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/davfs2/Config.in.kernel b/package/davfs2/Config.in.kernel
index 3ef8e77d7..70e3c3ea4 100644
--- a/package/davfs2/Config.in.kernel
+++ b/package/davfs2/Config.in.kernel
@@ -4,13 +4,9 @@ depends on ADK_PACKAGE_DAVFS2
 
 config ADK_PACKAGE_DAVFS2_FUSE
        bool "use the FUSE filesystem interface"
-       select ADK_PACKAGE_FUSE_UTILS
 config ADK_PACKAGE_DAVFS2_CODA
        bool "use the CODA filesystem interface"
-       select ADK_KPACKAGE_KMOD_CODA_FS
 config ADK_PACKAGE_DAVFS2_BOTH
        bool "use both filesystem interfaces"
-       select ADK_PACKAGE_FUSE_UTILS
-       select ADK_KPACKAGE_KMOD_CODA_FS
 endchoice
 
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index b3e63f2c9..b6c026739 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -16,8 +16,6 @@ endif
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2
 PKG_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
 
-include ${TOPDIR}/mk/package.mk
-
 ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
 PKG_DEPENDS:=			fuse-utils kmod-fuse-fs libiconv neon
 else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
@@ -26,6 +24,8 @@ else
 PKG_DEPENDS:=			kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon
 endif
 
+include ${TOPDIR}/mk/package.mk
+
 $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-neon
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 8c6db24be..0009c48e2 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib gtk+ libnotify libidl
 PKG_DEPENDS+=		nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
+PKG_DEPENDS+=		libxdamage libxfixes
 PKG_BUILDDEP+=		alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt
 PKG_BUILDDEP+=		nspr nss jpeg
 PKG_URL:=		http://www.mozilla.org/
@@ -19,7 +20,7 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 
 WRKDIST=		${WRKDIR}/mozilla-1.9.2
-PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle
+PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle ibmx40
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c
new file mode 100644
index 000000