summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-20 13:54:14 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-20 13:54:14 +0000
commit76df5abe0b9d1e3a9125e51e12cbd1cf3b18366e (patch)
tree79f66adf00efda428af51d35d7dcd59c6a1d0fdf /meta
parent1cc5d12080404d17693e84a4b8537e3b0c1772e7 (diff)
downloadopenembedded-core-76df5abe0b9d1e3a9125e51e12cbd1cf3b18366e.tar.gz
openembedded-core-76df5abe0b9d1e3a9125e51e12cbd1cf3b18366e.tar.bz2
openembedded-core-76df5abe0b9d1e3a9125e51e12cbd1cf3b18366e.tar.xz
openembedded-core-76df5abe0b9d1e3a9125e51e12cbd1cf3b18366e.zip
base-files/initscripts: Switch to using /var/volatile for volatiles in common with OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4510 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/base-files/base-files/akita/fstab2
-rw-r--r--meta/packages/base-files/base-files/c7x0/fstab2
-rw-r--r--meta/packages/base-files/base-files/collie/fstab2
-rw-r--r--meta/packages/base-files/base-files/fstab2
-rw-r--r--meta/packages/base-files/base-files/hx2000/fstab2
-rw-r--r--meta/packages/base-files/base-files/mtx-1/fstab2
-rw-r--r--meta/packages/base-files/base-files/nokia770/fstab2
-rw-r--r--meta/packages/base-files/base-files/openmn/fstab7
-rw-r--r--meta/packages/base-files/base-files/openmn/issue2
-rw-r--r--meta/packages/base-files/base-files/openmn/issue.net2
-rw-r--r--meta/packages/base-files/base-files/openmn/profile31
-rw-r--r--meta/packages/base-files/base-files/openmn/usbd1
-rw-r--r--meta/packages/base-files/base-files/poodle/fstab2
-rw-r--r--meta/packages/base-files/base-files/simpad/fstab8
-rw-r--r--meta/packages/base-files/base-files/tosa/fstab2
-rw-r--r--meta/packages/base-files/base-files_3.0.14.bb26
-rw-r--r--meta/packages/initscripts/initscripts-1.0/volatiles28
-rw-r--r--meta/packages/initscripts/initscripts_1.0.bb2
18 files changed, 40 insertions, 85 deletions
diff --git a/meta/packages/base-files/base-files/akita/fstab b/meta/packages/base-files/base-files/akita/fstab
index 754f140b3..5f2c94134 100644
--- a/meta/packages/base-files/base-files/akita/fstab
+++ b/meta/packages/base-files/base-files/akita/fstab
@@ -3,7 +3,7 @@
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
-tmpfs /var tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
# SD/MMC in kernel 2.4
diff --git a/meta/packages/base-files/base-files/c7x0/fstab b/meta/packages/base-files/base-files/c7x0/fstab
index fb37e07ae..e065e8112 100644
--- a/meta/packages/base-files/base-files/c7x0/fstab
+++ b/meta/packages/base-files/base-files/c7x0/fstab
@@ -3,7 +3,7 @@
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
-tmpfs /var tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
# SD/MMC in kernel 2.4
diff --git a/meta/packages/base-files/base-files/collie/fstab b/meta/packages/base-files/base-files/collie/fstab
index ce5bc3bac..dc3499b90 100644
--- a/meta/packages/base-files/base-files/collie/fstab
+++ b/meta/packages/base-files/base-files/collie/fstab
@@ -2,7 +2,7 @@
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0
/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0
-tmpfs /var tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
#tmpfs /media/ram tmpfs defaults 0 0
diff --git a/meta/packages/base-files/base-files/fstab b/meta/packages/base-files/base-files/fstab
index 8bfb08720..f0eed36ed 100644
--- a/meta/packages/base-files/base-files/fstab
+++ b/meta/packages/base-files/base-files/fstab
@@ -4,7 +4,7 @@ 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 /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
# uncomment this if your device has a SD/MMC/Transflash slot
diff --git a/meta/packages/base-files/base-files/hx2000/fstab b/meta/packages/base-files/base-files/hx2000/fstab
index 3dfde917e..2d4b7aae7 100644
--- a/meta/packages/base-files/base-files/hx2000/fstab
+++ b/meta/packages/base-files/base-files/hx2000/fstab
@@ -5,5 +5,5 @@ proc /proc proc defaults 0 0
sys /sys sysfs defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0
-tmpfs /var tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/meta/packages/base-files/base-files/mtx-1/fstab b/meta/packages/base-files/base-files/mtx-1/fstab
index ffab21cf6..ee3fab0c1 100644
--- a/meta/packages/base-files/base-files/mtx-1/fstab
+++ b/meta/packages/base-files/base-files/mtx-1/fstab
@@ -2,7 +2,7 @@
#
# <file system> <mount pt> <type> <options> <dump> <pass>
rootfs / auto defaults 1 1
-tmpfs /var tmpfs size=10m 0 0
+tmpfs /var/volatile 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/meta/packages/base-files/base-files/nokia770/fstab b/meta/packages/base-files/base-files/nokia770/fstab
index 68b56b63e..7dbae252f 100644
--- a/meta/packages/base-files/base-files/nokia770/fstab
+++ b/meta/packages/base-files/base-files/nokia770/fstab
@@ -1,6 +1,6 @@
rootfs / rootfs defaults,errors=remount-ro,noatime 0 0
/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0
-tmpfs /var tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
proc /proc proc defaults 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/meta/packages/base-files/base-files/openmn/fstab b/meta/packages/base-files/base-files/openmn/fstab
deleted file mode 100644
index 06589b01d..000000000
--- a/meta/packages/base-files/base-files/openmn/fstab
+++ /dev/null
@@ -1,7 +0,0 @@
-devfs /dev devfs defaults 0 0
-tmpfs /dev/shm tmpfs mode=0777 0 0
-proc /proc proc defaults 0 0
-none /sys sysfs defaults 0 0
-rootfs / rootfs rw 1 1
-tmpfs /var/volatile tmpfs mode=0755 0 0
-tmpfs /tmp tmpfs defaults 0 0
diff --git a/meta/packages/base-files/base-files/openmn/issue b/meta/packages/base-files/base-files/openmn/issue
deleted file mode 100644
index 8c70d49b3..000000000
--- a/meta/packages/base-files/base-files/openmn/issue
+++ /dev/null
@@ -1,2 +0,0 @@
-M&N 5.4
-
diff --git a/meta/packages/base-files/base-files/openmn/issue.net b/meta/packages/base-files/base-files/openmn/issue.net
deleted file mode 100644
index 8c70d49b3..000000000
--- a/meta/packages/base-files/base-files/openmn/issue.net
+++ /dev/null
@@ -1,2 +0,0 @@
-M&N 5.4
-
diff --git a/meta/packages/base-files/base-files/openmn/profile b/meta/packages/base-files/base-files/openmn/profile
deleted file mode 100644
index 2b01071e1..000000000
--- a/meta/packages/base-files/base-files/openmn/profile
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
-# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-
-OPIEDIR=/opt/QtPalmtop
-QPEDIR=/opt/QtPalmtop
-QTDIR=/opt/QtPalmtop
-PATH="/opt/QtPalmtop/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
-
-PS1='$ '
-if [ "`id -u`" -eq 0 ]; then
- PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
- PS1='# '
-fi
-
-if [ -d /etc/profile.d ]; then
- for i in `ls /etc/profile.d/`; do
- . /etc/profile.d/$i
- done
- unset i
-fi
-
-case "`cat /proc/sys/board/lcd_type`" in
- 2) export QWS_DISPLAY=Transformed:Rot90 ;;
- 3) export QWS_DISPLAY=Transformed:Rot270 ;;
- *) export QWS_DISPLAY=Transformed:Rot180 ;;
-esac
-alias ll="ls -lAF"
-
-export PATH PS1 OPIEDIR QPEDIR QTDIR
-
-umask 022
diff --git a/meta/packages/base-files/base-files/openmn/usbd b/meta/packages/base-files/base-files/openmn/usbd
deleted file mode 100644
index 40931ee8e..000000000
--- a/meta/packages/base-files/base-files/openmn/usbd
+++ /dev/null
@@ -1 +0,0 @@
-usbdmodule=pxa_bi
diff --git a/meta/packages/base-files/base-files/poodle/fstab b/meta/packages/base-files/base-files/poodle/fstab
index 06b967250..b96b750eb 100644
--- a/meta/packages/base-files/base-files/poodle/fstab
+++ b/meta/packages/base-files/base-files/poodle/fstab
@@ -9,5 +9,5 @@ proc /proc proc defaults 0 0
# SD/MMC in kernel 2.4
/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
-tmpfs /var tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/meta/packages/base-files/base-files/simpad/fstab b/meta/packages/base-files/base-files/simpad/fstab
deleted file mode 100644
index 51aaaf925..000000000
--- a/meta/packages/base-files/base-files/simpad/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
-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
-/dev/mtdblock/2 /home jffs2 defaults 1 1
-/dev/hda1 /media/cf auto noauto,owner 0 0
diff --git a/meta/packages/base-files/base-files/tosa/fstab b/meta/packages/base-files/base-files/tosa/fstab
index fb37e07ae..e065e8112 100644
--- a/meta/packages/base-files/base-files/tosa/fstab
+++ b/meta/packages/base-files/base-files/tosa/fstab
@@ -3,7 +3,7 @@
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
-tmpfs /var tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
# SD/MMC in kernel 2.4
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 289d2bbfd..42cd03157 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 = "r59"
+PR = "r60"
LICENSE = "GPL"
SRC_URI = " \
@@ -12,7 +12,7 @@ SRC_URI = " \
file://host.conf \
file://profile \
file://fstab \
- file://filesystems \
+ file://filesystems \
file://issue.net \
file://issue \
file://usbd \
@@ -29,7 +29,7 @@ SRC_URI = " \
S = "${WORKDIR}"
docdir_append = "/${P}"
-dirs1777 = "/tmp ${localstatedir}/lock ${localstatedir}/tmp"
+dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \
@@ -37,13 +37,16 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
${libdir} ${sbindir} ${datadir} \
${datadir}/common-licenses ${datadir}/dict ${infodir} \
${mandir} ${datadir}/misc ${localstatedir} \
- ${localstatedir}/backups ${localstatedir}/cache \
- ${localstatedir}/lib /sys ${localstatedir}/lib/misc \
- ${localstatedir}/lock/subsys ${localstatedir}/log \
- ${localstatedir}/run ${localstatedir}/spool \
+ ${localstatedir}/backups ${localstatedir}/lib \
+ /sys ${localstatedir}/lib/misc ${localstatedir}/spool \
+ ${localstatedir}/volatile ${localstatedir}/volatile/cache \
+ ${localstatedir}/volatile/lock/subsys \
+ ${localstatedir}/volatile/log \
+ ${localstatedir}/volatile/run \
/mnt /media /media/card /media/cf /media/net /media/ram \
/media/union /media/realroot /media/hdd \
- /media/mmc1"
+ /media/mmc1"
+volatiles = "cache run log lock tmp"
conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
@@ -68,6 +71,9 @@ do_install () {
for d in ${dirs2775}; do
install -m 2755 -d ${D}$d
done
+ for d in ${volatiles}; do
+ ln -sf volatile/$d ${D}/${localstatedir}/$d
+ done
for d in card cf net ram; do
ln -sf /media/$d ${D}/mnt/$d
done
@@ -120,7 +126,6 @@ do_install () {
do_install_append_mnci () {
rmdir ${D}/tmp
- mkdir -p ${D}${localstatedir}/tmp
ln -s var/tmp ${D}/tmp
}
@@ -149,10 +154,11 @@ FILES_${PN} = "/"
FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
# M&N specific packaging
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
PACKAGE_ARCH_mnci = "mnci"
PACKAGE_ARCH_rt3000 = "rt3000"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
# Unslung distribution specific packaging
PACKAGES_unslung = "${PN}-unslung"
diff --git a/meta/packages/initscripts/initscripts-1.0/volatiles b/meta/packages/initscripts/initscripts-1.0/volatiles
index 9fa7a4682..b2ae2794d 100644
--- a/meta/packages/initscripts/initscripts-1.0/volatiles
+++ b/meta/packages/initscripts/initscripts-1.0/volatiles
@@ -21,19 +21,19 @@
# This explains the order of "link before object" as in the example above, where
# a link will be created at /var/test pointing to /tmp/testfile and due to this
# link the file defined as /var/test will actually be created as /tmp/testfile.
-d root root 0775 /var none
-d root root 0755 /var/backups none
-d root root 0755 /var/cache none
-d root root 0755 /var/lib none
-d root root 0755 /var/lib/ipkg none
-d root root 0755 /var/lib/misc none
-d root root 2775 /var/local none
-d root root 1777 /var/lock none
+d root root 0755 /var/volatile/cache none
+d root root 1777 /var/volatile/lock none
+d root root 0755 /var/volatile/log none
+d root root 0755 /var/volatile/run none
+d root root 1777 /var/volatile/tmp none
+l root root 0755 /var/cache /var/volatile/cache
+l root root 1777 /var/lock /var/volatile/lock
+l root root 0755 /var/log /var/volatile/log
+l root root 0755 /var/run /var/volatile/run
+l root root 1777 /var/tmp /var/volatile/tmp
d root root 0755 /var/lock/subsys none
-d root root 0755 /var/log none
-d root root 0755 /var/run none
-d root root 0755 /var/spool none
-d root root 1777 /var/tmp none
-f root root 0664 /var/run/utmp none
f root root 0664 /var/log/wtmp none
-f root root 0664 /var/log/lastlog none
+f root root 0664 /var/run/utmp none
+l root root 0644 /etc/resolv.conf /var/run/resolv.conf
+f root root 0644 /var/run/resolv.conf none
+
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 55998c0a4..242e85086 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r105"
+PR = "r106"
SRC_URI = "file://functions \
file://halt \