base-files: Sync with OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@907 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 11 insertions, 2 deletions

diff --git a/meta/packages/base-files/base-files/tosa/usbd b/meta/packages/base-files/base-files/tosa/usbd
index 40931ee8e9..8c80044167 100644
--- a/meta/packages/base-files/base-files/tosa/usbd
+++ b/meta/packages/base-files/base-files/tosa/usbd
@@ -1 +1,5 @@
-usbdmodule=pxa_bi
+# I know that this was created for usb-client stuff
+# but tosa/2.6 need (un)loading USB Host module
+# on suspend/resume and this way is simplest one ;)
+
+usbdmodule=ohci-hcd
diff --git a/meta/packages/base-files/base-files_3.0.14.bb b/meta/packages/base-files/base-files_3.0.14.bb
index b8789321d9..9dbd4e81d1 100644
--- a/meta/packages/base-files/base-files_3.0.14.bb
+++ b/meta/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r51"
+PR = "r54"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -52,6 +52,7 @@ hostname = "openembedded"
 hostname_slugos = "nslu2"
 hostname_mnci = "MNCI"
 hostname_rt3000 = "MNRT"
+hostname_jlime = "JLime"
 
 do_install () {
         for d in ${dirs755}; do
@@ -130,6 +131,10 @@ do_install_append_slugos() {
         ln -s ../root ${D}/home/root
 }
 
+do_install_append_netbook-pro () {
+        mkdir -p ${D}/initrd
+}
+
 PACKAGES = "${PN}-doc ${PN}"
 FILES_${PN} = "/"
 FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"