From 3097f7b539e8afd2d5e042ff0758b1f7b51c49a4 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@brightsign.biz>
Date: Mon, 6 Jun 2011 17:15:14 +0100
Subject: base-files: add fstab

---
 recipes/base-files/base-files/fstab     |  8 ++++++++
 recipes/base-files/base-files_3.0.14.bb | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 recipes/base-files/base-files/fstab

(limited to 'recipes')

diff --git a/recipes/base-files/base-files/fstab b/recipes/base-files/base-files/fstab
new file mode 100644
index 0000000..01f3b9f
--- /dev/null
+++ b/recipes/base-files/base-files/fstab
@@ -0,0 +1,8 @@
+rootfs               /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+devtmpfs	     /dev		  devtmpfs   defaults		   0  0   
+devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
+usbfs                /proc/bus/usb        usbfs      defaults              0  0
+tmpfs                /var/volatile        tmpfs      defaults              0  0
+tmpfs                /dev/shm             tmpfs      mode=0777             0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index 10538d2..b8de63c 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,12 +1,13 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r102"
+PR = "r103"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = " \
+	   file://fstab \
            file://nsswitch.conf \
            file://licenses/BSD \
            file://licenses/GPL-2 \
@@ -33,23 +34,24 @@ hostname = "oe-micro"
 
 do_install () {
 	for d in ${dirs755}; do
-		install -m 0755 -d ${D}$d
+		install -m 0755 -d "${D}$d"
 	done
 	for d in ${dirs1777}; do
-		install -m 1777 -d ${D}$d
+		install -m 1777 -d "${D}$d"
 	done
 	for d in ${dirs2775}; do
-		install -m 2755 -d ${D}$d
+		install -m 2755 -d "${D}$d"
 	done
 	for d in ${volatiles}; do
-                if [ -d ${D}${localstatedir}/volatile/$d ]; then
-                        ln -sf volatile/$d ${D}/${localstatedir}/$d
+                if [ -d "${D}${localstatedir}/volatile/$d" ]; then
+                        ln -sf volatile/$d "${D}/${localstatedir}/$d"
                 fi
 	done
 
-	echo ${hostname} > ${D}${sysconfdir}/hostname
+	echo ${hostname} > "${D}${sysconfdir}/hostname"
 
-	install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
+	install -m 0644 "${WORKDIR}/fstab" "${D}${sysconfdir}/fstab"
+	install -m 0644 "${WORKDIR}/nsswitch.conf" "${D}${sysconfdir}/nsswitch.conf"
 }
 
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}"
-- 
cgit 1.2.3-korg


From 9271a8c4ec730661b78155c4e642254c5f7be30f Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@brightsign.biz>
Date: Mon, 6 Jun 2011 17:15:37 +0100
Subject: busybox: adjust FILESPATH

---
 recipes/busybox/busybox_1.18.4.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'recipes')

diff --git a/recipes/busybox/busybox_1.18.4.bbappend b/recipes/busybox/busybox_1.18.4.bbappend
index 435ba43..cf980ab 100644
--- a/recipes/busybox/busybox_1.18.4.bbappend
+++ b/recipes/busybox/busybox_1.18.4.bbappend
@@ -1,4 +1,4 @@
-PR .= ".2"
+PR .= ".3"
 
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}", "${THISDIR}/files"], d)}:"
-- 
cgit 1.2.3-korg