merge of '7a32604865cb7ad63fbc7f14acda9e02229b44b5'

     and '9ab9482d0ea26dbc9267d10e1eb42cc1a7546b6b'

70 files changed, 2831 insertions, 92 deletions

diff --git a/packages/aalib/aalib_1.4rc5.bb b/packages/aalib/aalib_1.4rc5.bb
index c2afe0856c..ed6ee78186 100644
--- a/packages/aalib/aalib_1.4rc5.bb
+++ b/packages/aalib/aalib_1.4rc5.bb
@@ -2,6 +2,7 @@ DEPENDS = "ncurses"
 DESCRIPTION = "An ASCII art gfx library."
 SECTION = "libs"
 LICENSE="LGPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
@@ -12,3 +13,9 @@ inherit autotools
 EXTRA_OECONF = '--without-x11-driver --without-slang-driver \
 		--with-curses-driver --without-gpm \
 		--without-x --with-ncurses=${STAGING_LIBDIR}/..'
+
+do_stage() {
+    oe_libinstall -a -so -C src libaa ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/
+	install -m 0644 src/*.h ${STAGING_INCDIR}/
+}
diff --git a/packages/arm-kernel-shim/.mtn2git_empty b/packages/arm-kernel-shim/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/arm-kernel-shim/.mtn2git_empty
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb
new file mode 100644
index 0000000000..e994e13814
--- /dev/null
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "ARM Kernel Shim"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+	   file://disable-commandline.patch;patch=1 \
+	   file://config-nslu2.h \
+	   file://config-nas100d.h \
+	   file://config-dsmg600.h \
+	   file://config-fsg3.h"
+
+S = ${WORKDIR}/apex-${PV}/arm-kernel-shim
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+	# NSLU2
+	cp ${WORKDIR}/config-nslu2.h ${S}/config.h
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
+	make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
+	# NAS100d
+	cp ${WORKDIR}/config-nas100d.h ${S}/config.h
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
+	make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
+	# DSMG-600
+	cp ${WORKDIR}/config-dsmg600.h ${S}/config.h
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
+	make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
+	# FSG-3
+	cp ${WORKDIR}/config-fsg3.h ${S}/config.h
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
+	make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
+}
+
+do_populate_staging() {
+	install -d ${STAGING_LOADER_DIR}
+	. ${CONFIG_SITE}
+	cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/
+	cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/
+	cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/
+	cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/
+}
diff --git a/packages/arm-kernel-shim/files/.mtn2git_empty b/packages/arm-kernel-shim/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/arm-kernel-shim/files/.mtn2git_empty
diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h
new file mode 100644
index 0000000000..b0f37b3e3b
--- /dev/null
+++ b/packages/arm-kernel-shim/files/config-dsmg600.h
@@ -0,0 +1,30 @@
+/* config.h
+
+   written by Marc Singer
+   23 Jun 2006
+
+   Copyright (C) 2006 Marc Singer
+
+   -----------
+   DESCRIPTION
+   -----------
+
+*/
+
+#if !defined (__CONFIG_H__)
+#    define   __CONFIG_H__
+
+#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+
+#define RAM_BANK0_START	   0x00000000
+#define RAM_BANK0_LENGTH   0x04000000
+
+//#define RAM_BANK1_START	   0xd0000000
+//#define RAM_BANK1_LENGTH   0x10000000
+
+//#define COMMANDLINE\
+// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
+
+#define MACH_TYPE		   964
+
+#endif  /* __CONFIG_H__ */
diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h
new file mode 100644
index 0000000000..1222d959c2
--- /dev/null
+++ b/packages/arm-kernel-shim/files/config-fsg3.h
@@ -0,0 +1,30 @@
+/* config.h
+
+   written by Marc Singer
+   23 Jun 2006
+
+   Copyright (C) 2006 Marc Singer
+
+   -----------
+   DESCRIPTION
+   -----------
+
+*/
+
+#if !defined (__CONFIG_H__)
+#    define   __CONFIG_H__
+
+#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+
+#define RAM_BANK0_START	   0x00000000
+#define RAM_BANK0_LENGTH   0x04000000
+
+//#define RAM_BANK1_START	   0xd0000000
+//#define RAM_BANK1_LENGTH   0x10000000
+
+//#define COMMANDLINE\
+// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
+
+#define MACH_TYPE		   1091
+
+#endif  /* __CONFIG_H__ */
diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h
new file mode 100644
index 0000000000..5f148a666a
--- /dev/null
+++ b/packages/arm-kernel-shim/files/config-nas100d.h
@@ -0,0 +1,30 @@
+/* config.h
+
+   written by Marc Singer
+   23 Jun 2006
+
+   Copyright (C) 2006 Marc Singer
+
+   -----------
+   DESCRIPTION
+   -----------
+
+*/
+
+#if !defined (__CONFIG_H__)
+#    define   __CONFIG_H__
+
+#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+
+#define RAM_BANK0_START	   0x00000000
+#define RAM_BANK0_LENGTH   0x04000000
+
+//#define RAM_BANK1_START	   0xd0000000
+//#define RAM_BANK1_LENGTH   0x10000000
+
+//#define COMMANDLINE\
+// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
+
+#define MACH_TYPE		   865
+
+#endif  /* __CONFIG_H__ */
diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h
new file mode 100644
index 0000000000..7547061165
--- /dev/null
+++ b/packages/arm-kernel-shim/files/config-nslu2.h
@@ -0,0 +1,30 @@
+/* config.h
+
+   written by Marc Singer
+   23 Jun 2006
+
+   Copyright (C) 2006 Marc Singer
+
+   -----------
+   DESCRIPTION
+   -----------
+
+*/
+
+#if !defined (__CONFIG_H__)
+#    define   __CONFIG_H__
+
+#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+
+#define RAM_BANK0_START	   0x00000000
+#define RAM_BANK0_LENGTH   0x02000000
+
+//#define RAM_BANK1_START	   0xd0000000
+//#define RAM_BANK1_LENGTH   0x10000000
+
+//#define COMMANDLINE\
+// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
+
+#define MACH_TYPE		   597
+
+#endif  /* __CONFIG_H__ */
diff --git a/packages/arm-kernel-shim/files/disable-commandline.patch b/packages/arm-kernel-shim/files/disable-commandline.patch
new file mode 100644
index 0000000000..d8c59f1a6b
--- /dev/null
+++ b/packages/arm-kernel-shim/files/disable-commandline.patch
@@ -0,0 +1,28 @@
+--- arm-kernel-shim/main.c~	2006-07-21 11:12:07.000000000 +0930
++++ arm-kernel-shim/main.c	2007-01-28 11:56:35.000000000 +1030
+@@ -47,7 +47,9 @@
+ 
+ #define NAKED		__attribute__((naked))
+ 
++#if defined (COMMANDLINE)
+ const char __attribute__((section(".rodata"))) cmdline[] = COMMANDLINE;
++#endif
+ 
+ void NAKED __attribute__((section(".boot"))) boot (u32 r0, u32 r1, u32 r2)
+ {
+@@ -82,6 +84,7 @@
+   pv += H_SIZE(pv)*4;
+ #endif
+ 
++#if defined (COMMANDLINE)
+ 	/* Command line */
+   H_SIZE(pv)		= tag_size(tag_cmdline) + (sizeof (cmdline)+1+3)/4;
+   H_TAG(pv)		= ATAG_CMDLINE;
+@@ -91,6 +94,7 @@
+       P_CMDLINE(pv)->cmdline[i] = cmdline[i];
+   }
+   pv += H_SIZE(pv)*4;
++#endif
+ 
+ 	/* End */
+   H_SIZE(pv)		= 0;
diff --git a/packages/bb/.mtn2git_empty b/packages/bb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bb/.mtn2git_empty
diff --git a/packages/bb/bb_1.2.bb b/packages/bb/bb_1.2.bb
new file mode 100644
index 0000000000..0629f74faf
--- /dev/null
+++ b/packages/bb/bb_1.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "bb, The portable aalib demo"
+HOMEPAGE = "http://aa-project.sourceforge.net/bb/"
+SECTION = "console/misc"
+LICENSE = "GPLv2"
+DEPENDS = "aalib"
+PR = "r1"
+
+SRC_URI = "http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz \
+           file://fix-compile.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 bb ${D}${bindir}
+}
diff --git a/packages/bb/files/.mtn2git_empty b/packages/bb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bb/files/.mtn2git_empty
diff --git a/packages/bb/files/fix-compile.patch b/packages/bb/files/fix-compile.patch
new file mode 100644
index 0000000000..75641da1e5
--- /dev/null
+++ b/packages/bb/files/fix-compile.patch
@@ -0,0 +1,166 @@
+Index: bb-1.2/bb.h
+===================================================================
+--- bb-1.2.orig/bb.h
++++ bb-1.2/bb.h
+@@ -23,7 +23,11 @@
+ 
+ #ifndef BB_H
+ #define BB_H
++//#include <aaint.h>
+ #include <aalib.h>
++struct parameters {
++    unsigned int p[AA_NPARAMS];
++};
+ #include "image.h"
+ #include "timers.h"
+ struct font {
+Index: bb-1.2/textform.c
+===================================================================
+--- bb-1.2.orig/textform.c
++++ bb-1.2/textform.c
+@@ -155,41 +155,41 @@ static char *text = "#cWell we've reache
+ "#c\n"
+ "#bThree goals of AA-Project:#n"
+ "\n\n"
+-"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib.
+-
+-2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp).
+-
+-3)Force IBM to start manufacturing MDA cards again.
+-
+-AA-project was started by Jan Hubicka. In that times just few people knew about \
+-it. Then a new demo named BB has been relased to show the power \
+-of AA-lib technology. Now the project is freely available and anyone can help.
+-
+-Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo.
+-
+-All programs covered under AA-project can be obtained at
+-#c#bftp://ftp.ta.jcu.cz://pub/aa#n
+-#c
+-Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of \
+-examples of ascii-art generated by aalib, pointers to other AA-Project \
+-resources etc. 
+-        
+-   We decided to distribute all of our aa-related programs freely (see \
+-COPYING for details). But if you want to help us develop more such software \
+-send a small amount (or big one ;-) to AA/BB maintainer address: 
+-
+-Kamil Toman
+-CS Armady 1930, Tabor
+-390 03
+-Czech republic
+-
+-and contact us at:
+-
+-kupsaf@feld.cvut.cz (Filip Kupsa)
+-hubicka@paru.cas.cz (Jan Hubicka)
+-titania@horac.ta.jcu.cz (Mojmir Svoboda)
+-toman@horac.ta.jcu.cz (Kamil Toman)
+-#f"
++"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib.\n"
++"\n"
++"2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp).\n"
++"\n"
++"3)Force IBM to start manufacturing MDA cards again.\n"
++"\n"
++"AA-project was started by Jan Hubicka. In that times just few people knew about "
++"it. Then a new demo named BB has been relased to show the power "
++"of AA-lib technology. Now the project is freely available and anyone can help.\n"
++"\n"
++"Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo.\n"
++"\n"
++"All programs covered under AA-project can be obtained at\n"
++"#c#bftp://ftp.ta.jcu.cz://pub/aa#n\n"
++"#c\n"
++"Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of "
++"examples of ascii-art generated by aalib, pointers to other AA-Project "
++"resources etc. \n"
++"        \n"
++"   We decided to distribute all of our aa-related programs freely (see "
++"COPYING for details). But if you want to help us develop more such software "
++"send a small amount (or big one ;-) to AA/BB maintainer address: \n"
++"\n"
++"Kamil Toman\n"
++"CS Armady 1930, Tabor\n"
++"390 03\n"
++"Czech republic\n"
++"\n"
++"and contact us at:\n"
++"\n"
++"kupsaf@feld.cvut.cz (Filip Kupsa)\n"
++"hubicka@paru.cas.cz (Jan Hubicka)\n"
++"titania@horac.ta.jcu.cz (Mojmir Svoboda)\n"
++"toman@horac.ta.jcu.cz (Kamil Toman)\n"
++"#f"
+ "\n"
+ "#l\n"
+ "#c#bAvailable programs#n\n"
+@@ -245,37 +245,37 @@ toman@horac.ta.jcu.cz (Kamil Toman)
+ "\n#l"
+ "\n"
+ "#c#bThe AA-Lib#n\n"
+-"#f#c
+-AA-lib is a low level gfx library just as many other libraries are. The \
+-main difference is that AA-lib does not require graphics device. In fact, \
+-there is no graphical output possible. AA-lib replaces those old-fashioned \
+-output methods with powerful ascii-art renderer. Now my linux boots \
+-with a nice penguin logo at secondary display (yes! Like Win95 does:) \
+-AA-lib API is designed to be similar to other graphics libraries. Learning \
+-a new API would be a piece of cake! \
+-#f
+-
+-#l
+-#c#bThe history#n
+-#f
+-Once upon a time we've (my friend Kamil and I) bought two old Herculeses \
+-as secondary monitors. We didn't know for that time that our Diamond \
+-Stealths 64 cards would become obsolete soon. Next day we downloaded \
+-the logo of Linux Texas Users Group \
+-- nice silly penguin looking like a cowboy! It was so exciting logo ... we \
+-decided that we couldn't live without it and we wanted to see it every time \
+-at a boot time as a logo on our secondary monitors. There was a small problem \
+-- Hercules doesn't support color graphics. So we decided to convert an image \
+-to ascii art using netpbm tools.
+-
+-The output was very ugly because the converting algorithm was absolutly stupid. \
+-During the night I desig