base-files: sync with .dev

20 files changed, 113 insertions, 16 deletions

diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab
index bf8f8a87e5..8bfb08720f 100644
--- a/packages/base-files/base-files/fstab
+++ b/packages/base-files/base-files/fstab
@@ -1,4 +1,12 @@
-rootfs               /                    auto       defaults              1 1
-proc                 /proc                proc       defaults              0 0
-devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
-usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
+# stock fstab - you probably want to override this with a machine specific one
+
+rootfs               /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
+usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
+tmpfs                /var                 tmpfs      defaults              0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
+
+# uncomment this if your device has a SD/MMC/Transflash slot
+#/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
+
diff --git a/packages/base-files/base-files/jornada720/.mtn2git_empty b/packages/base-files/base-files/h5xxx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/jornada720/.mtn2git_empty
+++ b/packages/base-files/base-files/h5xxx/.mtn2git_empty
diff --git a/packages/base-files/base-files/h5xxx/fstab b/packages/base-files/base-files/h5xxx/fstab
new file mode 100644
index 0000000000..b44d7eacee
--- /dev/null
+++ b/packages/base-files/base-files/h5xxx/fstab
@@ -0,0 +1,8 @@
+/dev/mtdblock/1	/ 	jffs2	defaults	1  1 
+#breaks h51xx
+/dev/mtdblock/2 /home   jffs2   defaults        1  1
+proc            /proc   proc    defaults        0  0
+/dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
+/dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
+tmpfs		/var	tmpfs	defaults	0  0
+tmpfs		/media/ram	tmpfs	defaults	0  0
diff --git a/packages/base-files/base-files/htcuniversal/.mtn2git_empty b/packages/base-files/base-files/htcuniversal/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/htcuniversal/.mtn2git_empty
diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab
new file mode 100644
index 0000000000..b776dc0641
--- /dev/null
+++ b/packages/base-files/base-files/htcuniversal/fstab
@@ -0,0 +1,12 @@
+# stock fstab - you probably want to override this with a machine specific one
+
+rootfs               /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
+#usbfs               /proc/bus/usb        usbfs   noauto                0  0
+tmpfs                /var                 tmpfs      defaults              0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
+
+# uncomment this if your device has a SD/MMC/Transflash slot
+#/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
+
diff --git a/packages/base-files/base-files/jornada6xx/.mtn2git_empty b/packages/base-files/base-files/jornada6xx/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/jornada6xx/.mtn2git_empty
diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab
new file mode 100644
index 0000000000..504a1a2f4e
--- /dev/null
+++ b/packages/base-files/base-files/jornada6xx/fstab
@@ -0,0 +1,7 @@
+proc		/proc	proc	defaults	        0  0
+/dev/hda2       /       ext2    defaults                0  0
+/dev/hda1	/mnt/cf	auto	defaults,sync,noauto	0  0
+/dev/hda3       none    swap    sw                      0  0
+tmpfs		/var	tmpfs	defaults	        0  0
+tmpfs		/mnt/ram	tmpfs	defaults	0  0
+devpts		/dev/pts	devpts	defaults	0  0
\ No newline at end of file
diff --git a/packages/base-files/base-files/jornada720/fstab b/packages/base-files/base-files/jornada720/fstab
deleted file mode 100644
index 07ccff0fe6..0000000000
--- a/packages/base-files/base-files/jornada720/fstab
+++ /dev/null
@@ -1,6 +0,0 @@
-/dev/mtdblock1	/ 	jffs2	rw,noatime	1  1 
-proc		/proc	proc	defaults	0  0
-/dev/hda1	/mnt/cf	auto	defaults,sync,noauto	0  0
-tmpfs		/var	tmpfs	defaults	0  0
-tmpfs		/mnt/ram	tmpfs	defaults	0  0
-devpts		/dev/pts	devpts	defaults	0  0
\ No newline at end of file
diff --git a/packages/base-files/base-files/jornada7xx/.mtn2git_empty b/packages/base-files/base-files/jornada7xx/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/jornada7xx/.mtn2git_empty
diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab
new file mode 100644
index 0000000000..504a1a2f4e
--- /dev/null
+++ b/packages/base-files/base-files/jornada7xx/fstab
@@ -0,0 +1,7 @@
+proc		/proc	proc	defaults	        0  0
+/dev/hda2       /       ext2    defaults                0  0
+/dev/hda1	/mnt/cf	auto	defaults,sync,noauto	0  0
+/dev/hda3       none    swap    sw                      0  0
+tmpfs		/var	tmpfs	defaults	        0  0
+tmpfs		/mnt/ram	tmpfs	defaults	0  0
+devpts		/dev/pts	devpts	defaults	0  0
\ No newline at end of file
diff --git a/packages/base-files/base-files/mtx-2/.mtn2git_empty b/packages/base-files/base-files/mtx-2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/mtx-2/.mtn2git_empty
diff --git a/packages/base-files/base-files/mtx-2/fstab b/packages/base-files/base-files/mtx-2/fstab
new file mode 100644
index 0000000000..f6f23ac2aa
--- /dev/null
+++ b/packages/base-files/base-files/mtx-2/fstab
@@ -0,0 +1,8 @@
+# /etc/fstab: static file system information. mtx-2
+#
+# <file system> <mount pt>     <type>     <options>         <dump> <pass>
+rootfs          /              auto       defaults          1      1
+tmpfs           /var           tmpfs      size=10m          0      0
+proc            /proc          proc       defaults          0      0
+devpts          /dev/pts       devpts     mode=0620,gid=5   0      0
+usbdevfs        /proc/bus/usb  usbdevfs   noauto            0      0
diff --git a/packages/base-files/base-files/mtx-2/profile b/packages/base-files/base-files/mtx-2/profile
new file mode 100644
index 0000000000..bedf2fc7d8
--- /dev/null
+++ b/packages/base-files/base-files/mtx-2/profile
@@ -0,0 +1,25 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$i
+  done
+  unset i
+fi
+
+export PATH PS1
+
+umask 022
+
+alias ll="ls -lah"
\ No newline at end of file
diff --git a/packages/base-files/base-files/netbook-pro/.mtn2git_empty b/packages/base-files/base-files/netbook-pro/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/netbook-pro/.mtn2git_empty
diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab
new file mode 100644
index 0000000000..d10c78bd66
--- /dev/null
+++ b/packages/base-files/base-files/netbook-pro/fstab
@@ -0,0 +1,5 @@
+rootfs               /                    auto       defaults              1 1
+proc                 /proc                proc       defaults              0 0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
+usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
+tmpfs                /var                 tmpfs      defaults              0 0
diff --git a/packages/base-files/base-files/omap5912osk/.mtn2git_empty b/packages/base-files/base-files/omap5912osk/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/omap5912osk/.mtn2git_empty
diff --git a/packages/base-files/base-files/omap5912osk/fstab b/packages/base-files/base-files/omap5912osk/fstab
new file mode 100644
index 0000000000..77331c0dac
--- /dev/null
+++ b/packages/base-files/base-files/omap5912osk/fstab
@@ -0,0 +1,9 @@
+# fstab for omap5912osk
+
+rootfs               /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+sysfs                /sysfs               sysfs      defaults              0  0
+tmpfs                /dev                 tmpfs      defaults              0  0
+tmpfs                /var                 tmpfs      defaults              0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
+
diff --git a/packages/base-files/base-files/simpad/fstab b/packages/base-files/base-files/simpad/fstab
index 99b87714e5..51aaaf9256 100644
--- a/packages/base-files/base-files/simpad/fstab
+++ b/packages/base-files/base-files/simpad/fstab
@@ -3,5 +3,6 @@ proc                 /proc                proc       defaults              0 0
 devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
 usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
 tmpfs		     /var		  tmpfs	     defaults		   0 0
+tmpfs                /media/ram           tmpfs      defaults              0 0
 /dev/mtdblock/2	     /home		  jffs2	     defaults		   1 1
-/dev/hda1	     /mnt/cf		  auto	     noauto,owner	   0 0
+/dev/hda1	     /media/cf		  auto	     noauto,owner	   0 0
diff --git a/packages/base-files/base-files/tosa/usbd b/packages/base-files/base-files/tosa/usbd
index 40931ee8e9..8c80044167 100644
--- a/packages/base-files/base-files/tosa/usbd
+++ b/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/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index cbf0cc772a..d4c03bdefe 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/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 = "r50"
+PR = "r54"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -45,12 +45,14 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
 	     ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
 	     ${sysconfdir}/default"
 
+#
+# set standard hostname, might be a candidate for a DISTRO variable? :M:
+#
 hostname = "openembedded"
 hostname_slugos = "nslu2"
 hostname_mnci = "MNCI"
-PACKAGE_ARCH_mnci = "mnci"
 hostname_rt3000 = "MNRT"
-PACKAGE_ARCH_rt3000 = "rt3000"
+hostname_jlime = "JLime"
 
 do_install () {
 	for d in ${dirs755}; do
@@ -129,12 +131,19 @@ 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"
 
+# M&N specific packaging
+PACKAGE_ARCH_mnci = "mnci"
+PACKAGE_ARCH_rt3000 = "rt3000"
 
-# Unslung distribution specific packages follow ...
+# Unslung distribution specific packaging
 
 PACKAGES_unslung = "${PN}-unslung"
 PACKAGE_ARCH_${PN}-unslung = "nslu2"