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

.gitignore

@@ -1,8 +1,10 @@
 config/conf
+config/conf.exe
 config/lex.backup
 config/lex.zconf.c
 config/lkc_defs.h
 config/mconf
+config/mconf.exe
 config/zconf.hash.c
 config/zconf.output
 config/zconf.tab.c

package/Config.in

@@ -451,6 +451,8 @@ source "package/libmad/Config.in"
 source "package/libmad/Config.in.lib"
 source "package/libmms/Config.in"
 source "package/libmms/Config.in.lib"
+source "package/mysql/Config.in"
+source "package/mysql/Config.in.lib"
 source "package/ncurses/Config.in"  
 source "package/ncurses/Config.in.lib" 
 source "package/neon/Config.in"

package/aiccu/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		aiccu
 PKG_VERSION:=		20070115
-PKG_RELEASE:=		7
+PKG_RELEASE:=		8
 PKG_MD5SUM:=		c9bcc83644ed788e22a7c3f3d4021350
 PKG_DESCR:=		SixXS Automatic IPv6 Connectivity Client Utility
 PKG_SECTION:=		net
@@ -18,20 +18,17 @@ WRKDIST=		${WRKDIR}/$(PKG_NAME)
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=	-D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
 		-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
 TLDFLAGS+=	-lpthread -lresolv
-BUILD_STYLE=	auto
+BUILD_STYLE:=	auto
 MAKE_FLAGS+=	CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' LDFLAGS='${TLDFLAGS}'
 
 do-install:
-	$(INSTALL_DIR) $(IDIR_AICCU)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_AICCU)/etc/init.d
+	$(INSTALL_DIR) $(IDIR_AICCU)/usr/sbin $(IDIR_AICCU)/etc
 	$(INSTALL_BIN) $(WRKBUILD)/unix-console/aiccu $(IDIR_AICCU)/usr/sbin/
-	$(INSTALL_BIN) ./files/aiccu.init \
-		$(IDIR_AICCU)/etc/init.d/aiccu
 	$(INSTALL_DATA) $(WRKBUILD)/doc/aiccu.conf $(IDIR_AICCU)/etc/aiccu.conf
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/aiccu/patches/patch-unix-console_Makefile

@@ -1,6 +1,6 @@
 $Id$
---- aiccu.orig/unix-console/Makefile	Mon Jan 15 11:04:04 2007
-+++ aiccu/unix-console/Makefile	Mon Jun 25 13:19:42 2007
+--- aiccu.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
++++ aiccu/unix-console/Makefile	2009-12-28 16:39:06.687500000 +0100
 @@ -10,9 +10,9 @@
  #  $Date: 2007-01-15 11:04:27 $
  # **********************************************************/
@@ -13,7 +13,172 @@ $Id$
  
  # New features not fully implemented and thus disabled for now
  #CFLAGS	+= -D NEWSTUFF_TSP -D NEWSTUFF_TEEPEE
-@@ -145,11 +145,6 @@ all: aiccu
+@@ -46,110 +46,103 @@ LDFLAGS += -lgnutls
+ endif
+ 
+ # Linux
+-ifeq ($(shell uname | grep -c "Linux"),1)
+ CFLAGS  += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\""
+ SRCS	+= ../common/aiccu_linux.c
+ OBJS	+= ../common/aiccu_linux.o
+ LDFLAGS	+= -lpthread -lresolv
+-endif
+ 
+ # FreeBSD
+-ifeq ($(shell uname | grep -c "FreeBSD"),1)
+-CFLAGS	+= -D_FREEBSD
++#ifeq ($(shell uname | grep -c "FreeBSD"),1)
++#CFLAGS	+= -D_FREEBSD
+ 
+ # FreeBSD 4.x
+-ifeq ($(shell uname -r | cut -c 1),4)
+-CFLAGS	+= -D AICCU_TYPE="\"freebsd4\""
+-SRCS	+= ../common/aiccu_freebsd4.c
+-OBJS	+= ../common/aiccu_freebsd4.o
+-else
++#ifeq ($(shell uname -r | cut -c 1),4)
++#CFLAGS	+= -D AICCU_TYPE="\"freebsd4\""
++#SRCS	+= ../common/aiccu_freebsd4.c
++#OBJS	+= ../common/aiccu_freebsd4.o
++#else
+ # FreeBSD 5.x/6.x/7.x
+-CFLAGS	+= -D NEED_IFHEAD -D AICCU_TYPE="\"kame\""
+-SRCS	+= ../common/aiccu_kame.c
+-OBJS	+= ../common/aiccu_kame.o
+-endif
+-endif
++#CFLAGS	+= -D NEED_IFHEAD -D AICCU_TYPE="\"kame\""
++#SRCS	+= ../common/aiccu_kame.c
++#OBJS	+= ../common/aiccu_kame.o
++#endif
++#endif
+ 
+ # DragonFlyBSD
+-ifeq ($(shell uname | grep -c "DragonFly"),1)
+-CFLAGS	+= -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
+-SRCS	+= ../common/aiccu_freebsd4.c
+-OBJS	+= ../common/aiccu_freebsd4.o
+-CFLAGS	+= -pthread
+-endif
++#ifeq ($(shell uname | grep -c "DragonFly"),1)
++#CFLAGS	+= -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
++#SRCS	+= ../common/aiccu_freebsd4.c
++#OBJS	+= ../common/aiccu_freebsd4.o
++#CFLAGS	+= -pthread
++#endif
+ 
+ # NetBSD
+-ifeq ($(shell uname | grep -c "NetBSD"),1)
+-CFLAGS	+= -D_NETBSD -D AICCU_TYPE="\"kame\""
+-
++#ifeq ($(shell uname | grep -c "NetBSD"),1)
++#CFLAGS	+= -D_NETBSD -D AICCU_TYPE="\"kame\""
++#
+ # Check if net/if_tun.h has TUNSIFHEAD and enable support for it
+-ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),1)
++#ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),1)
+ # Supports TUNSIFHEAD -> AYIYA/l2tp available
+-CFLAGS	+= -D NEED_IFHEAD
+-else
++#CFLAGS	+= -D NEED_IFHEAD
++#else
+ # Doesn't support TUNSIFHEAD -> No AYIYA/l2tp available
+-CFLAGS	+= -D NO_IFHEAD
+-endif
++#CFLAGS	+= -D NO_IFHEAD
++#endif
+ 
+-SRCS	+= ../common/aiccu_kame.c
+-OBJS	+= ../common/aiccu_kame.o
+-CFLAGS	+= -pthread -D_NETBSD_SOURCE
+-endif
++#SRCS	+= ../common/aiccu_kame.c
++#OBJS	+= ../common/aiccu_kame.o
++#CFLAGS	+= -pthread -D_NETBSD_SOURCE
++#endif
+ 
+ # OpenBSD
+-ifeq ($(shell uname | grep -c "OpenBSD"),1)
+-CFLAGS	+= -D_OPENBSD -D HAS_IFHEAD
+-# 2.7-2.9
+-ifeq ($(shell uname -r | cut -c 1),2)
+-CFLAGS	+= -D AICCU_TYPE="\"openbsd2\""
+-SRCS	+= ../common/aiccu_openbsd2.c
+-OBJS	+= ../common/aiccu_openbsd2.o
+-else
+-# 3.x-4.x etc
+-CFLAGS	+= -D AICCU_TYPE="\"openbsd\""
+-SRCS	+= ../common/aiccu_openbsd.c
+-OBJS	+= ../common/aiccu_openbsd.o
+-endif
+-CFLAGS	+= -pthread
+-endif
++#ifeq ($(shell uname | grep -c "OpenBSD"),1)
++#CFLAGS	+= -D_OPENBSD -D HAS_IFHEAD
++## 2.7-2.9
++#ifeq ($(shell uname -r | cut -c 1),2)
++#CFLAGS	+= -D AICCU_TYPE="\"openbsd2\""
++#SRCS	+= ../common/aiccu_openbsd2.c
++#OBJS	+= ../common/aiccu_openbsd2.o
++#else
++## 3.x-4.x etc
++#CFLAGS	+= -D AICCU_TYPE="\"openbsd\""
++#SRCS	+= ../common/aiccu_openbsd.c
++#OBJS	+= ../common/aiccu_openbsd.o
++#endif
++#CFLAGS	+= -pthread
++#endif
+ 
+ # Darwin
+-ifeq ($(shell uname | grep -c "Darwin"),1)
+-CFLAGS	+= -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
+-SRCS	+= ../common/aiccu_darwin.c
+-OBJS	+= ../common/aiccu_darwin.o
+-LDFLAGS	+= -lresolv
+-endif
++#ifeq ($(shell uname | grep -c "Darwin"),1)
++#CFLAGS	+= -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
++#SRCS	+= ../common/aiccu_darwin.c
++#OBJS	+= ../common/aiccu_darwin.o
++#LDFLAGS	+= -lresolv
++#endif
+ 
+ # SunOS / Solaris
+-ifeq ($(shell uname | grep -c "SunOS"),1)
+-CFLAGS	+= -D_SUNOS -D AICCU_TYPE="\"sunos\""
+-SRCS	+= ../common/aiccu_sunos.c
+-OBJS	+= ../common/aiccu_sunos.o
+-LDFLAGS	+= -lsocket -lnsl -lresolv
+-endif
++#ifeq ($(shell uname | grep -c "SunOS"),1)
++#CFLAGS	+= -D_SUNOS -D AICCU_TYPE="\"sunos\""
++#SRCS	+= ../common/aiccu_sunos.c
++#OBJS	+= ../common/aiccu_sunos.o
++#LDFLAGS	+= -lsocket -lnsl -lresolv
++#endif
+ 
+ # AIX
+-ifeq ($(shell uname | grep -c "AIX"),1)
+-CC	= @/usr/vac/bin/xlc_r
+-CFLAGS	= -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
+-CFLAGS	+= -D AICCU_CONSOLE
+-CFLAGS	+= -D_AIX -D AICCU_TYPE="\"aix\""
+-SRCS	+= ../common/aiccu_aix.c
+-OBJS	+= ../common/aiccu_aix.o
+-LDFLAGS	+= -lpthread
+-endif
++#ifeq ($(shell uname | grep -c "AIX"),1)
++#CC	= @/usr/vac/bin/xlc_r
++#CFLAGS	= -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
++#CFLAGS	+= -D AICCU_CONSOLE
++#CFLAGS	+= -D_AIX -D AICCU_TYPE="\"aix\""
++#SRCS	+= ../common/aiccu_aix.c
++#OBJS	+= ../common/aiccu_aix.o
++#LDFLAGS	+= -lpthread
++#endif
+ 
+ 
+ all: aiccu
  
  aiccu:	$(OBJS) ${SRCS} ${INCS}
  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)

package/alsa-utils/patches/patch-alsactl_Makefile_in

@@ -0,0 +1,31 @@
+--- alsa-utils-1.0.21.orig/alsactl/Makefile.in	2009-08-31 17:14:23.000000000 +0200
++++ alsa-utils-1.0.21/alsactl/Makefile.in	2009-12-28 17:27:46.140625000 +0100
+@@ -573,7 +573,7 @@ distdir: $(DISTFILES)
+ 	done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS)
++all-am: Makefile $(PROGRAMS) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)"; do \
+@@ -623,7 +623,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-man
++install-data-am:
+ 
+ install-exec-am: install-sbinPROGRAMS
+ 
+@@ -672,8 +672,8 @@ uninstall-man: uninstall-man1 uninstall-
+ 	uninstall-man1 uninstall-man7 uninstall-sbinPROGRAMS
+ 
+ 
+-%.7: %.xml
+-	xmlto man $?
++#%.7: %.xml
++#	xmlto man $?
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

package/aufs2-util/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		aufs2 utilities
 PKG_SECTION:=		admin
 PKG_URL:=		http://aufs.sf.net/
+PKG_HOST_DEPENDS:=	!cygwin !freebsd
 
 NO_DISTFILES:=		1
 
@@ -24,10 +25,4 @@ do-extract:
 	mkdir -p ${WRKBUILD}
 	${CP} ./src/* ${WRKBUILD}/
 
-do-configure:
-
-#post-install:
-#	$(INSTALL_DIR) $(IDIR_BASH)/bin
-#	$(INSTALL_BIN) $(WRKINST)/usr/bin/bash $(IDIR_BASH)/bin/
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/base-files/extra/etc/network/if-pre-up.d/01-atm

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+if [ ! -x /usr/sbin/br2684ctl ]
+then
+  exit 0
+fi
+
+[ "$METHOD" == "atm" ] || exit 0
+
+[ "$IF_ATM_ENCAPS" ] || encap=0
+[ "$IF_ATM_PAYLOAD" ] || payload=1
+[ "$IF_ATM_VPI" ] || $IF_ATM_VPI=1
+[ "$IF_ATM_VCI" ] || $IF_ATM_VCI=32
+
+case "$IF_ATM_PAYLOAD" in
+bridged)
+        payload=1
+        ;;
+routed)
+        payload=0
+        ;;
+*)
+        echo "Wrong payload, use either bridged or routed"
+        exit 1
+        ;;
+esac
+
+case "$IF_ATM_ENCAPS" in
+llc)
+        encap=0
+        ;;
+vc)
+        encap=1
+        ;;
+*)
+        echo "Wrong Encapsulation use either llc or vc"
+        exit 1
+        ;;
+esac
+
+br2684ctl -b -c 0 -e $encap -p $payload -a $IF_ATM_VPI.$IF_ATM_VCI
+ifconfig nas0 up
+exit 0

package/mpd/files/mpd.conf

@@ -15,3 +15,17 @@ audio_output {
 }
 # Volume control mixer 
 mixer_type			"alsa"
+
+# shout example
+#audio_output {
+#        type              "shout"
+#        name              "personal mpd stream"
+#        host              "127.0.0.1"
+#        port              "8000"
+#        mount             "/mpd"
+#        quality           "5.0"
+#        format            "44100:16:2"
+#        user              "source"
+#        password          "musicrockz"
+#}
+

package/mtd/src/mtd.c

@@ -43,6 +43,7 @@
 #include <string.h>
 
 #include <mtd/mtd-user.h>
+#include <linux/reboot.h>
 
 #define BUFSIZE (16 * 1024)
 #define MAX_ARGS 8
@@ -253,15 +254,16 @@ usage(void)
 	"        -q                      quiet mode (once: no [w] on writing,\n"
 	"                                           twice: no status messages)\n"
 	"        -e <device>             erase <device> before executing the command\n\n"
-	"Example: To write linux.trx to mtd1 labeled as linux\n"
-	"         mtd write linux.trx linux\n\n");
+	"        -r                      reboot after successful command\n"
+	"Example: To write linux.img to mtd partition labeled as linux\n"
+	"         mtd write linux.img linux\n\n");
 	exit(1);
 }
 
 int
 main(int argc, char **argv)
 {
-	int ch, i, imagefd = -1, quiet, unlocked;
+	int ch, i, imagefd = -1, quiet, unlocked, boot;
 	char *erase[MAX_ARGS], *device;
 	const char *imagefile = NULL;
 	enum {
@@ -271,6 +273,7 @@ main(int argc, char **argv)
 	} cmd;
 
 	erase[0] = NULL;
+	boot = 0;
 	buflen = 0;
 	quiet = 0;
 
@@ -282,6 +285,9 @@ main(int argc, char **argv)
 			case 'q':
 				quiet++;
 				break;
+			case 'r':
+				boot = 1;
+				break;
 			case 'e':
 				i = 0;
 				while ((erase[i] != NULL) && ((i + 1) < MAX_ARGS))
@@ -373,7 +379,13 @@ main(int argc, char **argv)
 				fprintf(stderr, "\n");
 			break;
 	}
-
+	
 	sync();
+	if (boot) {
+		fprintf(stderr, "\nRebooting ... ");
+		fflush(stdout);
+		fflush(stderr);
+		syscall(SYS_reboot,LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,LINUX_REBOOT_CMD_RESTART,NULL);
+	}	
 	return 0;
 }

package/ncurses/Makefile

@@ -66,11 +66,10 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \
 	    ${IDIR_LIBNCURSES}/usr/lib
-	for f in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 \
-	    v/vt220 w/wsvt25 x/xterm x/xterm-color x/xterm-xfree86; do \
-		${INSTALL_DIR} \
-		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$$(dirname $$f); \
-		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/$$f \
+	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
+	for f in ansi dumb linux rxvt screen vt100 vt102 \
+	    vt220 wsvt25 xterm xterm-color xterm-xfree86; do \
+		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
 		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$$f; \
 	done
 	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include

package/ppp/files/ppp.pre-up

@@ -36,7 +36,7 @@ sed "$REPLACE" < /etc/ppp/templates/$IF_USE_TEMPLATE > /etc/ppp/peers/$IF_PROVID
 [ "$IF_PPP_ENCAPS" ] || encap=0
 [ "$IF_PPP_PAYLOAD" ] || payload=1
 [ "$IF_PPP_VPI" ] || $IF_PPP_VPI=1
-[ "$IF_PPP_PAYLOAD" ] || $IF_PPP_VCI=32
+[ "$IF_PPP_VCI" ] || $IF_PPP_VCI=32
 
 case "$IF_PPP_PAYLOAD" in
 bridged)

scripts/scan-pkgs.sh

@@ -48,10 +48,6 @@ if [[ -n $ADK_COMPILE_HEIMDAL ]]; then
 	NEED_BISON="$NEED_BISON heimdal-server"
 fi
 
-if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then
-	NEED_XMLTO="$NEED_XMLTO alsa-utils"
-fi
-
 if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 fi
@@ -173,13 +169,6 @@ if [[ -n $NEED_XKBCOMP ]]; then
 	fi
 fi
 
-if [[ -n $NEED_XMLTO ]]; then
-	if ! which xmlto >/dev/null 2>&1; then
-		echo >&2 You need xmlto to build $NEED_XMLTO
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_PKGCONFIG ]]; then
 	if ! which pkg-config >/dev/null 2>&1; then
 		echo >&2 You need pkg-config to build $NEED_PKGCONFIG

target/ag241/TODO

@@ -1,3 +1 @@
-- update with mtd, reboot feature in mtd
-- startupscript for bridged nas device
--
+- update with mtd

target/ag241/files/etc/network/interfaces

@@ -0,0 +1,9 @@
+auto lo
+iface lo inet loopback
+
+auto nas0
+iface nas0 inet atm
+
+auto br0
+iface br0 inet manual
+	bridge-ports eth0 nas0