summaryrefslogtreecommitdiffstats
path: root/meta/packages
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/packages
parent1cc5d12080404d17693e84a4b8537e3b0c1772e7 (diff)
downloadpoky-76df5abe0b9d1e3a9125e51e12cbd1cf3b18366e.tar.gz
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/packages')
-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 754f140b34..5f2c941345 100644
--- a/meta/packages/base-files/base-files/akita/fstab
+++ b/meta/packages/base-files/base-files/akita/fstab
@@ -3,7 +3,7 @@
3proc /proc proc defaults 0 0 3proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
5 5
6tmpfs /var tmpfs defaults 0 0 6tmpfs /var/volatile tmpfs defaults 0 0
7tmpfs /media/ram tmpfs defaults 0 0 7tmpfs /media/ram tmpfs defaults 0 0
8 8
9# SD/MMC in kernel 2.4 9# 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 fb37e07aec..e065e8112e 100644
--- a/meta/packages/base-files/base-files/c7x0/fstab
+++ b/meta/packages/base-files/base-files/c7x0/fstab
@@ -3,7 +3,7 @@
3proc /proc proc defaults 0 0 3proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
5 5
6tmpfs /var tmpfs defaults 0 0 6tmpfs /var/volatile tmpfs defaults 0 0
7tmpfs /media/ram tmpfs defaults 0 0 7tmpfs /media/ram tmpfs defaults 0 0
8 8
9# SD/MMC in kernel 2.4 9# 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 ce5bc3bac5..dc3499b909 100644
--- a/meta/packages/base-files/base-files/collie/fstab
+++ b/meta/packages/base-files/base-files/collie/fstab
@@ -2,7 +2,7 @@
2proc /proc proc defaults 0 0 2proc /proc proc defaults 0 0
3/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0 3/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0
4/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0 4/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0
5tmpfs /var tmpfs defaults 0 0 5tmpfs /var/volatile tmpfs defaults 0 0
6 6
7# we use a non-volatile ramdisk, see /etc/init.d/ramdisk 7# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
8#tmpfs /media/ram tmpfs defaults 0 0 8#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 8bfb08720f..f0eed36ed7 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
4proc /proc proc defaults 0 0 4proc /proc proc defaults 0 0
5devpts /dev/pts devpts mode=0620,gid=5 0 0 5devpts /dev/pts devpts mode=0620,gid=5 0 0
6usbdevfs /proc/bus/usb usbdevfs noauto 0 0 6usbdevfs /proc/bus/usb usbdevfs noauto 0 0
7tmpfs /var tmpfs defaults 0 0 7tmpfs /var/volatile tmpfs defaults 0 0
8tmpfs /media/ram tmpfs defaults 0 0 8tmpfs /media/ram tmpfs defaults 0 0
9 9
10# uncomment this if your device has a SD/MMC/Transflash slot 10# 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 3dfde917e6..2d4b7aae72 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
5sys /sys sysfs defaults 0 0 5sys /sys sysfs defaults 0 0
6 6
7/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 7/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0
8tmpfs /var tmpfs defaults 0 0 8tmpfs /var/volatile tmpfs defaults 0 0
9tmpfs /media/ram tmpfs defaults 0 0 9tmpfs /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 ffab21cf68..ee3fab0c13 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 @@
2# 2#
3# <file system> <mount pt> <type> <options> <dump> <pass> 3# <file system> <mount pt> <type> <options> <dump> <pass>
4rootfs / auto defaults 1 1 4rootfs / auto defaults 1 1
5tmpfs /var tmpfs size=10m 0 0 5tmpfs /var/volatile tmpfs size=10m 0 0
6proc /proc proc defaults 0 0 6proc /proc proc defaults 0 0
7devpts /dev/pts devpts mode=0620,gid=5 0 0 7devpts /dev/pts devpts mode=0620,gid=5 0 0
8usbdevfs /proc/bus/usb usbdevfs noauto 0 0 8usbdevfs /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 68b56b63e3..7dbae252fb 100644
--- a/meta/packages/base-files/base-files/nokia770/fstab
+++ b/meta/packages/base-files/base-files/nokia770/fstab
@@ -1,6 +1,6 @@
1rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 1rootfs / rootfs defaults,errors=remount-ro,noatime 0 0
2/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 2/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0
3tmpfs /var tmpfs defaults 0 0 3tmpfs /var/volatile tmpfs defaults 0 0
4tmpfs /media/ram tmpfs defaults 0 0 4tmpfs /media/ram tmpfs defaults 0 0
5proc /proc proc defaults 0 0 5proc /proc proc defaults 0 0
6usbdevfs /proc/bus/usb usbdevfs noauto 0 0 6usbdevfs /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 06589b01dc..0000000000
--- a/meta/packages/base-files/base-files/openmn/fstab
+++ /dev/null
@@ -1,7 +0,0 @@
1devfs /dev devfs defaults 0 0
2tmpfs /dev/shm tmpfs mode=0777 0 0
3proc /proc proc defaults 0 0
4none /sys sysfs defaults 0 0
5rootfs / rootfs rw 1 1
6tmpfs /var/volatile tmpfs mode=0755 0 0
7tmpfs /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 8c70d49b34..0000000000
--- a/meta/packages/base-files/base-files/openmn/issue
+++ /dev/null
@@ -1,2 +0,0 @@
1M&N 5.4
2
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 8c70d49b34..0000000000
--- a/meta/packages/base-files/base-files/openmn/issue.net
+++ /dev/null
@@ -1,2 +0,0 @@
1M&N 5.4
2
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 2b01071e15..0000000000
--- a/meta/packages/base-files/base-files/openmn/profile
+++ /dev/null
@@ -1,31 +0,0 @@
1# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
2# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
3
4OPIEDIR=/opt/QtPalmtop
5QPEDIR=/opt/QtPalmtop
6QTDIR=/opt/QtPalmtop
7PATH="/opt/QtPalmtop/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
8
9PS1='$ '
10if [ "`id -u`" -eq 0 ]; then
11 PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
12 PS1='# '
13fi
14
15if [ -d /etc/profile.d ]; then
16 for i in `ls /etc/profile.d/`; do
17 . /etc/profile.d/$i
18 done
19 unset i
20fi
21
22case "`cat /proc/sys/board/lcd_type`" in
23 2) export QWS_DISPLAY=Transformed:Rot90 ;;
24 3) export QWS_DISPLAY=Transformed:Rot270 ;;
25 *) export QWS_DISPLAY=Transformed:Rot180 ;;
26esac
27alias ll="ls -lAF"
28
29export PATH PS1 OPIEDIR QPEDIR QTDIR
30
31umask 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 40931ee8e9..0000000000
--- a/meta/packages/base-files/base-files/openmn/usbd
+++ /dev/null
@@ -1 +0,0 @@
1usbdmodule=pxa_bi
diff --git a/meta/packages/base-files/base-files/poodle/fstab b/meta/packages/base-files/base-files/poodle/fstab
index 06b9672504..b96b750eb6 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
9# SD/MMC in kernel 2.4 9# SD/MMC in kernel 2.4
10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
11 11
12tmpfs /var tmpfs defaults 0 0 12tmpfs /var/volatile tmpfs defaults 0 0
13tmpfs /media/ram tmpfs defaults 0 0 13tmpfs /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 51aaaf9256..0000000000
--- a/meta/packages/base-files/base-files/simpad/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
1rootfs / auto defaults 1 1
2proc /proc proc defaults 0 0
3devpts /dev/pts devpts mode=0620,gid=5 0 0
4usbdevfs /proc/bus/usb usbdevfs noauto 0 0
5tmpfs /var tmpfs defaults 0 0
6tmpfs /media/ram tmpfs defaults 0 0
7/dev/mtdblock/2 /home jffs2 defaults 1 1
8/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 fb37e07aec..e065e8112e 100644
--- a/meta/packages/base-files/base-files/tosa/fstab
+++ b/meta/packages/base-files/base-files/tosa/fstab
@@ -3,7 +3,7 @@
3proc /proc proc defaults 0 0 3proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
5 5
6tmpfs /var tmpfs defaults 0 0 6tmpfs /var/volatile tmpfs defaults 0 0
7tmpfs /media/ram tmpfs defaults 0 0 7tmpfs /media/ram tmpfs defaults 0 0
8 8
9# SD/MMC in kernel 2.4 9# 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 289d2bbfd9..42cd031573 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 @@
1DESCRIPTION = "Miscellaneous files for the base system." 1DESCRIPTION = "Miscellaneous files for the base system."
2SECTION = "base" 2SECTION = "base"
3PRIORITY = "required" 3PRIORITY = "required"
4PR = "r59" 4PR = "r60"
5LICENSE = "GPL" 5LICENSE = "GPL"
6 6
7SRC_URI = " \ 7SRC_URI = " \
@@ -12,7 +12,7 @@ SRC_URI = " \
12 file://host.conf \ 12 file://host.conf \
13 file://profile \ 13 file://profile \
14 file://fstab \ 14 file://fstab \
15 file://filesystems \ 15 file://filesystems \
16 file://issue.net \ 16 file://issue.net \
17 file://issue \ 17 file://issue \
18 file://usbd \ 18 file://usbd \
@@ -29,7 +29,7 @@ SRC_URI = " \
29S = "${WORKDIR}" 29S = "${WORKDIR}"
30 30
31docdir_append = "/${P}" 31docdir_append = "/${P}"
32dirs1777 = "/tmp ${localstatedir}/lock ${localstatedir}/tmp" 32dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
33dirs2775 = "/home ${prefix}/src ${localstatedir}/local" 33dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
34dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ 34dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
35 ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \ 35 ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \
@@ -37,13 +37,16 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
37 ${libdir} ${sbindir} ${datadir} \ 37 ${libdir} ${sbindir} ${datadir} \
38 ${datadir}/common-licenses ${datadir}/dict ${infodir} \ 38 ${datadir}/common-licenses ${datadir}/dict ${infodir} \
39 ${mandir} ${datadir}/misc ${localstatedir} \ 39 ${mandir} ${datadir}/misc ${localstatedir} \
40 ${localstatedir}/backups ${localstatedir}/cache \ 40 ${localstatedir}/backups ${localstatedir}/lib \
41 ${localstatedir}/lib /sys ${localstatedir}/lib/misc \ 41 /sys ${localstatedir}/lib/misc ${localstatedir}/spool \
42 ${localstatedir}/lock/subsys ${localstatedir}/log \ 42 ${localstatedir}/volatile ${localstatedir}/volatile/cache \
43 ${localstatedir}/run ${localstatedir}/spool \ 43 ${localstatedir}/volatile/lock/subsys \
44 ${localstatedir}/volatile/log \
45 ${localstatedir}/volatile/run \
44 /mnt /media /media/card /media/cf /media/net /media/ram \ 46 /mnt /media /media/card /media/cf /media/net /media/ram \
45 /media/union /media/realroot /media/hdd \ 47 /media/union /media/realroot /media/hdd \
46 /media/mmc1" 48 /media/mmc1"
49volatiles = "cache run log lock tmp"
47conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ 50conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
48 ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ 51 ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
49 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ 52 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
@@ -68,6 +71,9 @@ do_install () {
68 for d in ${dirs2775}; do 71 for d in ${dirs2775}; do
69 install -m 2755 -d ${D}$d 72 install -m 2755 -d ${D}$d
70 done 73 done
74 for d in ${volatiles}; do
75 ln -sf volatile/$d ${D}/${localstatedir}/$d
76 done
71 for d in card cf net ram; do 77 for d in card cf net ram; do
72 ln -sf /media/$d ${D}/mnt/$d 78 ln -sf /media/$d ${D}/mnt/$d
73 done 79 done
@@ -120,7 +126,6 @@ do_install () {
120 126
121do_install_append_mnci () { 127do_install_append_mnci () {
122 rmdir ${D}/tmp 128 rmdir ${D}/tmp
123 mkdir -p ${D}${localstatedir}/tmp
124 ln -s var/tmp ${D}/tmp 129 ln -s var/tmp ${D}/tmp
125} 130}
126 131
@@ -149,10 +154,11 @@ FILES_${PN} = "/"
149FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" 154FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
150 155
151# M&N specific packaging 156# M&N specific packaging
152PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
153PACKAGE_ARCH_mnci = "mnci" 157PACKAGE_ARCH_mnci = "mnci"
154PACKAGE_ARCH_rt3000 = "rt3000" 158PACKAGE_ARCH_rt3000 = "rt3000"
155 159
160PACKAGE_ARCH = "${MACHINE_ARCH}"
161
156# Unslung distribution specific packaging 162# Unslung distribution specific packaging
157 163
158PACKAGES_unslung = "${PN}-unslung" 164PACKAGES_unslung = "${PN}-unslung"
diff --git a/meta/packages/initscripts/initscripts-1.0/volatiles b/meta/packages/initscripts/initscripts-1.0/volatiles
index 9fa7a46825..b2ae2794dc 100644
--- a/meta/packages/initscripts/initscripts-1.0/volatiles
+++ b/meta/packages/initscripts/initscripts-1.0/volatiles
@@ -21,19 +21,19 @@
21# This explains the order of "link before object" as in the example above, where 21# This explains the order of "link before object" as in the example above, where
22# a link will be created at /var/test pointing to /tmp/testfile and due to this 22# a link will be created at /var/test pointing to /tmp/testfile and due to this
23# link the file defined as /var/test will actually be created as /tmp/testfile. 23# link the file defined as /var/test will actually be created as /tmp/testfile.
24d root root 0775 /var none 24d root root 0755 /var/volatile/cache none
25d root root 0755 /var/backups none 25d root root 1777 /var/volatile/lock none
26d root root 0755 /var/cache none 26d root root 0755 /var/volatile/log none
27d root root 0755 /var/lib none 27d root root 0755 /var/volatile/run none
28d root root 0755 /var/lib/ipkg none 28d root root 1777 /var/volatile/tmp none
29d root root 0755 /var/lib/misc none 29l root root 0755 /var/cache /var/volatile/cache
30d root root 2775 /var/local none 30l root root 1777 /var/lock /var/volatile/lock
31d root root 1777 /var/lock none 31l root root 0755 /var/log /var/volatile/log
32l root root 0755 /var/run /var/volatile/run
33l root root 1777 /var/tmp /var/volatile/tmp
32d root root 0755 /var/lock/subsys none 34d root root 0755 /var/lock/subsys none
33d root root 0755 /var/log none
34d root root 0755 /var/run none
35d root root 0755 /var/spool none
36d root root 1777 /var/tmp none
37f root root 0664 /var/run/utmp none
38f root root 0664 /var/log/wtmp none 35f root root 0664 /var/log/wtmp none
39f root root 0664 /var/log/lastlog none 36f root root 0664 /var/run/utmp none
37l root root 0644 /etc/resolv.conf /var/run/resolv.conf
38f root root 0644 /var/run/resolv.conf none
39
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 55998c0a4a..242e85086e 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
4DEPENDS = "makedevs" 4DEPENDS = "makedevs"
5RDEPENDS = "makedevs" 5RDEPENDS = "makedevs"
6LICENSE = "GPL" 6LICENSE = "GPL"
7PR = "r105" 7PR = "r106"
8 8
9SRC_URI = "file://functions \ 9SRC_URI = "file://functions \
10 file://halt \ 10 file://halt \