merge of '31da046f926a473ba6aab3543102759603fa6db9'

     and '7fe7f8c6e5643a6104c91a6a3c5869d483a193aa'

16 files changed, 1376 insertions, 21 deletions

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 9b913ecf82..03999a54ef 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -1,4 +1,15 @@
 def legitimize_package_name(s):
+	import re
+
+	def fixutf(m):
+		cp = m.group(1)
+		if cp:
+			return ('\u%s' % cp).decode('unicode_escape').encode('utf-8')
+
+	# Handle unicode codepoints encoded as <U0123>, as in glibc locale files.
+	s = re.sub('<U([0-9A-Fa-f]{1,4})>', fixutf, s)
+
+	# Remaining package name validity fixes
 	return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-')
 
 STAGING_PKGMAPS_DIR ?= "${STAGING_DIR}/pkgmaps"
diff --git a/packages/mozilla/files/minimo.desktop b/packages/mozilla/files/minimo.desktop
index 5ef0f2075a..7120ee5202 100644
--- a/packages/mozilla/files/minimo.desktop
+++ b/packages/mozilla/files/minimo.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
-Name=Minimo
-Comment=Minimo web browser
-Exec=minimo http://www.mozilla.org/projects/minimo/home.html
-Terminal=0
 Type=Application
+Name=Minimo
+GenericName=Web Browser
+Comment=Browse the web
 Icon=minimo.png
-Categories=Application;Network;
-StartupNotify=True
+Exec=minimo
+Terminal=false
+Categories=Network;WebBrowser;
+StartupNotify=true
diff --git a/packages/mozilla/minimo/minimo b/packages/mozilla/minimo/minimo
new file mode 100644
index 0000000000..d130173adf
--- /dev/null
+++ b/packages/mozilla/minimo/minimo
@@ -0,0 +1,4 @@
+#!/bin/sh
+export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo
+export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}
+exec ${MOZILLA_FIVE_HOME}/minimo "$@"
diff --git a/packages/mozilla/minimo/minimo.patch b/packages/mozilla/minimo/minimo.patch
new file mode 100644
index 0000000000..a1f9291167
--- /dev/null
+++ b/packages/mozilla/minimo/minimo.patch
@@ -0,0 +1,567 @@
+Index: mozilla/content/html/content/src/nsFormSubmission.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v
+retrieving revision 1.46
+diff --context=3 -r1.46 nsFormSubmission.cpp
+*** mozilla/content/html/content/src/nsFormSubmission.cpp	13 Jul 2005 16:55:59 -0000	1.46
+--- mozilla/content/html/content/src/nsFormSubmission.cpp	21 Jul 2006 00:27:14 -0000
+***************
+*** 1315,1325 ****
+    nsresult rv = NS_OK;
+  
+    nsCAutoString charset(aCharset);
+-   // canonical name is passed so that we just have to check against
+-   // *our* canonical names listed in charsetaliases.properties
+-   if (charset.EqualsLiteral("ISO-8859-1")) {
+-     charset.AssignLiteral("windows-1252");
+-   }
+  
+    // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
+    // MS IE/Opera). 
+--- 1315,1320 ----
+Index: mozilla/embedding/base/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v
+retrieving revision 1.34.8.2
+diff --context=3 -r1.34.8.2 Makefile.in
+*** mozilla/embedding/base/Makefile.in	14 Feb 2006 05:28:31 -0000	1.34.8.2
+--- mozilla/embedding/base/Makefile.in	21 Jul 2006 00:27:14 -0000
+***************
+*** 43,48 ****
+--- 43,49 ----
+  
+  MODULE          = embed_base
+  LIBRARY_NAME    = embed_base_s
++ EXPORT_LIBRARY	= 1
+  XPIDL_MODULE	= embed_base
+  
+  include $(DEPTH)/config/autoconf.mk
+Index: mozilla/js/src/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
+retrieving revision 3.95.4.4
+diff --context=3 -r3.95.4.4 Makefile.in
+*** mozilla/js/src/Makefile.in	7 Jul 2006 02:12:02 -0000	3.95.4.4
+--- mozilla/js/src/Makefile.in	21 Jul 2006 00:27:14 -0000
+***************
+*** 46,51 ****
+--- 46,52 ----
+  
+  MODULE		= js
+  LIBRARY_NAME	= mozjs
++ EXPORT_LIBRARY	= 1
+  LIB_IS_C_ONLY	= 1
+  GRE_MODULE	= 1
+  
+Index: mozilla/minimo/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/Makefile.in,v
+retrieving revision 1.1.2.2
+diff --context=3 -r1.1.2.2 Makefile.in
+*** mozilla/minimo/Makefile.in	29 Jun 2006 06:11:30 -0000	1.1.2.2
+--- mozilla/minimo/Makefile.in	21 Jul 2006 00:27:14 -0000
+***************
+*** 41,46 ****
+  
+  include $(DEPTH)/config/autoconf.mk
+  
+! DIRS = config components chrome locales customization base 
+  
+  include $(topsrcdir)/config/rules.mk
+--- 41,46 ----
+  
+  include $(DEPTH)/config/autoconf.mk
+  
+! DIRS = config chrome locales customization base 
+  
+  include $(topsrcdir)/config/rules.mk
+Index: mozilla/minimo/base/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
+retrieving revision 1.3.2.7
+diff --context=3 -r1.3.2.7 Makefile.in
+*** mozilla/minimo/base/Makefile.in	18 Apr 2006 21:04:38 -0000	1.3.2.7
+--- mozilla/minimo/base/Makefile.in	21 Jul 2006 00:27:14 -0000
+***************
+*** 95,101 ****
+  
+  # this should move into the toolkit!
+  LOCAL_INCLUDES	= -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
+- CPPSRCS    += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
+  
+  ifdef WINCE
+  RCINCLUDE  = wince/SplashScreen.rc
+--- 95,100 ----
+***************
+*** 139,148 ****
+  endif
+  
+  
+- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
+- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
+- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
+- 
+  include $(topsrcdir)/config/static-config.mk
+  
+  EXTRA_DEPS     += $(STATIC_EXTRA_DEPS)
+--- 138,143 ----
+***************
+*** 176,189 ****
+  # (same as in mozilla/js/src/Makefile.in)
+  ifdef WINCE
+  LDFLAGS         += -OPT:NOICF
+  endif
+  
+- export::
+- 	$(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
+- 	$(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
+- 
+- 
+- GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
+  
+  ifdef WINCE
+  package::
+--- 171,181 ----
+  # (same as in mozilla/js/src/Makefile.in)
+  ifdef WINCE
+  LDFLAGS         += -OPT:NOICF
++ else
++ # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
++ LDFLAGS		+= -u NS_StringGetData_P -u NS_StringGetMutableData_P
+  endif
+  
+  
+  ifdef WINCE
+  package::
+Index: mozilla/minimo/base/Minimo.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
+retrieving revision 1.1.2.11
+diff --context=3 -r1.1.2.11 Minimo.cpp
+*** mozilla/minimo/base/Minimo.cpp	11 Jul 2006 19:37:05 -0000	1.1.2.11
+--- mozilla/minimo/base/Minimo.cpp	21 Jul 2006 00:27:15 -0000
+***************
+*** 781,789 ****
+    CreateListenerWindow();
+  #endif
+    
+! #ifdef MOZ_WIDGET_GTK2
+    gtk_set_locale();
+    gtk_init(&argc, &argv);
+  #endif
+    
+  #ifdef HACKY_PRE_LOAD_LIBRARY
+--- 781,794 ----
+    CreateListenerWindow();
+  #endif
+    
+! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
+! #if defined(MOZ_WIDGET_GTK)
+    gtk_set_locale();
++ #endif
+    gtk_init(&argc, &argv);
++ 
++   gtk_widget_set_default_visual(gdk_rgb_get_visual());
++   gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+  #endif
+    
+  #ifdef HACKY_PRE_LOAD_LIBRARY
+Index: mozilla/minimo/base/SplashScreen.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
+retrieving revision 1.1.2.3
+diff --context=3 -r1.1.2.3 SplashScreen.cpp
+*** mozilla/minimo/base/SplashScreen.cpp	11 Jul 2006 18:44:17 -0000	1.1.2.3
+--- mozilla/minimo/base/SplashScreen.cpp	21 Jul 2006 00:27:15 -0000
+***************
+*** 180,188 ****
+--- 180,203 ----
+  void KillSplashScreen() {}
+  void GetScreenSize(unsigned long* x, unsigned long* y)
+  {
++ #ifdef MOZ_WIDGET_GTK2
++   GdkDisplay* display = gdk_display_get_default();
++   if (display != NULL)
++   {
++     GdkScreen *screen;
++     screen = gdk_display_get_default_screen(display);
++     *x = gdk_screen_get_width(screen);
++     *y = gdk_screen_get_height(screen);
++   }
++   else
++   {
++ #endif
+    // we need to figure this out.
+    *x = 240;
+    *y = 320;
++ #ifdef MOZ_WIDGET_GTK2
++   }
++ #endif
+  }
+  
+  
+Index: mozilla/minimo/chrome/content/minimo.js
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
+retrieving revision 1.9.2.90
+diff --context=3 -r1.9.2.90 minimo.js
+*** mozilla/minimo/chrome/content/minimo.js	11 Jul 2006 19:37:04 -0000	1.9.2.90
+--- mozilla/minimo/chrome/content/minimo.js	21 Jul 2006 00:27:16 -0000
+***************
+*** 1313,1319 ****
+           43 const FIND_LINKS = 2;
+           http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
+        */
+!       gBrowser.fastFind.find(vQuery,0);
+      }
+    } catch (e) {
+      onErrorHandler(e);
+--- 1313,1319 ----
+           43 const FIND_LINKS = 2;
+           http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
+        */
+!       gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
+      }
+    } catch (e) {
+      onErrorHandler(e);
+***************
+*** 1324,1330 ****
+  
+  function DoBrowserFindNext() {
+    try { 
+! 	gBrowser.fastFind.findNext();
+    } catch (e) {
+      onErrorHandler(e);
+    }  
+--- 1324,1330 ----
+  
+  function DoBrowserFindNext() {
+    try { 
+! 	gBrowser.fastFind.findNext(this.mHasFocus);
+    } catch (e) {
+      onErrorHandler(e);
+    }  
+Index: mozilla/minimo/config/linux_package.sh
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
+retrieving revision 1.8.2.3
+diff --context=3 -r1.8.2.3 linux_package.sh
+*** mozilla/minimo/config/linux_package.sh	30 Jun 2006 16:35:19 -0000	1.8.2.3
+--- mozilla/minimo/config/linux_package.sh	21 Jul 2006 00:27:16 -0000
+***************
+*** 29,37 ****
+  cp -pRL bin/libnssckbi.so                                  minimo
+  cp -pRL bin/libsmime3.so                                   minimo
+  cp -pRL bin/libsoftokn3.so                                 minimo
+- cp -pRL bin/libsoftokn3.chk                                minimo
+  cp -pRL bin/libfreebl3.so                                  minimo
+- cp -pRL bin/libfreebl3.chk                                 minimo
+  cp -pRL bin/libssl3.so                                     minimo
+  
+  mkdir -p minimo/chrome
+--- 29,35 ----
+***************
+*** 62,69 ****
+  cp -pRL bin/components/nsHelperAppDlg.js                   minimo/components
+  cp -pRL bin/components/nsProgressDialog.js                 minimo/components
+  
+- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
+- 
+  mkdir -p minimo/greprefs
+  cp -pRL bin/greprefs/*                                     minimo/greprefs
+  
+--- 60,65 ----
+***************
+*** 80,86 ****
+  
+  echo Linking XPT files.
+  
+! bin/xpt_link minimo/components/all.xpt          bin/components/*.xpt
+  
+  echo Chewing on chrome
+  
+--- 76,82 ----
+  
+  echo Linking XPT files.
+  
+! host/bin/host_xpt_link minimo/components/all.xpt          bin/components/*.xpt
+  
+  echo Chewing on chrome
+  
+Index: mozilla/profile/dirserviceprovider/src/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
+retrieving revision 1.7
+diff --context=3 -r1.7 Makefile.in
+*** mozilla/profile/dirserviceprovider/src/Makefile.in	6 Apr 2005 03:35:21 -0000	1.7
+--- mozilla/profile/dirserviceprovider/src/Makefile.in	21 Jul 2006 00:27:16 -0000
+***************
+*** 44,49 ****
+--- 44,50 ----
+  
+  MODULE		= profdirserviceprovider
+  LIBRARY_NAME	= profdirserviceprovider_s
++ EXPORT_LIBRARY	= 1
+  MOZILLA_INTERNAL_API = 1
+  
+  REQUIRES	= xpcom \
+Index: mozilla/security/coreconf/Linux.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
+retrieving revision 1.18.18.1
+diff --context=3 -r1.18.18.1 Linux.mk
+*** mozilla/security/coreconf/Linux.mk	3 Feb 2006 22:26:36 -0000	1.18.18.1
+--- mozilla/security/coreconf/Linux.mk	21 Jul 2006 00:27:16 -0000
+***************
+*** 117,122 ****
+--- 117,126 ----
+  	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+  	CPU_ARCH        = mips
+  else
++ ifeq ($(OS_TEST),arm)
++ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++ 	CPU_ARCH        = arm
++ else
+  	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+  	CPU_ARCH	= x86
+  endif
+***************
+*** 133,138 ****
+--- 137,143 ----
+  endif
+  endif
+  endif
++ endif
+  
+  
+  LIBC_TAG		= _glibc
+Index: mozilla/security/coreconf/arch.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
+retrieving revision 1.17.14.2
+diff --context=3 -r1.17.14.2 arch.mk
+*** mozilla/security/coreconf/arch.mk	3 Feb 2006 22:26:36 -0000	1.17.14.2
+--- mozilla/security/coreconf/arch.mk	21 Jul 2006 00:27:16 -0000
+***************
+*** 60,77 ****
+  	64BIT_TAG=
+  endif
+  
+! OS_ARCH := $(subst /,_,$(shell uname -s))
+  
+  #
+  # Attempt to differentiate between sparc and x86 Solaris
+  #
+  
+! OS_TEST := $(shell uname -m)
+! ifeq ($(OS_TEST),i86pc)
+!     OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+! else
+!     OS_RELEASE := $(shell uname -r)
+! endif
+  
+  #
+  # Force the IRIX64 machines to use IRIX.
+--- 60,73 ----
+  	64BIT_TAG=
+  endif
+  
+! OS_ARCH := Linux
+  
+  #
+  # Attempt to differentiate between sparc and x86 Solaris
+  #
+  
+! OS_TEST := arm
+! OS_RELEASE := 2.6
+  
+  #
+  # Force the IRIX64 machines to use IRIX.
+Index: mozilla/toolkit/components/build/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
+retrieving revision 1.24.2.10
+diff --context=3 -r1.24.2.10 Makefile.in
+*** mozilla/toolkit/components/build/Makefile.in	13 Jul 2006 20:08:29 -0000	1.24.2.10
+--- mozilla/toolkit/components/build/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 112,118 ****
+  	$(NULL)
+  
+  SHARED_LIBRARY_LIBS = \
+- 	../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
+  	$(NULL)
+  
+  ifdef MOZ_XPINSTALL
+--- 112,117 ----
+Index: mozilla/toolkit/components/startup/src/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
+retrieving revision 1.7
+diff --context=3 -r1.7 Makefile.in
+*** mozilla/toolkit/components/startup/src/Makefile.in	27 Jul 2005 20:42:44 -0000	1.7
+--- mozilla/toolkit/components/startup/src/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 43,48 ****
+--- 43,49 ----
+  
+  MODULE     = toolkitcomps
+  LIBRARY_NAME = appstartup_s
++ EXPORT_LIBRARY = 1
+  FORCE_STATIC_LIB = 1
+  LIBXUL_LIBRARY = 1
+  
+Index: mozilla/toolkit/xre/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
+retrieving revision 1.48.2.3
+diff --context=3 -r1.48.2.3 Makefile.in
+*** mozilla/toolkit/xre/Makefile.in	30 Sep 2005 19:52:44 -0000	1.48.2.3
+--- mozilla/toolkit/xre/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 45,51 ****
+  
+  MODULE = xulapp
+  LIBRARY_NAME = xulapp_s
+- EXPORT_LIBRARY = 1
+  LIBXUL_LIBRARY = 1
+  
+  REQUIRES = \
+--- 45,50 ----
+***************
+*** 176,189 ****
+  
+  include $(topsrcdir)/config/rules.mk
+  
+- ifdef BUILD_STATIC_LIBS
+- export::
+- 	@$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
+- #	embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to 
+- # FINAL_LINK_COMPS to keep the two lists in sync :-(
+- 	@$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
+- endif
+- 
+  LOCAL_INCLUDES += \
+  	-I$(srcdir) \
+  	-I$(topsrcdir)/xpfe/bootstrap \
+--- 175,180 ----
+Index: mozilla/xpcom/build/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
+retrieving revision 1.90.2.2
+diff --context=3 -r1.90.2.2 Makefile.in
+*** mozilla/xpcom/build/Makefile.in	29 Jan 2006 16:51:02 -0000	1.90.2.2
+--- mozilla/xpcom/build/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 61,67 ****
+  endif
+  
+  # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
+! #EXPORT_LIBRARY = 1
+  GRE_MODULE	= 1
+  MOZILLA_INTERNAL_API = 1
+  
+--- 61,67 ----
+  endif
+  
+  # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
+! EXPORT_LIBRARY = 1
+  GRE_MODULE	= 1
+  MOZILLA_INTERNAL_API = 1
+  
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v
+retrieving revision 1.7
+diff --context=3 -r1.7 xptcstubs_arm.cpp
+*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	18 Apr 2004 14:18:18 -0000	1.7
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	21 Jul 2006 00:27:17 -0000
+***************
+*** 45,53 ****
+  #endif
+  
+  /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
+! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+  
+! static nsresult
+  PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
+  {
+  #define PARAM_BUFFER_COUNT     16
+--- 45,53 ----
+  #endif
+  
+  /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
+! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+  
+! nsresult
+  PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
+  {
+  #define PARAM_BUFFER_COUNT     16
+Index: mozilla/xpfe/browser/src/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
+retrieving revision 1.70
+diff --context=3 -r1.70 Makefile.in
+*** mozilla/xpfe/browser/src/Makefile.in	18 Mar 2005 21:23:45 -0000	1.70
+--- mozilla/xpfe/browser/src/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 44,49 ****
+--- 44,50 ----
+  
+  MODULE		= browser
+  LIBRARY_NAME	= mozbrwsr_s
++ EXPORT_LIBRARY	= 1
+  FORCE_STATIC_LIB = 1
+  LIBXUL_LIBRARY = 1
+  MODULE_NAME	= nsBrowserModule
+Index: mozilla/xpfe/components/build/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
+retrieving revision 1.69.8.1
+diff --context=3 -r1.69.8.1 Makefile.in
+*** mozilla/xpfe/components/build/Makefile.in	27 Sep 2005 00:15:25 -0000	1.69.8.1
+--- mozilla/xpfe/components/build/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 44,50 ****
+  
+  MODULE		= appcomps
+  LIBRARY_NAME	= appcomps
+- EXPORT_LIBRARY = 1
+  IS_COMPONENT	= 1
+  MODULE_NAME	= application
+  LIBXUL_LIBRARY	= 1
+--- 44,49 ----
+Index: mozilla/xpfe/components/filepicker/src/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
+retrieving revision 1.9.8.1
+diff --context=3 -r1.9.8.1 Makefile.in
+*** mozilla/xpfe/components/filepicker/src/Makefile.in	22 May 2006 16:29:32 -0000	1.9.8.1
+--- mozilla/xpfe/components/filepicker/src/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 47,53 ****
+  MODULE		= filepicker
+  LIBRARY_NAME	= fileview
+  SHORT_LIBNAME	= fileview
+- EXPORT_LIBRARY	= 1
+  IS_COMPONENT	= 1
+  MODULE_NAME	= nsFileViewModule
+  MOZILLA_INTERNAL_API = 1
+--- 47,52 ----
+Index: mozilla/xpfe/components/find/src/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
+retrieving revision 1.37
+diff --context=3 -r1.37 Makefile.in
+*** mozilla/xpfe/components/find/src/Makefile.in	18 Mar 2005 21:23:46 -0000	1.37
+--- mozilla/xpfe/components/find/src/Makefile.in	21 Jul 2006 00:27:17 -0000
+***************
+*** 45,51 ****
+  MODULE		= appcomps
+  XPIDL_MODULE	= mozfind
+  LIBRARY_NAME	= mozfind
+- EXPORT_LIBRARY = 1
+  IS_COMPONENT	= 1
+  MODULE_NAME	= nsFindComponent
+  LIBXUL_LIBRARY	= 1
+--- 45,50 ----
diff --git a/packages/mozilla/minimo/minimo.png b/packages/mozilla/minimo/minimo.png
new file mode 100644
index 0000000000..f8b2e2192b
--- /dev/null
+++ b/packages/mozilla/minimo/minimo.png
diff --git a/packages/mozilla/minimo/mozconfig b/packages/mozilla/minimo/mozconfig
index 59cf8c77fb..393981e9fa 100644
--- a/packages/mozilla/minimo/mozconfig
+++ b/packages/mozilla/minimo/mozconfig
@@ -1,23 +1,36 @@
-mk_add_options MOZ_CO_PROJECT=minimo
-ac_add_options --enable-application=minimo
-
+# mozilla/configure: Features and packages:
 
-# use GTK+-2 widget set with XFT font rendering
+ac_add_options --enable-application=minimo
 ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
 ac_add_options --disable-freetype2
-ac_add_options --disable-plugins 
-
+ac_add_options --enable-xft
+ac_add_options --disable-postscript
+ac_add_options --disable-xprint
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --disable-jsd
+ac_add_options --disable-plugins
+ac_add_options --disable-view-source
+ac_add_options --disable-accessibility
+ac_add_options --disable-xpinstall
+ac_add_options --enable-single-profile
+ac_add_options --disable-jsloader
+ac_add_options --disable-printing
+ac_add_options --enable-native-uconv
+ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-xpcom-obsolete
+ac_add_options --disable-pref-extensions
+ac_add_options --disable-extensions
+ac_add_options --enable-image-decoders=png,gif,jpeg
+ac_add_options --disable-mathml
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
 ac_add_options --enable-optimize=-Os
+ac_add_options --disable-logging
 ac_add_options --enable-strip
-ac_add_options --disable-debug
-ac_add_options --enable-reorder
 ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
 ac_add_options --disable-shared
 ac_add_options --enable-static
-
-# remove link dependency on libstdc++.so
-LIBS=-lsupc++
-
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb
new file mode 100644
index 0000000000..4505a1f63e
--- /dev/null
+++ b/packages/mozilla/minimo_0.016+cvs.bb
@@ -0,0 +1,144 @@
+DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
+SECTION = "x11/network"
+LICENSE = "MPL/GPL/LGPL"
+HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
+PRIORITY = "optional"
+
+DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+"
+
+CVSSVR="cvs-mirror.mozilla.org"
+BRTAG = "MOZILLA_1_8_BRANCH"
+MOZDATE = "20060720"
+
+PV = "0.016+cvs${MOZDATE}"
+PR = r0
+
+SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
+	   file://minimo.patch;patch=1 \
+           file://mozconfig file://minimo \
+           file://minimo.desktop file://minimo.png"
+
+inherit autotools 
+
+S = "${WORKDIR}/mozilla"
+
+export MOZCONFIG = "${WORKDIR}/mozconfig"
+
+export CROSS_COMPILE="1"
+export ac_cv_prog_HOST_CC="${BUILD_CC}"
+export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
+export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
+export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
+
+mozdir="${D}${libdir}/mozilla-minimo"
+
+EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
+
+do_configure() {
+	cd ${S}
+	oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
+}
+
+do_compile() {
+	cd ${S}
+	oe_runmake -f client.mk build
+}
+
+do_install() {
+	cd ${WORKDIR}
+
+	install -d ${D}${bindir}
+	install -m 0755 minimo ${D}${bindir}
+
+	install -d ${D}${datadir}/applications
+	install -m 0644 minimo.desktop ${D}${datadir}/applications
+
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 minimo.png ${D}${datadir}/pixmaps
+
+	cd ${S}
+
+	./minimo/config/linux_package.sh ${S} ${S}/minimo/config
+
+	cd dist/minimo
+
+	install -d ${D}${mozdir}
+	install -m 0755 minimo ${D}${mozdir}
+	install -m 0755 libfreebl3.so ${D}${mozdir}
+	install -m 0755 libnspr4.so ${D}${mozdir}
+	install -m 0755 libnss3.so ${D}${mozdir}
+	install -m 0755 libnssckbi.so ${D}${mozdir}
+	install -m 0755 libplc4.so ${D}${mozdir}
+	install -m 0755 libplds4.so ${D}${mozdir}
+	install -m 0755 libsmime3.so ${D}${mozdir}
+	install -m 0755 libsoftokn3.so ${D}${mozdir}
+	install -m 0755 libssl3.so ${D}${mozdir}
+
+	install -d ${D}${mozdir}/chrome
+	install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
+
+	install -d ${D}${mozdir}/components
+	install -m 0644 components/all.xpt ${D}${mozdir}/components
+	install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
+	install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
+
+	install -d ${D}${mozdir}/greprefs
+	install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
+	install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
+
+	install -d ${D}${mozdir}/res
+	install -m 0644 res/forms.css ${D}${mozdir}/res
+	install -m 0644 res/html.css ${D}${mozdir}/res
+	install -m 0644 res/quirk.css ${D}${mozdir}/res
+	install -m 0644 res/ua.css ${D}${mozdir}/res
+	install -m 0644 res/arrow.gif ${D}${mozdir}/res
+	install -m 0644 res/arrowd.gif ${D}${mozdir}/res
+	install -m 0644 res/broken-image.gif ${D}${mozdir}/res
+	install -m 0644 res/loading-image.gif ${D}${mozdir}/res
+	install -m 0644 res/charsetData.properties ${D}${mozdir}/res
+	install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
+	install -m 0644 res/langGroups.properties ${D}${mozdir}/res
+	install -m 0644 res/language.properties ${D}${mozdir}/res
+	install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
+
+	install -d ${D}${mozdir}/res/dtd
+	install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
+
+	install -d ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
+
+	install -d ${D}${mozdir}/res/fonts
+	install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
+	install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
+
+	install -d ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
+}
+
+FILES_${PN} += "${mozdir}"
diff --git a/packages/opie-eye/opie-eye.inc b/packages/opie-eye/opie-eye.inc
index 71b41b56b0..d78acfc167 100644
--- a/packages/opie-eye/opie-eye.inc
+++ b/packages/opie-eye/opie-eye.inc
@@ -20,6 +20,7 @@ do_compile_append() {
 }
 
 do_install() {
+	install -d ${D}${palmtopdir}/bin
 	install -m 0755 opie-eye_slave ${D}${palmtopdir}/bin/
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
diff --git a/packages/udev/udev-100/.mtn2git_empty b/packages/udev/udev-100/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev-100/.mtn2git_empty
diff --git a/packages/udev/udev-100/flags.patch b/packages/udev/udev-100/flags.patch
new file mode 100644
index 0000000000..492a39881c
--- /dev/null
+++ b/packages/udev/udev-100/flags.patch
@@ -0,0 +1,51 @@
+--- udev-089/Makefile.orig	2006-04-08 13:32:53.000000000 +0200
++++ udev-089/Makefile	2006-04-08 13:34:27.000000000 +0200
+@@ -117,28 +117,28 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS		+= $(WARNINGS)
+ 
+ LDFLAGS = -Wl,-warn-common
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+@@ -151,11 +151,11 @@
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	CFLAGS += -DUSE_SELINUX
++	override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-	CFLAGS += -DUSE_STATIC
++	override CFLAGS += -DUSE_STATIC
+ 	LDFLAGS += -static
+ endif
+ 
diff --git a/packages/udev/udev-100/init b/packages/udev/udev-100/init
new file mode 100644
index 0000000000..cc25c026a3
--- /dev/null
+++ b/packages/udev/udev-100/init
@@ -0,0 +1,242 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs 
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+# we need to unmount /dev/pts/ and remount it later over the tmpfs
+unmount_devpts() {
+  if mountpoint -q /dev/pts/; then
+    umount -l /dev/pts/
+  fi
+
+  if mountpoint -q /dev/shm/; then
+    umount -l /dev/shm/
+  fi
+}
+
+# mount a tmpfs over /dev, if somebody did not already do it
+mount_tmpfs() {
+  if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
+    return
+  fi
+
+  # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
+  # /etc/udev/ is recycled as a temporary mount point because it's the only
+  # directory which is guaranteed to be available.
+  mount -n -o bind /dev /etc/udev
+
+  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+create_dev_makedev() {
+  if [ -e /sbin/MAKEDEV ]; then
+    [ ! -e /dev/MAKEDEV ] || ln -s /sbin/MAKEDEV /dev/MAKEDEV
+  else
+    ln -s /bin/true /dev/MAKEDEV
+  fi
+}
+
+# I hate this hack.  -- Md
+make_extra_nodes() {
+  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
+    cp -a /lib/udev/devices/* /dev/
+  fi
+
+  [ -e /etc/udev/links.conf ] || return 0
+  grep '^[^#]' /etc/udev/links.conf | \
+  while read type name arg1; do
+    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
+    case "$type" in
+      L) ln -s $arg1 /dev/$name ;;
+      D) mkdir -p /dev/$name ;;
+      M) mknod -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[0-4]|2.6.1[0-4][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+load_input_modules() {
+  case "$(uname -r)" in
+    2.6.1[0-5]|2.6.1[0-5][!0-9]*) ;; # <= 2.6.15
+    *) return 0
+  esac
+
+  for module in mousedev evdev joydev; do
+    modprobe -q $module || true
+  done
+}
+
+# shell version of /usr/bin/tty
+my_tty() {
+  [ -x /bin/readlink ] || return 0
+  [ -e /proc/self/fd/0 ] || return 0
+  readlink --silent /proc/self/fd/0 || true
+}
+
+warn_if_interactive() {
+  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+    return
+  fi
+
+  TTY=$(my_tty)
+  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+    return
+  fi
+
+  printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
+  printf "has been run from an interactive shell.\n"
+  printf "It will probably not do what you expect, so this script will wait\n"
+  printf "60 seconds before continuing. Press ^C to stop it.\n"
+  printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
+  sleep 60
+}
+
+##############################################################################
+
+[ -x /sbin/udevd ] || exit 0
+
+PATH="/sbin:/bin:/usr/bin"
+
+# defaults
+tmpfs_size="10M"
+udev_root="/dev"
+
+if [ -e /etc/udev/udev.conf ]; then
+  . /etc/udev/udev.conf
+fi
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.15, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/filesystems ]; then
+  echo "udev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "udev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "udev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ]; then
+  echo "udev requires hotplug support, not started."
+  exit 1
+fi
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevsynthesize has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+
+udev_root=${udev_root%/}
+
+case "$1" in
+    start)
+    if [ -e "$udev_root/.udev/" ]; then
+	if mountpoint -q $udev_root/; then
+	    TMPFS_MOUNTED=1
+	else
+	    echo ".udev/ already exists on the static $udev_root!"
+	fi
+    else
+	warn_if_interactive
+    fi
+
+    echo > /proc/sys/kernel/hotplug
+
+    if [ -z "$TMPFS_MOUNTED" ]; then
+	unmount_devpts
+	mount_tmpfs
+	[ -d /proc/1 ] || mount -n /proc
+    fi
+
+    # /dev/null must be created before udevd is started
+    make_extra_nodes
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+
+    # if this directory is not present /dev will not be updated by udev
+    mkdir -p /dev/.udev/db/ /dev/.udev/queue/
+
+    echo "Synthesizing the initial hotplug events"
+    udevtrigger
+
+    load_input_modules
+    create_dev_makedev
+
+    # wait for the udevd childs to finish
+    echo "Waiting for /dev to be fully populated"
+    if ! udevsettle; then
+	echo 'timeout'
+    fi
+    ;;
+
+    stop)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+
+    restart)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    if start-stop-daemon --stop --name udevd --quiet ; then
+	exit 1
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+    ;;
+
+    reload)
+    udevcontrol reload_rules
+    ;;
+
+    *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/packages/udev/udev-100/links.conf b/packages/udev/udev-100/links.conf
new file mode 100644
index 0000000000..ee26012039
--- /dev/null
+++ b/packages/udev/udev-100/links.conf
@@ -0,0 +1,20 @@
+# This file does not exist. Please do not ask the debian maintainer about it.
+# You may use it to do strange and wonderful things, at your risk.
+
+L fd		/proc/self/fd
+L stdin		/proc/self/fd/0
+L stdout	/proc/self/fd/1
+L stderr	/proc/self/fd/2
+L core		/proc/kcore
+L sndstat	/proc/asound/oss/sndstat
+
+D pts
+D shm
+
+# Hic sunt leones.
+M ppp		c 108 0
+D loop
+M loop/0	b 7 0
+D net
+M net/tun	c 10 200
+
diff --git a/packages/udev/udev-100/local.rules b/packages/udev/udev-100/local.rules
new file mode 100644
index 0000000000..2308b52c4a
--- /dev/null
+++ b/packages/udev/udev-100/local.rules
@@ -0,0 +1,31 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-100/permissions.rules b/packages/udev/udev-100/permissions.rules
new file mode 100644
index 0000000000..8da35c3090
--- /dev/null
+++ b/packages/udev/udev-100/permissions.rules
@@ -0,0 +1,109 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
+
+# default permissions for block devices
+SUBSYSTEM=="block",				GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",				GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
+BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner"
+BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
+BUS=="scsi", SYSFS{type}=="6",			GROUP="scanner"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",	MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",			GROUP="plugdev", \
+	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
+
+# serial devices
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
+
+# vc devices (all members of the tty subsystem)
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
+
+# video devices
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
+
+# misc devices
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="nvram",				GROUP="nvram"
+KERNEL=="rtc",					GROUP="audio"
+KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
+KERNEL=="fuse",					GROUP="fuse"
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+KERNEL=="uverbs*",				GROUP="rdma"
+KERNEL=="ucm*",					GROUP="rdma"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
+
+# sound devices
+SUBSYSTEM=="sound",				GROUP="audio"
+
+# ieee1394 devices       
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
+
+# input devices
+KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/packages/udev/udev-100/udev.rules b/packages/udev/udev-100/udev.rules
new file mode 100644
index 0000000000..9c4ea4214d
--- /dev/null
+++ b/packages/udev/udev-100/udev.rules
@@ -0,0 +1,98 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+					SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+	PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",		NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",		NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",		NAME="hwrng"
+KERNEL=="tun",			NAME="net/%k"
+
+KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
+KERNEL=="pktcdvd",		NAME="pktcdvd/control"
+
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
+KERNEL=="microcode",		NAME="cpu/microcode"
+
+KERNEL=="umad*",		NAME="infiniband/%k"
+KERNEL=="issm*",		NAME="infiniband/%k"
+KERNEL=="uverbs*",		NAME="infiniband/%k"
+KERNEL=="ucm",			NAME="infiniband/%k"
+
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
+# ALSA devices
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# ieee1394 devices       
+KERNEL=="dv1394*",		NAME="dv1394/%n"
+KERNEL=="video1394*",		NAME="video1394/%n"
+
+# input devices
+KERNEL=="mice",			NAME="input/%k"
+KERNEL=="mouse[0-9]*",		NAME="input/%k"
+KERNEL=="event[0-9]*",		NAME="input/%k"
+KERNEL=="js[0-9]*",		NAME="input/%k"
+KERNEL=="ts[0-9]*",		NAME="input/%k"
+KERNEL=="uinput",		NAME="input/%k"
+
+# Zaptel
+KERNEL=="zapctl",		NAME="zap/ctl"
+KERNEL=="zaptimer",		NAME="zap/timer"
+KERNEL=="zapchannel",		NAME="zap/channel"
+KERNEL=="zappseudo",		NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",		NAME="zap/%n"
+
+# AOE character devices
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+
+# device mapper creates its own device nodes, so ignore these
+KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
new file mode 100644
index 0000000000..2e9e8d500f
--- /dev/null
+++ b/packages/udev/udev_100.bb
@@ -0,0 +1,63 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
+/dev/, handles hotplug events and loads drivers at boot time. It replaces \
+the hotplug package and requires a kernel not older than 2.6.15."
+DESCRIPTION_libvolume-id = "libvolume_id shared library, \
+used to detect the type of a file system and read its metadata."
+DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
+needed to link programs with libvolume_id."
+
+PR = "r0"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+	   file://noasmlinkage.patch;patch=1 \
+	   file://flags.patch;patch=1 \
+	   file://mount.blacklist \
+	   "
+
+require udev.inc
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+PACKAGES =+ "libvolume-id-dev libvolume-id"
+PKG_libvolume-id-dev = "libvolume-id-dev"
+FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+		   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
+	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
+	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
+	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+	fi
+
+	install -d ${D}${sysconfdir}/udev/scripts/
+
+	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
+	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+
+	install -d ${D}${base_libdir}/udev/
+}
+
+do_install_append_h2200() {
+	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}