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

74 files changed, 492 insertions, 374 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 996e1b195..c70bf6a5c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		57
+PKG_RELEASE:=		58
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/init b/package/base-files/src/init
index ac689f046..003808452 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -7,7 +7,7 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 [ ! -f /etc/notmpfs ] && {
   size=$(cat /etc/tmpfs 2>/dev/null)
   [ -z $size ] && size=2048
-  mount tmpfs /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=${size}k
+  mount -o nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
 }
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 [ -d /dev/pts ] || mkdir /dev/pts 
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index bf78120a8..8df9cb6bb 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		vc tools for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_LIBC_DEPENDS:=	eglibc glibc
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 PKG_SUBPKGS:=		BCM2835_VC BCM2835_VC_DEV
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 4a8e8ea68..b9476be3e 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -38,7 +38,7 @@ BB_MAKE_FLAGS:=		V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
 			HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
 			-C ${WRKBUILD} 
 ifneq (${ADK_NATIVE},y)
-BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
+BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS="-static-libgcc"
 else
 BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
 endif
diff --git a/package/busybox/patches/014-disable-static-libgcc.patch b/package/busybox/patches/014-disable-static-libgcc.patch
new file mode 100644
index 000000000..79d6345a7
--- /dev/null
+++ b/package/busybox/patches/014-disable-static-libgcc.patch
@@ -0,0 +1,12 @@
+diff -Nur busybox-1.20.2.orig/Makefile.flags busybox-1.20.2/Makefile.flags
+--- busybox-1.20.2.orig/Makefile.flags	2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.20.2/Makefile.flags	2013-08-13 14:25:53.000000000 +0200
+@@ -50,7 +50,7 @@
+ # -fno-guess-branch-probability: prohibit pseudo-random guessing
+ # of branch probabilities (hopefully makes bloatcheck more stable):
+ CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
+-CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
++CFLAGS += $(call cc-option,-funsigned-char,)
+ CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
+ 
+ # FIXME: These warnings are at least partially to be concerned about and should
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index ddec3c779..159bd229b 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.9
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-
 TARGET_LDFLAGS+=	-static-libgcc
 
 do-install:
diff --git a/package/cfgfs/src/adler.h b/package/cfgfs/src/adler.h
index a1608705f..751aa928d 100644
--- a/package/cfgfs/src/adler.h
+++ b/package/cfgfs/src/adler.h
@@ -45,7 +45,7 @@
    by the 'buffer' argument, size expected in 'len'
    which is TRASHED; stores the result in s1 and s2 */
 #define ADLER_CALC(buffer)	do {					\
-		const uint8_t *adler_buf = (const uint8_t *)(buffer);	\
+		const u_int8_t *adler_buf = (const u_int8_t *)(buffer);	\
 		while (len) {						\
 			len -= (n = MIN(len, ADLER_NMAX));		\
 			while (n--) {					\
diff --git a/package/cfgfs/src/compress.c b/package/cfgfs/src/compress.c
index b75959c4e..efec3ef8c 100644
--- a/package/cfgfs/src/compress.c
+++ b/package/cfgfs/src/compress.c
@@ -28,8 +28,6 @@
 #include "defs.h"
 #include "compress.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/compress.c,v 1.7 2006/09/23 23:46:35 tg Exp $");
-
 static void compress_initialise(void);
 
 static fwcf_compressor *fwcf_compressors = NULL;
diff --git a/package/cfgfs/src/compress.h b/package/cfgfs/src/compress.h
index c421aca5c..413075d83 100644
--- a/package/cfgfs/src/compress.h
+++ b/package/cfgfs/src/compress.h
@@ -9,6 +9,8 @@
 #ifndef COMPRESS_H
 #define COMPRESS_H
 
+#include <sys/types.h>
+
 /* BEGIN of plug-in API description - hook yer proprietary modules here */
 
 /* returns 0 on success, -1 on failure */
@@ -28,25 +30,21 @@ typedef struct FWCF_COMPRESSOR {
 	fwcf_compress_work_func compress;
 	fwcf_compress_rev_func decompress;
 	const char *name;
-	uint8_t code;
+	u_int8_t code;
 } fwcf_compressor;
 
-__BEGIN_DECLS
 /* 0=success 1=EINVAL 2=slot already used */
 int compress_register(fwcf_compressor *);
-__END_DECLS
 
 /* END of plug-in API description, version 1.0 */
 
-__BEGIN_DECLS
 /* low-level */
 fwcf_compressor *compress_enumerate(void);
 int compress_list(void);
 
 /* high-level */
-fwcf_compressor *compressor_get(uint8_t);
+fwcf_compressor *compressor_get(u_int8_t);
 int compressor_getbyname(const char *);
 int list_compressors(void);
-__END_DECLS
 
 #endif
diff --git a/package/cfgfs/src/cpr_get.c b/package/cfgfs/src/cpr_get.c
index 71e414130..894abb347 100644
--- a/package/cfgfs/src/cpr_get.c
+++ b/package/cfgfs/src/cpr_get.c
@@ -29,10 +29,8 @@
 #include "defs.h"
 #include "compress.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/cpr_get.c,v 1.4 2007/03/09 22:35:13 tg Exp $");
-
 fwcf_compressor *
-compressor_get(uint8_t algo)
+compressor_get(u_int8_t algo)
 {
 	fwcf_compressor *list;
 
diff --git a/package/cfgfs/src/defs.h b/package/cfgfs/src/defs.h
index b19046a27..c099ffb5a 100644
--- a/package/cfgfs/src/defs.h
+++ b/package/cfgfs/src/defs.h
@@ -18,13 +18,6 @@
 #define __RCSID(x)	static const char __rcsid[] __attribute__((used)) = (x)
 #endif
 
-#ifndef BSD
-#define uint8_t		u_int8_t
-#define uint16_t	u_int16_t
-#define uint32_t	u_int32_t
-#define uint64_t	u_int64_t
-#endif
-
 #ifndef __dead
 #define __dead		__attribute__((noreturn))
 #endif
diff --git a/package/cfgfs/src/ft_creat.c b/package/cfgfs/src/ft_creat.c
index 5838f8647..4faf3c55c 100644
--- a/package/cfgfs/src/ft_creat.c
+++ b/package/cfgfs/src/ft_creat.c
@@ -35,12 +35,10 @@
 #include "defs.h"
 #include "pack.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/ft_creat.c,v 1.2 2006/09/23 23:21:04 tg Exp $");
-
 static size_t ft_creat(char *);
-static void make_directory(char *, uint32_t, uint32_t, uint32_t, time_t);
-static void make_file(char *, uint8_t *, size_t);
-static void make_symlink(char *, uint8_t *, size_t);
+static void make_directory(char *, u_int32_t, u_int32_t, u_int32_t, time_t);
+static void make_file(char *, u_int8_t *, size_t);
+static void make_symlink(char *, u_int8_t *, size_t);
 static void pop_directories(void);
 static void do_chown(char *, uid_t, gid_t);
 static void do_chmod(char *, mode_t);
@@ -74,14 +72,14 @@ ft_creatm(char *buf, const char *pathname)
 static size_t
 ft_creat(char *buf)
 {
-	uint8_t c, *p;
+	u_int8_t c, *p;
 	char *fname;
 	size_t i, type = 0, size = 0;
-	uint32_t x_uid = 0, x_gid = 0, x_mode = 0;
+	u_int32_t x_uid = 0, x_gid = 0, x_mode = 0;
 	time_t x_mtime = 0;
 
 	i = strlen(buf) + 1;
-	p = (uint8_t *)buf + i;
+	p = (u_int8_t *)buf + i;
 	fname = pfxname(buf);
 	while (*p)
 		switch (c = *p++) {
@@ -183,11 +181,11 @@ ft_creat(char *buf)
 	if (type != 3)
 		free(fname);
 
-	return ((p - (uint8_t *)buf) + size);
+	return ((p - (u_int8_t *)buf) + size);
 }
 
 static void
-make_directory(char *n, uint32_t m, uint32_t u, uint32_t g, time_t t)
+make_directory(char *n, u_int32_t m, u_int32_t u, u_int32_t g, time_t t)
 {
 	struct a_directory *newdir;
 
@@ -209,7 +207,7 @@ make_directory(char *n, uint32_t m, uint32_t u, uint32_t g, time_t t)
 }
 
 static void
-make_file(char *n, uint8_t *buf, size_t len)
+make_file(char *n, u_int8_t *buf, size_t len)
 {
 	int fd;
 
@@ -221,14 +219,14 @@ make_file(char *n, uint8_t *buf, size_t len)
 	}
 
 	if ((size_t)write(fd, buf, len) != len)
-		warn("could not write %lu bytes", (u_long)len);
+		warn("could not write %lu bytes", (unsigned long)len);
 
 	if (close(fd))
 		warn("close");
 }
 
 static void
-make_symlink(char *n, uint8_t *buf, size_t len)
+make_symlink(char *n, u_int8_t *buf, size_t len)
 {
 	char target[len + 1];
 
diff --git a/package/cfgfs/src/fts.c b/package/cfgfs/src/fts.c
index e271ed538..02d4bfea8 100644
--- a/package/cfgfs/src/fts.c
+++ b/package/cfgfs/src/fts.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 
 #include "defs.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/fts.c,v 1.3 2007/07/02 14:50:21 tg Exp $");
-
 #define internal_function
 
 /* Largest alignment size needed, minus one.
@@ -67,15 +65,15 @@ __RCSID("$MirOS: contrib/hosted/fwcf/fts.c,v 1.3 2007/07/02 14:50:21 tg Exp $");
 #endif
 
 
-static FTSENT	*fts_alloc __P((FTS *, const char *, int)) internal_function;
-static FTSENT	*fts_build __P((FTS *, int)) internal_function;
-static void	 fts_lfree __P((FTSENT *)) internal_function;
-static void	 fts_load __P((FTS *, FTSENT *)) internal_function;
-static size_t	 fts_maxarglen __P((char * const *)) internal_function;
-static void	 fts_padjust __P((FTS *, FTSENT *)) internal_function;
-static int	 fts_palloc __P((FTS *, size_t)) internal_function;
-static FTSENT	*fts_sort __P((FTS *, FTSENT *, int)) internal_function;
-static u_short	 fts_stat __P((FTS *, FTSENT *, int)) internal_function;
+static FTSENT	*fts_alloc (FTS *, const char *, int) internal_function;
+static FTSENT	*fts_build (FTS *, int) internal_function;
+static void	 fts_lfree (FTSENT *) internal_function;
+static void	 fts_load (FTS *, FTSENT *) internal_function;
+static size_t	 fts_maxarglen (char * const *) internal_function;
+static void	 fts_padjust (FTS *, FTSENT *) internal_function;
+static int	 fts_palloc (FTS *, size_t) internal_function;
+static FTSENT	*fts_sort (FTS *, FTSENT *, int) internal_function;
+static u_short	 fts_stat (FTS *, FTSENT *, int) internal_function;
 static int	 fts_safe_changedir(FTS *, FTSENT *, int, char *);
 
 #ifndef MAX
@@ -101,7 +99,7 @@ FTS *
 fts_open(argv, options, compar)
 	char * const *argv;
 	register int options;
-	int (*compar) __P((const FTSENT **, const FTSENT **));
+	int (*compar) (const FTSENT **, const FTSENT **);
 {
 	register FTS *sp;
 	register FTSENT *p, *root;
@@ -119,7 +117,7 @@ fts_open(argv, options, compar)
 	if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
 		return (NULL);
 	memset(sp, 0, sizeof(FTS));
-	sp->fts_compar = (int (*) __P((const void *, const void *))) compar;
+	sp->fts_compar = (int (*) (const void *, const void *)) compar;
 	sp->fts_options = options;
 
 	/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
@@ -694,11 +692,11 @@ fts_build(sp, type)
 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
 			continue;
 
-		if ((p = fts_alloc(sp, dp->d_name, (int)_D_EXACT_NAMLEN (dp))) == NULL)
+		if ((p = fts_alloc(sp, dp->d_name, (int)strlen(dp->d_name))) == NULL)
 			goto mem1;
-		if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
+		if (strlen(dp->d_name) >= maxlen) {/* include space for NUL */
 			oldaddr = sp->fts_path;
-			if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
+			if (fts_palloc(sp, strlen(dp->d_name) + len + 1)) {
 				/*
 				 * No more memory for path or structures.  Save
 				 * errno, free up the current structure and the
@@ -723,7 +721,7 @@ mem1:				saved_errno = errno;
 			maxlen = sp->fts_pathlen - len;
 		}
 
-		if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) {
+		if (len + strlen(dp->d_name) >= USHRT_MAX) {
 			/*
 			 * In an FTSENT, fts_pathlen is a u_short so it is
 			 * possible to wraparound here.  If we do, free up
@@ -740,7 +738,7 @@ mem1:				saved_errno = errno;
 		}
 		p->fts_level = level;
 		p->fts_parent = sp->fts_cur;
-		p->fts_pathlen = len + _D_EXACT_NAMLEN (dp);
+		p->fts_pathlen = len + strlen(dp->d_name);
 
 #if defined FTS_WHITEOUT && 0
 		if (dp->d_type == DT_WHT)
diff --git a/package/cfgfs/src/fts_gnu.h b/package/cfgfs/src/fts_gnu.h
index 08d45a085..9cc6d4d38 100644
--- a/package/cfgfs/src/fts_gnu.h
+++ b/package/cfgfs/src/fts_gnu.h
@@ -123,15 +123,11 @@ typedef struct _ftsent {
 	char fts_name[1];		/* file name */
 } FTSENT;
 
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
 FTSENT	*fts_children(FTS *, int);
 int	 fts_close(FTS *);
 FTS	*fts_open(char * const *, int,
 	    int (*)(const FTSENT **, const FTSENT **));
 FTSENT	*fts_read(FTS *);
 int	 fts_set(FTS *, FTSENT *, int);
-__END_DECLS
 
 #endif /* !_FTS_H_ */
diff --git a/package/cfgfs/src/fts_subs.c b/package/cfgfs/src/fts_subs.c
index ec40219f8..311048a26 100644
--- a/package/cfgfs/src/fts_subs.c
+++ b/package/cfgfs/src/fts_subs.c
@@ -37,8 +37,6 @@
 #define FTSF_INTERNALS
 #include "fts_subs.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/fts_subs.c,v 1.8 2007/07/02 14:53:03 tg Exp $");
-
 static FTS *handle;
 
 char ftsf_prefix[PATH_MAX];
diff --git a/package/cfgfs/src/fts_subs.h b/package/cfgfs/src/fts_subs.h
index c7d2c10fc..b83616a87 100644
--- a/package/cfgfs/src/fts_subs.h
+++ b/package/cfgfs/src/fts_subs.h
@@ -27,11 +27,9 @@ typedef struct FTSF_ENTRY ftsf_entry;
 extern const char ftsf_prefix[];
 #endif
 
-__BEGIN_DECLS
 void ftsf_start(const char *);
 /* returns -1 on error, 0 on empty, 1 on okay */
 int ftsf_next(ftsf_entry *);
 void ftsf_debugent(ftsf_entry *);
-__END_DECLS
 
 #endif
diff --git a/package/cfgfs/src/header.c b/package/cfgfs/src/header.c
index b3db0ce21..146b7ce39 100644
--- a/package/cfgfs/src/header.c
+++ b/package/cfgfs/src/header.c
@@ -33,12 +33,9 @@
 #include "adler.h"
 #include "pack.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/header.c,v 1.7 2006/09/26 10:25:03 tg Exp $"
-    "\t" ADLER_H);
-
 char *
-mkheader(char *f_header, size_t hdrsize, uint32_t outer_len,
-    uint32_t inner_len, uint8_t algo)
+mkheader(char *f_header, size_t hdrsize, u_int32_t outer_len,
+    u_int32_t inner_len, u_int8_t algo)
 {
 	char *hdrptr = f_header;
 	size_t hdrleft = hdrsize;
@@ -68,7 +65,7 @@ mktrailer(char *data, size_t len)
 	size_t hdrleft = 4;
 	ADLER_DECL;
 #ifdef DEBUG_ADLER
-	uint32_t adler = adler32(1, (uint8_t *)data, len);
+	u_int32_t adler = adler32(1, (u_int8_t *)data, len);
 #endif
 
 	ADLER_CALC(data);
diff --git a/package/cfgfs/src/minilzop.c b/package/cfgfs/src/minilzop.c
index 51935185c..6f0f6281b 100644
--- a/