From c6085182fd76b38e1f451ab61414b0bcccd10726 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 20 Nov 2007 23:40:11 +0000
Subject: busybox-static 1.2.1: Enable support for -t & -n options for read
 command. * These are timeout and num chars to read options, both are useful
 when writing UI interaction code, with busybox-static being targetted at
 writing bootloader tools and stuff.

---
 packages/busybox/busybox-static-1.2.1/defconfig | 4 ++--
 packages/busybox/busybox-static_1.2.1.bb        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/busybox/busybox-static-1.2.1/defconfig b/packages/busybox/busybox-static-1.2.1/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-static-1.2.1/defconfig
+++ b/packages/busybox/busybox-static-1.2.1/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb
index f3bff07530..519468039a 100644
--- a/packages/busybox/busybox-static_1.2.1.bb
+++ b/packages/busybox/busybox-static_1.2.1.bb
@@ -1,5 +1,5 @@
 require busybox_${PV}.bb
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/busybox-1.2.1"
 
-- 
cgit v1.2.3


From 65fe7a50164012f345b5dc1a5ebffa24e40dde92 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 21 Nov 2007 08:04:43 +0000
Subject: fftw: add RPROVIDES libfftw3

---
 packages/fftw/fftw.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/fftw/fftw.inc b/packages/fftw/fftw.inc
index 88c946b1d4..acd1b27f4b 100644
--- a/packages/fftw/fftw.inc
+++ b/packages/fftw/fftw.inc
@@ -2,6 +2,7 @@ DESCRIPTION = "FFTW"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
+RPROVIDES += "libfftw3"
 
 PR = "r1"
 
-- 
cgit v1.2.3


From c690d0aa1271976295342130e104f37660ee10e3 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 21 Nov 2007 08:52:51 +0000
Subject: octave: add buidable stable 2.1.73 and testing 2.9.17

---
 MAINTAINERS                           |  2 +-
 packages/octave/files/.mtn2git_empty  |  0
 packages/octave/files/configure.patch | 15 +++++++++++++++
 packages/octave/octave.inc            | 29 +++++++++++++++++++++++++++++
 packages/octave/octave_2.1.71.bb      | 17 -----------------
 packages/octave/octave_2.1.73.bb      | 11 +++++++++++
 packages/octave/octave_2.9.17.bb      | 27 +++++++++++++++++++++++++++
 7 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 packages/octave/files/.mtn2git_empty
 create mode 100644 packages/octave/files/configure.patch
 create mode 100644 packages/octave/octave.inc
 delete mode 100644 packages/octave/octave_2.1.71.bb
 create mode 100644 packages/octave/octave_2.1.73.bb
 create mode 100644 packages/octave/octave_2.9.17.bb

diff --git a/MAINTAINERS b/MAINTAINERS
index 0b039beeea..53c4380116 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -94,7 +94,7 @@ Person:     Junqian Gordon Xu 'xjqian'
 Mail:       xjqian@gmail.com
 Machines:   tosa, borzoi, nokia770
 Distros:    Ångström
-Recipes:    gnuplot
+Recipes:    gnuplot octave
 
 Person:     Justin Patrin
 Mail:       papercrane@reversefold.com
diff --git a/packages/octave/files/.mtn2git_empty b/packages/octave/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/octave/files/configure.patch b/packages/octave/files/configure.patch
new file mode 100644
index 0000000000..f94e5ae8c0
--- /dev/null
+++ b/packages/octave/files/configure.patch
@@ -0,0 +1,15 @@
+--- octave-2.9.17/configure.old	2007-11-17 18:57:35.000000000 -0600
++++ octave-2.9.17/configure	2007-11-17 19:08:33.000000000 -0600
+@@ -22598,11 +22598,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
diff --git a/packages/octave/octave.inc b/packages/octave/octave.inc
new file mode 100644
index 0000000000..414f95bf83
--- /dev/null
+++ b/packages/octave/octave.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
+It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
+and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
+It may also be used as a batch-oriented language."
+HOMEPAGE = "http://www.gnu.org/software/octave/"
+SECTION = "console/scientific"
+LICENSE = "GPL"
+DEPENDS = "readline ncurses fftw"
+RDEPENDS = "libfftw3"
+# fftw compiled with --disable-fortran
+
+inherit autotools
+
+EXTRA_OECONF = "--without-hdf5"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+PACKAGES =+ "octave-m"
+
+# octave-m provides matlab routines in .m file format
+FILES_${PN}-m = "${datadir}/${PN}/*"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/octave/octave_2.1.71.bb b/packages/octave/octave_2.1.71.bb
deleted file mode 100644
index 22c4d69393..0000000000
--- a/packages/octave/octave_2.1.71.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
-It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
-and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
-It may also be used as a batch-oriented language."
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "readline ncurses"
-SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
-
-inherit autotools
-
-FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
diff --git a/packages/octave/octave_2.1.73.bb b/packages/octave/octave_2.1.73.bb
new file mode 100644
index 0000000000..a6bf240732
--- /dev/null
+++ b/packages/octave/octave_2.1.73.bb
@@ -0,0 +1,11 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
+
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"
diff --git a/packages/octave/octave_2.9.17.bb b/packages/octave/octave_2.9.17.bb
new file mode 100644
index 0000000000..5473e0d99e
--- /dev/null
+++ b/packages/octave/octave_2.9.17.bb
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+	     libcruft-dev liboctave-dev liboctinterp-dev \
+             libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
-- 
cgit v1.2.3


From 220023a1bd25f3f3e81e89e56b1e707fe1e29949 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 21 Nov 2007 09:03:05 +0000
Subject: gcc-(cross)_4.1.2: enable gfortran and gfortran packaging

---
 packages/gcc/gcc-package.inc | 8 ++++++++
 packages/gcc/gcc3-build.inc  | 2 +-
 packages/gcc/gcc_4.1.2.bb    | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc
index 82bf78db80..1eee631e33 100644
--- a/packages/gcc/gcc-package.inc
+++ b/packages/gcc/gcc-package.inc
@@ -5,6 +5,7 @@ PACKAGES = "libgcc ${PN} ${PN}-symlinks \
             g++ g++-symlinks \
 	    cpp cpp-symlinks \
             g77 g77-symlinks \
+            gfortran gfortran-symlinks \
 	    gcov gcov-symlinks \
             libmudflap libmudflap-dev \
 	    libstdc++ libg2c \
@@ -28,6 +29,11 @@ FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \
 FILES_g77-symlinks = "${bindir}/g77 \
 			    ${bindir}/f77"
 
+FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951"
+FILES_gfortran-symlinks = "${bindir}/gfortran \
+			    ${bindir}/f95"
+
 FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \
 	     ${base_libdir}/cpp"
 FILES_cpp-symlinks = "${bindir}/cpp"
@@ -115,9 +121,11 @@ do_install () {
 
 	# Symlinks so we can use these trivially on the target
 	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-gfortran gfortran
 	ln -sf ${TARGET_SYS}-g++ g++
 	ln -sf ${TARGET_SYS}-gcc gcc
 	ln -sf g77 f77
+	ln -sf gfortran f95
 	ln -sf g++ c++
 	ln -sf gcc cc
 	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index 2924f0f9dd..bb48f7b099 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -16,7 +16,7 @@ JAVA_arm ?= ""
 JAVA_armeb ?= ""
 JAVA_mipsel ?= ""
 JAVA_sh3 ?= ""
-# gcc4-build sets this to f95
+# gcc4-build sets this to fortran
 FORTRAN ?= ",f77"
 LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
 
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 0f8cfa46b4..719379c805 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -39,6 +39,7 @@ SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 #Set the fortran bits
 # ',fortran' or '', not 'f77' like gcc3 had
 FORTRAN = ""
+FORTRAN_linux-gnueabi = ",fortran"
 
 #Set the java bits
 JAVA = ""
-- 
cgit v1.2.3


From 6a79b3cb774592d82a7d3aeaaa1d31119bda79b8 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 22 Nov 2007 02:32:52 +0000
Subject: mpfr: add (native)_2.3.0, unify, closes #3339

---
 packages/mpfr/mpfr-native_2.3.0.bb |  4 ++++
 packages/mpfr/mpfr.inc             |  6 ++++++
 packages/mpfr/mpfr_2.1.1.bb        | 10 ++++------
 packages/mpfr/mpfr_2.3.0.bb        | 16 ++++++++++++++++
 packages/mpfr/mpfr_cvs.bb          | 10 ++++------
 5 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 packages/mpfr/mpfr-native_2.3.0.bb
 create mode 100644 packages/mpfr/mpfr.inc
 create mode 100644 packages/mpfr/mpfr_2.3.0.bb

diff --git a/packages/mpfr/mpfr-native_2.3.0.bb b/packages/mpfr/mpfr-native_2.3.0.bb
new file mode 100644
index 0000000000..01ba37c8bf
--- /dev/null
+++ b/packages/mpfr/mpfr-native_2.3.0.bb
@@ -0,0 +1,4 @@
+require mpfr_${PV}.bb
+inherit native
+DEPENDS = "gmp-native"
+
diff --git a/packages/mpfr/mpfr.inc b/packages/mpfr/mpfr.inc
new file mode 100644
index 0000000000..cf898b62b6
--- /dev/null
+++ b/packages/mpfr/mpfr.inc
@@ -0,0 +1,6 @@
+DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE = "http://www.mpfr.org/"
+LICENSE = "LGPL"
+SECTION = "libs"
+
+inherit autotools
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index 10383b1caa..6127e5dae9 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -1,14 +1,12 @@
-DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
-LICENSE = "LGPL"
-SECTION = "libs"
+require mpfr.inc
+
 DEPENDS = "gmp"
-PR = "r2"
+
+PR = "r3"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
 
-inherit autotools
-
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
 	       bindir=${STAGING_BINDIR} \
diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb
new file mode 100644
index 0000000000..f9d3b44d0b
--- /dev/null
+++ b/packages/mpfr/mpfr_2.3.0.bb
@@ -0,0 +1,16 @@
+require mpfr.inc
+
+DEPENDS = "gmp"
+
+PR = "r0"
+
+SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
+S = "${WORKDIR}/mpfr-${PV}"
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb
index fcea24633a..14b762408c 100644
--- a/packages/mpfr/mpfr_cvs.bb
+++ b/packages/mpfr/mpfr_cvs.bb
@@ -1,15 +1,13 @@
-DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
-LICENSE = "LGPL"
-SECTION = "libs"
+require mpfr.inc
+
 DEPENDS = "gmp"
+
 PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver"
 S = "${WORKDIR}/mpfr"
 
-inherit autotools
-
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
 	       bindir=${STAGING_BINDIR} \
-- 
cgit v1.2.3


From 8c972aa2eff2f3541a4064adcd403416d890794e Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Thu, 22 Nov 2007 12:02:30 +0000
Subject: xserver-kdrive_1.3.0.0.bb : fix x86 breakage with glamo patch

---
 .../xserver-kdrive-1.3.0.0/build-glamo.patch       | 67 +++++++++++++---------
 packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb    |  2 +-
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch
index f4757ce3c9..208e599ee1 100644
--- a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch
+++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch
@@ -1,8 +1,16 @@
-diff --git a/configure.ac b/configure.ac
-index 76d33f0..2807c50 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1824,6 +1824,7 @@ hw/kdrive/ati/Makefile
+Index: xorg-server-1.3.0.0/configure.ac
+===================================================================
+--- xorg-server-1.3.0.0.orig/configure.ac	2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/configure.ac	2007-11-22 17:59:56.000000000 +0800
+@@ -1576,6 +1576,7 @@
+ AM_CONDITIONAL(H3600_TS, false)
+ AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
+ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
++AM_CONDITIONAL(KDRIVEGLAMO, [test x"$ac_cv_header_sys_vm86_h" = xyes -o x"$ac_cv_header_linux_fb_h" = xyes])
+ 
+ # Xephyr needs nanosleep() which is in librt on Solaris
+ AC_CHECK_FUNC([nanosleep], [],
+@@ -1824,6 +1825,7 @@
  hw/kdrive/chips/Makefile
  hw/kdrive/ephyr/Makefile
  hw/kdrive/epson/Makefile
@@ -10,30 +18,37 @@ index 76d33f0..2807c50 100644
  hw/kdrive/fake/Makefile
  hw/kdrive/fbdev/Makefile
  hw/kdrive/w100/Makefile
-diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
-index 8075a56..b97912d 100644
---- a/hw/kdrive/Makefile.am
-+++ b/hw/kdrive/Makefile.am
-@@ -4,7 +4,7 @@ VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
- endif
- 
- if KDRIVEFBDEV
--FBDEV_SUBDIRS = fbdev epson
-+FBDEV_SUBDIRS = fbdev epson glamo
+Index: xorg-server-1.3.0.0/hw/kdrive/Makefile.am
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/Makefile.am	2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/hw/kdrive/Makefile.am	2007-11-22 17:54:54.000000000 +0800
+@@ -7,6 +7,10 @@
+ FBDEV_SUBDIRS = fbdev epson
  endif
  
++if KDRIVEGLAMO
++GLAMO_SUBDIRS = glamo
++endif
++
  if KDRIVEW100
-@@ -34,4 +34,4 @@ SUBDIRS =			\
+ W100_SUBDIRS = w100
+ endif
+@@ -30,8 +34,9 @@
+ 	$(FBDEV_SUBDIRS)	\
+ 	$(W100_SUBDIRS)		\
+ 	$(VESA_SUBDIRS)		\
++	$(GLAMO_SUBDIRS)	\
+ 	$(XEPHYR_SUBDIRS)       \
  	fake
  
  DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
 -               smi via fbdev sdl ephyr src linux fake sis300
 +               smi via fbdev sdl ephyr src linux fake sis300 glamo
-diff --git a/hw/kdrive/glamo/Makefile.am b/hw/kdrive/glamo/Makefile.am
-index e8c48a4..ffb7a30 100644
---- a/hw/kdrive/glamo/Makefile.am
-+++ b/hw/kdrive/glamo/Makefile.am
-@@ -41,11 +41,14 @@ GLAMO_LIBS =				\
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am	2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am	2007-11-22 17:40:35.000000000 +0800
+@@ -41,11 +41,14 @@
  
  Xglamo_LDADD = \
  	$(GLAMO_LIBS)			\
@@ -50,11 +65,11 @@ index e8c48a4..ffb7a30 100644
  
  relink:
  	rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
-diff --git a/hw/kdrive/glamo/glamo_stub.c b/hw/kdrive/glamo/glamo_stub.c
-index d772671..df43455 100644
---- a/hw/kdrive/glamo/glamo_stub.c
-+++ b/hw/kdrive/glamo/glamo_stub.c
-@@ -49,16 +49,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c	2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c	2007-11-22 17:40:35.000000000 +0800
+@@ -49,16 +49,10 @@
  void
  InitInput(int argc, char **argv)
  {
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 7c60fb391e..f78bef05ae 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r20"
+PR = "r21"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-- 
cgit v1.2.3


From 36387e28eb6cf1f1b2542ff5bbc4d185995c8076 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 22 Nov 2007 12:05:21 +0000
Subject: initrdscripts: Introduce boot order support for universal initramfs
 modules.

---
 packages/initrdscripts/files/80-loopboot.sh        | 54 ++++++++++++++++++++++
 packages/initrdscripts/files/80-nfsboot.sh         | 43 +++++++++++++++++
 packages/initrdscripts/files/85-blockboot.sh       |  8 ++++
 packages/initrdscripts/files/blockboot.sh          |  8 ----
 packages/initrdscripts/files/loopboot.sh           | 54 ----------------------
 packages/initrdscripts/files/nfsboot.sh            | 43 -----------------
 .../initrdscripts/initramfs-module-block_0.1.bb    |  4 +-
 .../initrdscripts/initramfs-module-loop_0.1.bb     |  4 +-
 packages/initrdscripts/initramfs-module-nfs_0.1.bb |  4 +-
 9 files changed, 111 insertions(+), 111 deletions(-)
 create mode 100644 packages/initrdscripts/files/80-loopboot.sh
 create mode 100644 packages/initrdscripts/files/80-nfsboot.sh
 create mode 100644 packages/initrdscripts/files/85-blockboot.sh
 delete mode 100644 packages/initrdscripts/files/blockboot.sh
 delete mode 100644 packages/initrdscripts/files/loopboot.sh
 delete mode 100644 packages/initrdscripts/files/nfsboot.sh

diff --git a/packages/initrdscripts/files/80-loopboot.sh b/packages/initrdscripts/files/80-loopboot.sh
new file mode 100644
index 0000000000..55a1948db8
--- /dev/null
+++ b/packages/initrdscripts/files/80-loopboot.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+if [ "$ROOT_DEVICE" = "/dev/loop" ]; then
+    loop_mount() {
+        loopdev=/dev/loop$loop_num
+        mountpt=/mnt/loop$loop_num
+
+        [ -e $loopdev ] || mknod $loopdev b 7 $loop_num
+
+        # if only one argument was specified, let it be path not dev
+        if [ -z "$path" ] && [ -n "$dev" ]; then
+            path="$dev"
+            dev=""
+        fi
+        [ -z "$offset" ] && offset=0
+     
+        if [ -n "$dev" ]; then
+            hostpt=`expr "$dev" : '.*/\([^/]*\)'`
+            [ -z "$hostpt" ] && hostpt="$dev"
+            
+            echo "Mounting $dev on $hostpt"
+            mkdir $hostpt
+            mount $dev $hostpt
+            cd $hostpt
+        fi
+    
+        echo "Loopback setup of $path (offset $offset)"
+        losetup -o "$offset" "$loopdev" "$path"
+
+        echo "Mounting $loopdev on $mountpt"
+        mkdir "$mountpt"
+        mount "$loopdev" "$mountpt"
+        cd "$mountpt"
+        BOOT_ROOT="$mountpt"
+        loop_num=`expr "$loop_num" + 1`
+    }
+
+    modprobe vfat
+    modprobe loop
+    
+    loop_num=0
+    
+    for arg in $CMDLINE; do
+        optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+        echo $arg xxx $optarg 
+        case $arg in
+            looproot=*)
+                dev=`expr "$optarg" : '\([^:]*\).*'`
+                path=`expr "$optarg" : '[^:]*:\([^:]*\).*'`
+                offset=`expr "$optarg" : '[^:]*:[^:]*:\([^:]*\).*'`
+                loop_mount ;;
+        esac
+    done
+fi 
diff --git a/packages/initrdscripts/files/80-nfsboot.sh b/packages/initrdscripts/files/80-nfsboot.sh
new file mode 100644
index 0000000000..5129a53ebb
--- /dev/null
+++ b/packages/initrdscripts/files/80-nfsboot.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then
+
+    # These correspond to what kernel itself uses
+    # DO NOT CHANGE!
+    NFS_OPTIONS="-o nfsvers=2,nolock"
+
+    for arg in $CMDLINE; do
+        echo $arg
+        optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+        echo $optarg
+        case $arg in
+            nfsroot=*)
+                nfsroot=$optarg ;;
+            ip=*)
+                ip=$optarg ;;
+        esac
+    done
+    
+    echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \
+    echo client_ip=$client_ip;
+    echo server_ip=$server_ip;
+    echo gw_ip=$gw_ip;
+    echo netmask=$netmask;
+    echo hostname=$hostname;
+    echo device=$device;
+    echo autoconf=$autoconf;
+    
+    case "$device" in
+        usb*)
+    	echo "USB"
+    	modprobe g_ether
+    	;;
+    esac
+    
+    ifconfig $device $client_ip
+    )
+
+    echo "booting from NFS: $nfsroot"
+    mount -t nfs $NFS_OPTIONS $nfsroot /mnt
+    BOOT_ROOT=/mnt
+fi
diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh
new file mode 100644
index 0000000000..567f7e29b3
--- /dev/null
+++ b/packages/initrdscripts/files/85-blockboot.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Allow booting from a normal block device.
+
+if [ -e "$ROOT_DEVICE" ]; then
+    echo "booting from: $ROOT_DEVICE"
+    mount "$ROOT_DEVICE" /mnt
+    BOOT_ROOT=/mnt
+fi
diff --git a/packages/initrdscripts/files/blockboot.sh b/packages/initrdscripts/files/blockboot.sh
deleted file mode 100644
index 567f7e29b3..0000000000
--- a/packages/initrdscripts/files/blockboot.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Allow booting from a normal block device.
-
-if [ -e "$ROOT_DEVICE" ]; then
-    echo "booting from: $ROOT_DEVICE"
-    mount "$ROOT_DEVICE" /mnt
-    BOOT_ROOT=/mnt
-fi
diff --git a/packages/initrdscripts/files/loopboot.sh b/packages/initrdscripts/files/loopboot.sh
deleted file mode 100644
index 55a1948db8..0000000000
--- a/packages/initrdscripts/files/loopboot.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-if [ "$ROOT_DEVICE" = "/dev/loop" ]; then
-    loop_mount() {
-        loopdev=/dev/loop$loop_num
-        mountpt=/mnt/loop$loop_num
-
-        [ -e $loopdev ] || mknod $loopdev b 7 $loop_num
-
-        # if only one argument was specified, let it be path not dev
-        if [ -z "$path" ] && [ -n "$dev" ]; then
-            path="$dev"
-            dev=""
-        fi
-        [ -z "$offset" ] && offset=0
-     
-        if [ -n "$dev" ]; then
-            hostpt=`expr "$dev" : '.*/\([^/]*\)'`
-            [ -z "$hostpt" ] && hostpt="$dev"
-            
-            echo "Mounting $dev on $hostpt"
-            mkdir $hostpt
-            mount $dev $hostpt
-            cd $hostpt
-        fi
-    
-        echo "Loopback setup of $path (offset $offset)"
-        losetup -o "$offset" "$loopdev" "$path"
-
-        echo "Mounting $loopdev on $mountpt"
-        mkdir "$mountpt"
-        mount "$loopdev" "$mountpt"
-        cd "$mountpt"
-        BOOT_ROOT="$mountpt"
-        loop_num=`expr "$loop_num" + 1`
-    }
-
-    modprobe vfat
-    modprobe loop
-    
-    loop_num=0
-    
-    for arg in $CMDLINE; do
-        optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
-        echo $arg xxx $optarg 
-        case $arg in
-            looproot=*)
-                dev=`expr "$optarg" : '\([^:]*\).*'`
-                path=`expr "$optarg" : '[^:]*:\([^:]*\).*'`
-                offset=`expr "$optarg" : '[^:]*:[^:]*:\([^:]*\).*'`
-                loop_mount ;;
-        esac
-    done
-fi 
diff --git a/packages/initrdscripts/files/nfsboot.sh b/packages/initrdscripts/files/nfsboot.sh
deleted file mode 100644
index 5129a53ebb..0000000000
--- a/packages/initrdscripts/files/nfsboot.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then
-
-    # These correspond to what kernel itself uses
-    # DO NOT CHANGE!
-    NFS_OPTIONS="-o nfsvers=2,nolock"
-
-    for arg in $CMDLINE; do
-        echo $arg
-        optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
-        echo $optarg
-        case $arg in
-            nfsroot=*)
-                nfsroot=$optarg ;;
-            ip=*)
-                ip=$optarg ;;
-        esac
-    done
-    
-    echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \
-    echo client_ip=$client_ip;
-    echo server_ip=$server_ip;
-    echo gw_ip=$gw_ip;
-    echo netmask=$netmask;
-    echo hostname=$hostname;
-    echo device=$device;
-    echo autoconf=$autoconf;
-    
-    case "$device" in
-        usb*)
-    	echo "USB"
-    	modprobe g_ether
-    	;;
-    esac
-    
-    ifconfig $device $client_ip
-    )
-
-    echo "booting from NFS: $nfsroot"
-    mount -t nfs $NFS_OPTIONS $nfsroot /mnt
-    BOOT_ROOT=/mnt
-fi
diff --git a/packages/initrdscripts/initramfs-module-block_0.1.bb b/packages/initrdscripts/initramfs-module-block_0.1.bb
index a0cb2fd7fa..2c7079af61 100644
--- a/packages/initrdscripts/initramfs-module-block_0.1.bb
+++ b/packages/initrdscripts/initramfs-module-block_0.1.bb
@@ -1,11 +1,11 @@
 SRC_URI = "file://blockboot.sh"
-PR = "r2"
+PR = "r3"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
 do_install() {
 	install -d ${D}/initrd.d
-        install -m 0755 ${WORKDIR}/blockboot.sh ${D}/initrd.d/block
+        install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/
 }
 
 FILES_${PN} += " /initrd.d/block "
diff --git a/packages/initrdscripts/initramfs-module-loop_0.1.bb b/packages/initrdscripts/initramfs-module-loop_0.1.bb
index d4e5aa038f..afc77a46f0 100644
--- a/packages/initrdscripts/initramfs-module-loop_0.1.bb
+++ b/packages/initrdscripts/initramfs-module-loop_0.1.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://loopboot.sh"
-PR = "r3"
+PR = "r4"
 DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
                mounting it."
 RDEPENDS = "initramfs-uniboot"
@@ -7,7 +7,7 @@ RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
 
 do_install() {
 	install -d ${D}/initrd.d
-        install -m 0755 ${WORKDIR}/loopboot.sh ${D}/initrd.d/loop
+        install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/
 }
 
 FILES_${PN} += " /initrd.d/loop "
diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_0.1.bb
index 24284d6c5f..beadcf1c35 100644
--- a/packages/initrdscripts/initramfs-module-nfs_0.1.bb
+++ b/packages/initrdscripts/initramfs-module-nfs_0.1.bb
@@ -1,12 +1,12 @@
 SRC_URI = "file://nfsboot.sh"
-PR = "r4"
+PR = "r5"
 DESCRIPTION = "An initramfs module for booting via NFS."
 RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
 
 do_install() {
 	install -d ${D}/initrd.d
-        install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs
+        install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/
 }
 
 FILES_${PN} += " /initrd.d/nfs "
-- 
cgit v1.2.3


From 505b03b2909a607e2dd8693ef95e0d62d6f3212b Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 22 Nov 2007 12:07:37 +0000
Subject: initrdscripts: Initial value for ROOT_DEV is null.

---
 packages/initrdscripts/files/init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 8c9803f21b..261a3b8477 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -2,7 +2,7 @@
 
 MODULE_DIR=/initrd.d
 BOOT_ROOT=
-ROOT_DEVICE=/dev/null
+ROOT_DEVICE=
 
 early_setup() {
     mkdir /proc
-- 
cgit v1.2.3


From d0e74671ac72a53a9864e35e16c2d27ed91874bf Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 22 Nov 2007 12:16:41 +0000
Subject: initrdscripts: Separate fs kernel module loading to separate plugin.

---
 packages/initrdscripts/files/10-initfs.sh             |  5 +++++
 packages/initrdscripts/files/80-loopboot.sh           |  1 -
 packages/initrdscripts/initramfs-module-initfs_1.0.bb | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 packages/initrdscripts/files/10-initfs.sh
 create mode 100644 packages/initrdscripts/initramfs-module-initfs_1.0.bb

diff --git a/packages/initrdscripts/files/10-initfs.sh b/packages/initrdscripts/files/10-initfs.sh
new file mode 100644
index 0000000000..b336af6bbb
--- /dev/null
+++ b/packages/initrdscripts/files/10-initfs.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+modprobe vfat
+modprobe ext2
+modprobe ext3
diff --git a/packages/initrdscripts/files/80-loopboot.sh b/packages/initrdscripts/files/80-loopboot.sh
index 55a1948db8..7fbf69a202 100644
--- a/packages/initrdscripts/files/80-loopboot.sh
+++ b/packages/initrdscripts/files/80-loopboot.sh
@@ -35,7 +35,6 @@ if [ "$ROOT_DEVICE" = "/dev/loop" ]; then
         loop_num=`expr "$loop_num" + 1`
     }
 
-    modprobe vfat
     modprobe loop
     
     loop_num=0
diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
new file mode 100644
index 0000000000..f085dcd0bc
--- /dev/null
+++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
@@ -0,0 +1,12 @@
+SRC_URI = "file://10-initfs.sh"
+PR = "r0"
+DESCRIPTION = "An initramfs module for initializing filesystems."
+RDEPENDS = "initramfs-uniboot"
+RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/10-initfs.sh ${D}/initrd.d/
+}
+
+FILES_${PN} += " /initrd.d/* "
-- 
cgit v1.2.3


From 17901ed364f1d8953445b5181d14977be561cad7 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 22 Nov 2007 12:20:26 +0000
Subject: initrdscripts: Finish renaming for ordered module load.

---
 packages/initrdscripts/initramfs-module-block_0.1.bb | 11 -----------
 packages/initrdscripts/initramfs-module-block_1.0.bb | 11 +++++++++++
 packages/initrdscripts/initramfs-module-loop_0.1.bb  | 13 -------------
 packages/initrdscripts/initramfs-module-loop_1.0.bb  | 13 +++++++++++++
 packages/initrdscripts/initramfs-module-nfs_0.1.bb   | 12 ------------
 packages/initrdscripts/initramfs-module-nfs_1.0.bb   | 12 ++++++++++++
 6 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 packages/initrdscripts/initramfs-module-block_0.1.bb
 create mode 100644 packages/initrdscripts/initramfs-module-block_1.0.bb
 delete mode 100644 packages/initrdscripts/initramfs-module-loop_0.1.bb
 create mode 100644 packages/initrdscripts/initramfs-module-loop_1.0.bb
 delete mode 100644 packages/initrdscripts/initramfs-module-nfs_0.1.bb
 create mode 100644 packages/initrdscripts/initramfs-module-nfs_1.0.bb

diff --git a/packages/initrdscripts/initramfs-module-block_0.1.bb b/packages/initrdscripts/initramfs-module-block_0.1.bb
deleted file mode 100644
index 2c7079af61..0000000000
--- a/packages/initrdscripts/initramfs-module-block_0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SRC_URI = "file://blockboot.sh"
-PR = "r3"
-RDEPENDS = "initramfs-uniboot"
-DESCRIPTION = "An initramfs module for booting off normal block devices."
-
-do_install() {
-	install -d ${D}/initrd.d
-        install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/
-}
-
-FILES_${PN} += " /initrd.d/block "
diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb
new file mode 100644
index 0000000000..73f7a709f1
--- /dev/null
+++ b/packages/initrdscripts/initramfs-module-block_1.0.bb
@@ -0,0 +1,11 @@
+SRC_URI = "file://85-blockboot.sh"
+PR = "r0"
+RDEPENDS = "initramfs-uniboot"
+DESCRIPTION = "An initramfs module for booting off normal block devices."
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/
+}
+
+FILES_${PN} += " /initrd.d/* "
diff --git a/packages/initrdscripts/initramfs-module-loop_0.1.bb b/packages/initrdscripts/initramfs-module-loop_0.1.bb
deleted file mode 100644
index afc77a46f0..0000000000
--- a/packages/initrdscripts/initramfs-module-loop_0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_URI = "file://loopboot.sh"
-PR = "r4"
-DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
-               mounting it."
-RDEPENDS = "initramfs-uniboot"
-RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
-
-do_install() {
-	install -d ${D}/initrd.d
-        install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/
-}
-
-FILES_${PN} += " /initrd.d/loop "
diff --git a/packages/initrdscripts/initramfs-module-loop_1.0.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb
new file mode 100644
index 0000000000..54e7fa29e3
--- /dev/null
+++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb
@@ -0,0 +1,13 @@
+SRC_URI = "file://80-loopboot.sh"
+PR = "r0"
+DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
+               mounting it."
+RDEPENDS = "initramfs-uniboot"
+RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/
+}
+
+FILES_${PN} += " /initrd.d/* "
diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_0.1.bb
deleted file mode 100644
index beadcf1c35..0000000000
--- a/packages/initrdscripts/initramfs-module-nfs_0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SRC_URI = "file://nfsboot.sh"
-PR = "r5"
-DESCRIPTION = "An initramfs module for booting via NFS."
-RDEPENDS = "initramfs-uniboot"
-RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
-
-do_install() {
-	install -d ${D}/initrd.d
-        install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/
-}
-
-FILES_${PN} += " /initrd.d/nfs "
diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb
new file mode 100644
index 0000000000..6555688fce
--- /dev/null
+++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb
@@ -0,0 +1,12 @@
+SRC_URI = "file://80-nfsboot.sh"
+PR = "r0"
+DESCRIPTION = "An initramfs module for booting via NFS."
+RDEPENDS = "initramfs-uniboot"
+RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/
+}
+
+FILES_${PN} += " /initrd.d/nfs "
-- 
cgit v1.2.3


From 43c0c8f13c1b2bdecbd3315902d5951888f863b2 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Thu, 22 Nov 2007 13:07:54 +0000
Subject: angstrom.inc: add FEED_ARCH for mpc8313e-rdb and mpc8323e-rdb
 machines

---
 conf/distro/include/angstrom.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 11d7b14747..85c0d9d128 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -185,6 +185,8 @@ FEED_ARCH_lsppchd 	= "ppc603e"
 FEED_ARCH_lsppchg 	= "ppc603e"
 FEED_ARCH_storcenter 	= "ppc603e"
 FEED_ARCH_turbostation 	= "ppc603e"
+FEED_ARCH_mpc8313e-rdb 	= "ppce300c3"
+FEED_ARCH_mpc8323e-rdb 	= "ppce300c2"
 
 
 #strongarm machines, no EABI
-- 
cgit v1.2.3


From a4c96d20b0945e1bcab47041c919334ca49947b7 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 22 Nov 2007 13:14:40 +0000
Subject: zaurus-updater: dropped spitz one as unified works on spitz (tested
 by Rolf Leggewie)

---
 packages/zaurus-updater/akita/updater.sh          |  84 +++----
 packages/zaurus-updater/spitz/.mtn2git_empty      |   0
 packages/zaurus-updater/spitz/updater.sh          | 280 ----------------------
 packages/zaurus-updater/zaurus-updater.bb         |   2 +-
 packages/zaurus-updater/zaurus-updater/updater.sh | 102 +++++---
 5 files changed, 107 insertions(+), 361 deletions(-)
 delete mode 100644 packages/zaurus-updater/spitz/.mtn2git_empty
 delete mode 100755 packages/zaurus-updater/spitz/updater.sh

diff --git a/packages/zaurus-updater/akita/updater.sh b/packages/zaurus-updater/akita/updater.sh
index 5399e5254e..ad2c27b012 100644
--- a/packages/zaurus-updater/akita/updater.sh
+++ b/packages/zaurus-updater/akita/updater.sh
@@ -181,53 +181,53 @@ do
 		/sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
 		/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
 
-                if [ "$MODEL" = "SL-C1000" ] && [ $TARGETTYPE = Kernel ]; then 
-                    echo $TARGETFILE':'$DATASIZE'bytes'
-	            echo '                ' > /tmp/data
-		    /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
-                    /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
-		    /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
-		#loop
-                else
-		while [ $DATAPOS -lt $DATASIZE ]
-		do
-			#data create
-			bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
-			TMPSIZE=`wc -c $TMPDATA`
-			TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
-			DATAPOS=`expr $DATAPOS + $TMPSIZE`
-
-			#handle data file
-			#echo 'ADDR='$ADDR
-			#echo 'SIZE='$TMPSIZE
-			#echo 'TMPDATA='$TMPDATA
-			if [ $ISLOGICAL = 0 ]
-			then
-				next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
-				if [ "$next_addr" = "" ]; then
-					echo "ERROR:flash write"
-					rm $TMPDATA > /dev/null 2>&1
-					RESULT=3
-					break;
+		if [ "$MODEL" = "SL-C1000" ] && [ $TARGETTYPE = Kernel ]; then 
+			echo $TARGETFILE':'$DATASIZE'bytes'
+			echo '                ' > /tmp/data
+			/sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
+			/sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
+			/sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
+			#loop
+		else
+			while [ $DATAPOS -lt $DATASIZE ]
+			do
+				#data create
+				bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
+				TMPSIZE=`wc -c $TMPDATA`
+				TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
+				DATAPOS=`expr $DATAPOS + $TMPSIZE`
+
+				#handle data file
+				#echo 'ADDR='$ADDR
+				#echo 'SIZE='$TMPSIZE
+				#echo 'TMPDATA='$TMPDATA
+				if [ $ISLOGICAL = 0 ]
+				then
+					next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
+					if [ "$next_addr" = "" ]; then
+						echo "ERROR:flash write"
+						rm $TMPDATA > /dev/null 2>&1
+						RESULT=3
+						break;
+					fi
+					ADDR=$next_addr
+				else
+					/sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
+					ADDR=`expr $ADDR + $TMPSIZE`
 				fi
-				ADDR=$next_addr
-			else
-				/sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
-				ADDR=`expr $ADDR + $TMPSIZE`
-			fi
 
-			rm $TMPDATA > /dev/null 2>&1
+				rm $TMPDATA > /dev/null 2>&1
 
-			#progress
-			SPNUM=0
-			while [ $SPNUM -lt $PROGSTEP ]
-			do
-				echo -n '.'
-				SPNUM=`expr $SPNUM + 1`
+				#progress
+				SPNUM=0
+				while [ $SPNUM -lt $PROGSTEP ]
+				do
+					echo -n '.'
+					SPNUM=`expr $SPNUM + 1`
+				done
 			done
-		done
 
-                fi
+		fi
 
 		echo ''
 
diff --git a/packages/zaurus-updater/spitz/.mtn2git_empty b/packages/zaurus-updater/spitz/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/zaurus-updater/spitz/updater.sh b/packages/zaurus-updater/spitz/updater.sh
deleted file mode 100755
index a748334cc7..0000000000
--- a/packages/zaurus-updater/spitz/updater.sh
+++ /dev/null
@@ -1,280 +0,0 @@
-#!/bin/sh
-
-#
-# Noodles' simpler update script. SL-C3000 only for the moment.
-#
-
-DATAPATH=$1
-TMPPATH=/tmp/update
-TMPDATA=$TMPPATH/tmpdata.bin
-TMPHEAD=$TMPPATH/tmphead.bin
-
-WFLG_KERNEL=0
-WFLG_INITRD=0
-WFLG_HDD=0
-
-RO_MTD_LINE=`cat /proc/mtd | grep "root" | tail -n 1`
-if [ "$RO_MTD_LINE" = "" ]; then
-    RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
-fi
-RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2`
-RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2`
-RO_MTD=/dev/mtd$RO_MTD_NO
-RO_MTDBLK=/dev/mtdblock$RO_MTD_NO
-RO_MTD_SIZE=`dc 0x$RO_MTD_SIZE_HEX 1024 /`
-
-RW_MTD_LINE=`cat /proc/mtd | grep "home" | tail -n 1`
-if [ "$RW_MTD_LINE" = "" ]; then
-    RW_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
-fi
-RW_MTD_NO=`echo $RW_MTD_LINE | cut -d: -f1 | cut -dd -f2`
-RW_MTD_SIZE_HEX=`echo $RW_MTD_LINE | cut -d" " -f2`
-RW_MTD=/dev/mtd$RW_MTD_NO
-RW_MTDBLK=/dev/mtdblock$RW_MTD_NO
-RW_MTD_SIZE=`dc 0x$RW_MTD_SIZE_HEX 1024 /`
-
-LOGOCAL_MTD=/dev/mtd1
-
-VERBLOCK=0x48000
-MVRBLOCK=0x70000
-
-RESULT=0
-
-Cleanup(){
-	rm -f $VTMPNAME > /dev/null 2>&1
-	rm -f $MTMPNAME > /dev/null 2>&1
-	rm $CTRLPATH/* > /dev/null 2>&1
-	exit $1
-}
-trap 'Cleanup 1' 1 15
-trap '' 2 3
-
-get_dev_pcmcia()
-{
-while read SOCKET CLASS DRIVER INSTANCE DEVS MAJOR MINOR;
-do
-    echo $DEVS
-done
-}
-get_dev_pcmcia_slot()
-{
-    grep "^$1" /var/lib/pcmcia/stab | get_dev_pcmcia
-}
-sleep 1
-IDE1=`get_dev_pcmcia_slot 1`
-if [ "$IDE1" = "" ]; then
-    echo "Error!! There is no HDD. Now retrying..."
-    while [ "$IDE1" = "" ]; do
-	IDE1=`get_dev_pcmcia_slot 1`
-    done
-    echo "Found HDD!!"
-fi
-
-#LINUXFMT=ext2
-LINUXFMT=ext3
-MKE2FSOPT=
-if [ "$LINUXFMT" = "ext3" ]; then
-	MKE2FSOPT=-j
-fi
-
-
-### Check model ###
-/sbin/writerominfo
-MODEL=`cat /proc/deviceinfo/product`
-if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ] && [ "$MODEL" != "SL-C3200" ]
-then
-	echo 'MODEL:'$MODEL
-	echo 'ERROR:Invalid model!'
-	echo 'Please reset'
-	while true
-	do
-	done
-fi
-
-### Check that we have a valid tar
-for TARNAME in gnu-tar GNU-TAR
-do
-	if [ -e $DATAPATH/$TARNAME ]
-	then
-		TARBIN=$DATAPATH/$TARNAME
-	fi
-done
-
-if [ ! -e $TARBIN ]; then
-	echo 'Please place a valid copy of tar as "gnu-tar" on your card'
-	echo 'Please reset'
-	while true
-	do
-	done
-fi
-
-mkdir -p $TMPPATH > /dev/null 2>&1
-
-cd $DATAPATH/
-
-#
-# First do the kernel.
-#
-for TARGETFILE in zImage.bin zimage.bin ZIMAGE.BIN
-do
-	if [ -e $TARGETFILE -a $WFLG_KERNEL = 0 ]
-	then
-		# Get the size of the kernel.
-		DATASIZE=`wc -c $TARGETFILE`
-		DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
-
-		echo 'Updating kernel.'
-		echo $TARGETFILE':'$DATASIZE' bytes'
-		/sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE \
-			$TARGETFILE > /dev/null 2>&1
-
-		WFLG_KERNEL=1
-
-	fi
-done
-
-#
-# Now do the initrd.
-#
-for TARGETFILE in initrd.bin INITRD.BIN
-do
-	if [ -e $TARGETFILE -a $WFLG_INITRD = 0 ]
-	then
-		rm -f $TMPPATH/*.bin > /dev/null 2>&1
-		DATASIZE=`wc -c $TARGETFILE`
-		DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
-
-		WFLG_INITRD=1
-		echo 'RO file system'
-		MODULEID=6
-		MODULESIZE=0x500000
-		ADDR=0
-		TARGET_MTD=$RO_MTD
-		DATAPOS=16
-		ONESIZE=1048576
-		/sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
-		
-		echo -n 'Flash erasing...'
-		/sbin/eraseall $TARGET_MTD 2> /dev/null > /dev/null
-		echo 'done'
-
-		echo ''
-		echo '0%                      100%'
-		PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
-		PROGSTEP=`expr 28 / $PROGSTEP`
-		if [ $PROGSTEP = 0 ]
-		then
-			PROGSTEP=1
-		fi
-
-		#00 means header information
-		VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
-		MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
-		/sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-		/sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-
-		#echo 'found header'
-		/sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
-		/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
-
-		#loop
-		while [ $DATAPOS -lt $DATASIZE ]
-		do
-			#data create
-			bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
-			TMPSIZE=`wc -c $TMPDATA`
-			TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
-			DATAPOS=`expr $DATAPOS + $TMPSIZE`
-
-			#handle data file
-			#echo 'ADDR='$ADDR
-			#echo 'SIZE='$TMPSIZE
-			next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
-			if [ "$next_addr" = "" ]; then
-				echo "ERROR:flash write"
-				rm $TMPDATA > /dev/null 2>&1
-				RESULT=3
-				break;
-			fi
-			ADDR=$next_addr
-
-			rm $TMPDATA > /dev/null 2>&1
-
-			#progress
-			SPNUM=0
-			while [ $SPNUM -lt $PROGSTEP ]
-			do
-				echo -n '.'
-				SPNUM=`expr $SPNUM + 1`
-			done
-		done
-
-		echo ''
-
-		#finish
-		rm -f $TMPPATH/*.bin > /dev/null 2>&1
-
-		if [ $RESULT = 0 ]
-		then
-			/sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-			/sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-
-			rm -f $VTMPNAME > /dev/null 2>&1
-			rm -f $MTMPNAME > /dev/null 2>&1
-			echo 'Success!'
-		else
-			echo 'Error!'
-			exit $RESULT
-		fi
-	fi
-done
-
-## HDD image
-for TARGETFILE in hdimage1.tgz HDIMAGE1.TGZ
-do
-	if [ -e $TARGETFILE ]; then
-		if [ $WFLG_HDD != 0 ]
-		then
-			continue
-		fi
-		WFLG_HDD=1
-		echo ''
-		echo 'HDD RO file system'
-		if [ ! -f /hdd1/NotAvailable ]; then
-		    umount /hdd1
-		fi
-		echo 'Now formatting...'
-		mke2fs $MKE2FSOPT /dev/${IDE1}1 2> /dev/null > /dev/null
-		e2fsck -p /dev/${IDE1}1 > /dev/null
-		if [ "$?" != "0" ]; then
-		    echo "Error!"
-		    exit "$?"
-		fi
-
-		mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
-		if [ "$?" != "0" ]; then
-		    echo "Error!"
-		    exit "$?"
-		fi
-    
-		cd /hdd1
-		echo 'Now extracting...'
-		gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
-		if [ "$?" != "0" ]; then
-		    echo "Error!"
-		    exit "$?"
-		fi
-
-		echo 'Success!'
-		
-		#This can be useful for debugging
-		#/bin/sh -i
-		
-		# remount as RO
-		cd /
-		umount /hdd1
-		mount -t $LINUXFMT -o ro,noatime /dev/${IDE1}1 /hdd1
-	fi
-done
-
-exit 0
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 9d62bd629e..ec8f16c9bf 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r8"
+PR = "r9"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh
index b8ae625d6e..d6e5b7fc15 100644
--- a/packages/zaurus-updater/zaurus-updater/updater.sh
+++ b/packages/zaurus-updater/zaurus-updater/updater.sh
@@ -21,6 +21,12 @@
 # - c760/c860 has bigger rootfs - use it
 #
 
+date_log() 
+{
+	echo "$LOG: `date`"
+}
+LOG="updater start"; date_log
+
 DATAPATH=$1
 TMPPATH=/tmp/update
 TMPDATA=$TMPPATH/tmpdata.bin
@@ -38,6 +44,8 @@ RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2`
 RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2`
 RO_MTD=/dev/mtd$RO_MTD_NO
 
+echo "RO_MTD = $RO_MTD"
+
 LOGOCAL_MTD=/dev/mtd1
 
 VERBLOCK=0x48000
@@ -159,9 +167,9 @@ do_flashing()
 
     if [ $ISFORMATTED = 0 ]
     then
-        echo -n 'Flash erasing...'
+		LOG="flash erasing ($TARGET_MTD) start"; date_log
         /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
-        echo 'done'
+		LOG="flash erasing ($TARGET_MTD) end"; date_log
         ISFORMATTED=1
     fi
 
@@ -176,6 +184,7 @@ do_flashing()
 
     if [ -e $TMPHEAD ]
     then
+		LOG="nandlogical read start"; date_log
         VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
         MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
         /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
@@ -183,43 +192,44 @@ do_flashing()
 
         /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
         /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+		LOG="nandlogical read end"; date_log
     fi
 
-    #loop
-    while [ $DATAPOS -lt $DATASIZE ]
-    do
-        #data create
-        bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
-        TMPSIZE=`wc -c $TMPDATA`
-        TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
-        DATAPOS=`expr $DATAPOS + $TMPSIZE`
-
-        #handle data file
-        if [ $ISLOGICAL = 0 ]
-        then
-            next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
-            if [ "$next_addr" = "" ]; then
-                echo "ERROR: flash write"
-                rm $TMPDATA > /dev/null 2>&1
-                RESULT=3
-                break;
-            fi
-            ADDR=$next_addr
-        else
-            /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
-            ADDR=`expr $ADDR + $TMPSIZE`
-        fi
-
-        rm $TMPDATA > /dev/null 2>&1
-
-        #progress
-        SPNUM=0
-        while [ $SPNUM -lt $PROGSTEP ]
-        do
-            echo -n '.'
-            SPNUM=`expr $SPNUM + 1`
-        done
-    done
+	#loop
+	while [ $DATAPOS -lt $DATASIZE ]
+	do
+		#data create
+		bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
+		TMPSIZE=`wc -c $TMPDATA`
+		TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
+		DATAPOS=`expr $DATAPOS + $TMPSIZE`
+
+		#handle data file
+		if [ $ISLOGICAL = 0 ]
+		then
+			next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
+			if [ "$next_addr" = "" ]; then
+				echo "ERROR: flash write"
+				rm $TMPDATA > /dev/null 2>&1
+				RESULT=3
+				break;
+			fi
+			ADDR=$next_addr
+		else
+			/sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
+			ADDR=`expr $ADDR + $TMPSIZE`
+		fi
+
+		rm $TMPDATA > /dev/null 2>&1
+
+		#progress
+		SPNUM=0
+		while [ $SPNUM -lt $PROGSTEP ]
+		do
+			echo -n '.'
+			SPNUM=`expr $SPNUM + 1`
+		done
+	done
 
     echo ''
 
@@ -230,12 +240,16 @@ do_flashing()
     then
         if [ -e $VTMPNAME ]
         then
+			LOG="nandlogical write2 start"; date_log
             /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+			LOG="nandlogical write2 end"; date_log
             rm -f $VTMPNAME > /dev/null 2>&1
         fi
         if [ -e $MTMPNAME ]
         then
+			LOG="nandlogical write3 start"; date_log
             /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+			LOG="nandlogical write3 end"; date_log
             rm -f $MTMPNAME > /dev/null 2>&1
         fi
         echo 'Done.'
@@ -288,6 +302,8 @@ echo 'MODEL: '$MODEL' ('$ZAURUS')'
 
 mkdir -p $TMPPATH > /dev/null 2>&1
 
+LOG="updater after model"; date_log
+
 cd $DATAPATH/
 
 for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ
@@ -311,7 +327,6 @@ do
         then
             continue
         fi
-        echo 'kernel'
         FLASHED_KERNEL=1
         ISLOGICAL=1
         MODULEID=5
@@ -322,7 +337,12 @@ do
         ONESIZE=524288
         HDTOP=`expr $DATASIZE - 16`
         /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE
+		echo "HDTOP=$HDTOP"
+		LOG="updater flashing kernel start"; date_log
+		FLASH_TYPE="kernel"
         do_flashing
+		FLASH_TYPE=""
+		LOG="updater flashing kernel end"; date_log
         ;;
 
     initrd.bin)
@@ -341,7 +361,11 @@ do
         DATAPOS=16
         ONESIZE=1048576
         /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
+		LOG="updater flashing rootfs start"; date_log
+		FLASH_TYPE="rootfs"
         do_flashing
+		FLASH_TYPE=""
+		LOG="updater flashing rootfs end"; date_log
         ;;
 
     hdimage1.tgz)
@@ -356,6 +380,8 @@ do
     esac
 done
 
+/bin/sh
+
 # reboot
 exit 0
 
-- 
cgit v1.2.3


From 68995fcb4b910842d4def97695aa2095c0b853ee Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 22 Nov 2007 13:48:12 +0000
Subject: angstrom 2--7 lockdown file: fix typo spotted by XorA

---
 conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index f74f432730..e4b083dd86 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1123,7 +1123,7 @@ PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.0.3"
 PREFERRED_VERSION_libxv ?= "1.0.3"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_lib10xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
 PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
 PREFERRED_VERSION_libyaml-perl ?= "0.62"
-- 
cgit v1.2.3


From 567d05ff4a17d6b8015fc4888c94f38d296def30 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 22 Nov 2007 15:04:06 +0000
Subject: mpfr: add 2.3.0

---
 packages/mpfr/mpfr-native_2.3.0.bb |  4 ++++
 packages/mpfr/mpfr_2.3.0.bb        | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 packages/mpfr/mpfr-native_2.3.0.bb
 create mode 100644 packages/mpfr/mpfr_2.3.0.bb

diff --git a/packages/mpfr/mpfr-native_2.3.0.bb b/packages/mpfr/mpfr-native_2.3.0.bb
new file mode 100644
index 0000000000..01ba37c8bf
--- /dev/null
+++ b/packages/mpfr/mpfr-native_2.3.0.bb
@@ -0,0 +1,4 @@
+require mpfr_${PV}.bb
+inherit native
+DEPENDS = "gmp-native"
+
diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb
new file mode 100644
index 0000000000..2acd7da3e4
--- /dev/null
+++ b/packages/mpfr/mpfr_2.3.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "gmp"
+PR = "r0"
+
+SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
+S = "${WORKDIR}/mpfr-${PV}"
+
+inherit autotools
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       infodir=${STAGING_DIR}/${HOST_SYS}/info
+}
-- 
cgit v1.2.3


From e0f4607a9d92714d1173ecfcc89cbd6af3343692 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 22 Nov 2007 15:08:12 +0000
Subject: initrdscripts: We obviously first do rootdelay, and only then create
 device nodes.

---
 packages/initrdscripts/files/init.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 261a3b8477..f8d5de9173 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -8,8 +8,11 @@ early_setup() {
     mkdir /proc
     mount -t proc proc /proc
     mkdir /mnt
+}
 
-    echo -n "creating device nodes: "
+dev_setup()
+{
+    echo -n "initramfs: Creating device nodes: "
     grep '^ *[0-9]' /proc/partitions | while read major minor blocks dev
     do
         if [ ! -e /dev/$dev ]; then
@@ -35,6 +38,7 @@ read_args() {
 
 load_modules() {
     for module in $MODULE_DIR/*; do
+        echo "initramfs: Loading $module module"
         source $module
     done
 }
@@ -60,6 +64,8 @@ if [ -n "$rootdelay" ]; then
     sleep $rootdelay
 fi
 
+dev_setup
+
 load_modules
 [ -n "$BOOT_ROOT" ] && boot_root
 boot_failed
-- 
cgit v1.2.3


From fcacf6ef057669597c283ed4d181dc12991334d4 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 22 Nov 2007 15:35:03 +0000
Subject: gettext: Disable java since it finds any native gcj and breaks cross
 compiled builds (from Poky)

---
 packages/gettext/gettext-0.14.1/disable_java.patch | 33 ++++++++++++++++++++++
 packages/gettext/gettext_0.14.1.bb                 |  5 ++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 packages/gettext/gettext-0.14.1/disable_java.patch

diff --git a/packages/gettext/gettext-0.14.1/disable_java.patch b/packages/gettext/gettext-0.14.1/disable_java.patch
new file mode 100644
index 0000000000..0c641eb91b
--- /dev/null
+++ b/packages/gettext/gettext-0.14.1/disable_java.patch
@@ -0,0 +1,33 @@
+Index: gettext-0.14.1/gettext-tools/configure.ac
+===================================================================
+--- gettext-0.14.1.orig/gettext-tools/configure.ac	2004-01-16 10:49:06.000000000 +0000
++++ gettext-0.14.1/gettext-tools/configure.ac	2007-11-14 21:43:39.000000000 +0000
+@@ -37,28 +37,16 @@
+ AC_PROG_YACC
+ 
+ gt_GCJ
+-if test -n "$HAVE_GCJ"; then
+-  BUILDJAVAEXE=yes
+-else
+   BUILDJAVAEXE=no
+-fi
+ AC_SUBST(BUILDJAVAEXE)
+ 
+ gt_JAVACOMP
+ AC_CHECK_PROG(JAR, jar, jar)
+-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+-  BUILDJAVA=yes
+-else
+   BUILDJAVA=no
+-fi
+ AC_SUBST(BUILDJAVA)
+ 
+ gt_JAVAEXEC
+-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
+-  TESTJAVA=yes
+-else
+   TESTJAVA=no
+-fi
+ AC_SUBST(TESTJAVA)
+ 
+ gt_CSHARPCOMP
diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb
index 4e25c0e829..960db30b56 100644
--- a/packages/gettext/gettext_0.14.1.bb
+++ b/packages/gettext/gettext_0.14.1.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
 	   file://gettext-vpath.patch;patch=1;pnum=1 \
 	   file://fixchicken.patch;patch=1;pnum=1 \
-           file://getline.m4.patch;patch=1"
+           file://getline.m4.patch;patch=1 \
+           file://disable_java.patch;patch=1"
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
 SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
-- 
cgit v1.2.3


From 1ffe4a97e188cf21fe157f5a7e7841f8a2421e75 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Thu, 22 Nov 2007 16:10:32 +0000
Subject: hostap-daemon_0.6.0.bb: package version 0.6.0 of hostap-daemon *
 update makefile-cross.diff patch * fix init script: pass -B to hostapd
 instead of passing -b   to start-stop-daemon * instead of using per-machine
 enabling/disabling of madwifi   support, use the 'pci' feature, like
 wpa-supplicant * build against madwifi-ng when madwifi support is enabled

---
 packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty |  0
 packages/hostap/hostap-daemon-0.6.0/init           | 37 ++++++++++++++++++++
 .../hostap/hostap-daemon-0.6.0/makefile-cross.diff | 25 ++++++++++++++
 packages/hostap/hostap-daemon_0.6.0.bb             | 40 ++++++++++++++++++++++
 4 files changed, 102 insertions(+)
 create mode 100644 packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty
 create mode 100644 packages/hostap/hostap-daemon-0.6.0/init
 create mode 100644 packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
 create mode 100644 packages/hostap/hostap-daemon_0.6.0.bb

diff --git a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/hostap/hostap-daemon-0.6.0/init b/packages/hostap/hostap-daemon-0.6.0/init
new file mode 100644
index 0000000000..79f74b681e
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.6.0/init
@@ -0,0 +1,37 @@
+#!/bin/sh
+DAEMON=/usr/sbin/hostapd
+NAME=hostapd
+DESC="HOSTAP Daemon"
+ARGS="/etc/hostapd.conf -B"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+    start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -x $DAEMON -- $ARGS
+	echo "$NAME."
+	;;
+    stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x $DAEMON
+	echo "$NAME."
+	;;
+    restart)
+	$0 stop
+	$0 start
+	;;
+    reload)
+	echo -n "Reloading $DESC: "
+	killall -HUP $(basename ${DAEMON})
+	echo "$NAME."
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
new file mode 100644
index 0000000000..9534199e78
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
@@ -0,0 +1,25 @@
+diff -urN hostapd.orig/Makefile hostapd/Makefile
+--- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
++++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
+@@ -6,6 +6,8 @@
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+ 
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -361,10 +363,10 @@
+ 	fi
+ 
+ install: all
+-	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++	for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+ 
+ hostapd: $(OBJS)
+-	$(CC) -o hostapd $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ 
+ OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ hostapd_cli: $(OBJS_c)
diff --git a/packages/hostap/hostap-daemon_0.6.0.bb b/packages/hostap/hostap-daemon_0.6.0.bb
new file mode 100644
index 0000000000..37b710db19
--- /dev/null
+++ b/packages/hostap/hostap-daemon_0.6.0.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+	file://makefile-cross.diff;patch=1 \
+	file://defconfig \
+	file://init"
+
+S = "${WORKDIR}/hostapd-${PV}/hostapd"
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+inherit update-rc.d
+INITSCRIPT_NAME=hostapd
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	if [ "x$HAS_PCI" == "x1" ] ; then
+		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+	fi
+}
+
+do_compile() {
+	CFLAGS='${CFLAGS}' CC='${CC}' make
+}
+
+do_install() {
+	install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+	make TARGET_PREFIX=${D}${sbindir} install
+	install -m 0644 hostapd.conf ${D}${sysconfdir}
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+
-- 
cgit v1.2.3


From 3138b2bd514e09b328be2922c7ef429566a89d1d Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 22 Nov 2007 16:23:37 +0000
Subject: dropbear 0.49: Beautify init script output. * Make sure that
 "Starting: dropbear" message is not broken by host key generation output.

---
 packages/dropbear/dropbear/init    | 12 +++++++++---
 packages/dropbear/dropbear_0.49.bb |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/dropbear/dropbear/init b/packages/dropbear/dropbear/init
index d019bdb4ba..5c8dfc12a8 100755
--- a/packages/dropbear/dropbear/init
+++ b/packages/dropbear/dropbear/init
@@ -50,10 +50,16 @@ gen_keys() {
 for t in $DROPBEAR_KEYTYPES; do
   case $t in
     rsa)
-        test -f $DROPBEAR_RSAKEY || dropbearkey -t rsa -f $DROPBEAR_RSAKEY
+	if [ ! -f $DROPBEAR_RSAKEY ]; then
+	    echo "Creating $DESC RSA host key."
+	    dropbearkey -t rsa -f $DROPBEAR_RSAKEY
+	fi
 	;;
     dsa)
-        test -f $DROPBEAR_DSSKEY || dropbearkey -t dss -f $DROPBEAR_DSSKEY
+	if [ ! -f $DROPBEAR_DSSKEY ]; then
+	    echo "Creating $DESC DSA host key."
+	    dropbear