summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 10:08:10 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 10:08:10 +0000
commit378c5d96e666675cf4a933a1677efed55c957d82 (patch)
treea5d4be94cf7ee3aab51bdf330b5aa8cb7e802a4e
parent0d35abe6c980b4ce7c106427b1036307330a42d6 (diff)
downloadopenembedded-core-378c5d96e666675cf4a933a1677efed55c957d82.tar.gz
openembedded-core-378c5d96e666675cf4a933a1677efed55c957d82.tar.bz2
openembedded-core-378c5d96e666675cf4a933a1677efed55c957d82.tar.xz
openembedded-core-378c5d96e666675cf4a933a1677efed55c957d82.zip
base-files: Sync with OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@907 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/base-files/base-files/tosa/usbd6
-rw-r--r--meta/packages/base-files/base-files_3.0.14.bb7
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 40931ee8e..8c8004416 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 b8789321d..9dbd4e81d 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"