diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-08-10 13:18:31 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-08-10 13:18:31 +0000 |
| commit | f07b378887fe386d5bea51c81ace10fe634683b6 (patch) | |
| tree | 00f9738a02117a8f2446d2f2a32cd8a61b64dd87 | |
| parent | 66c2473eb59231caaf456cf7a2192638c9e99360 (diff) | |
| parent | 0a118261ea36f7e09ef91507b9cbae52b9d8a804 (diff) | |
merge of '05d7857e561d553fa8a2cb0f4804ddb7ad439b27'
and '3a92f90a4b9cae5ae633ec1058381c9527912c9a'
50 files changed, 169 insertions, 154 deletions
diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab index ba53cd6fd4..8a2b07a089 100644 --- a/packages/base-files/base-files/akita/fstab +++ b/packages/base-files/base-files/akita/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab index 0285a1f7e7..45922b2a9c 100644 --- a/packages/base-files/base-files/amsdelta/fstab +++ b/packages/base-files/base-files/amsdelta/fstab @@ -1,6 +1,8 @@ /dev/mtdblock4 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 + # we use a non-volatile ramdisk, see /etc/init.d/ramdisk tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/armzone-qt2410/fstab b/packages/base-files/base-files/armzone-qt2410/fstab index 88d057c40d..9aedcbe0f0 100644 --- a/packages/base-files/base-files/armzone-qt2410/fstab +++ b/packages/base-files/base-files/armzone-qt2410/fstab @@ -8,6 +8,7 @@ proc /proc proc defaults 0 0 # Temporary tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab index 03945ca81b..c3de8d28dc 100644 --- a/packages/base-files/base-files/c7x0/fstab +++ b/packages/base-files/base-files/c7x0/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab index cbb38d1831..a3a9ea2df1 100644 --- a/packages/base-files/base-files/collie/fstab +++ b/packages/base-files/base-files/collie/fstab @@ -3,6 +3,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/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk #tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/efika/fstab b/packages/base-files/base-files/efika/fstab index 8c79a60df9..c7bf023f22 100644 --- a/packages/base-files/base-files/efika/fstab +++ b/packages/base-files/base-files/efika/fstab @@ -2,4 +2,5 @@ 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 auto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/ep93xx/fstab b/packages/base-files/base-files/ep93xx/fstab index 8c79a60df9..c7bf023f22 100644 --- a/packages/base-files/base-files/ep93xx/fstab +++ b/packages/base-files/base-files/ep93xx/fstab @@ -2,4 +2,5 @@ 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 auto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/epia/fstab b/packages/base-files/base-files/epia/fstab index 83d673c8b5..5ec79ba17a 100644 --- a/packages/base-files/base-files/epia/fstab +++ b/packages/base-files/base-files/epia/fstab @@ -1,4 +1,5 @@ /dev/ram0 / ext2 rw 1 1 tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /tmp tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab index 2f4a38e703..d2976a4205 100644 --- a/packages/base-files/base-files/fic-gta01/fstab +++ b/packages/base-files/base-files/fic-gta01/fstab @@ -8,6 +8,7 @@ proc /proc proc defaults 0 0 # Temporary tmpfs /tmp tmpfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 # microSD slot diff --git a/packages/base-files/base-files/fic-gta02/.mtn2git_empty b/packages/base-files/base-files/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/fic-gta02/.mtn2git_empty diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab new file mode 100644 index 0000000000..d2976a4205 --- /dev/null +++ b/packages/base-files/base-files/fic-gta02/fstab @@ -0,0 +1,18 @@ +# Root and Pseudo +/dev/mtdblock4 / jffs2 rw,noatime 1 1 +proc /proc proc defaults 0 0 + +# devpts? +# usb? + +# Temporary +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /media/ram tmpfs defaults 0 0 + +# microSD slot +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + +# USB Storage +/dev/sda1 /media/hdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab index 0720daf432..628a9e9876 100644 --- a/packages/base-files/base-files/fstab +++ b/packages/base-files/base-files/fstab @@ -5,6 +5,7 @@ proc /proc proc 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 # uncomment this if your device has a SD/MMC/Transflash slot diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab index 6b008b3834..8243195d99 100644 --- a/packages/base-files/base-files/h2200/fstab +++ b/packages/base-files/base-files/h2200/fstab @@ -2,5 +2,6 @@ proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab index d300b02566..92293a59af 100644 --- a/packages/base-files/base-files/h3600/fstab +++ b/packages/base-files/base-files/h3600/fstab @@ -3,4 +3,5 @@ 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/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab index afa028bf90..2a106ef945 100644 --- a/packages/base-files/base-files/h3900/fstab +++ b/packages/base-files/base-files/h3900/fstab @@ -5,4 +5,5 @@ 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/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab index 4ae3ad1344..4d3c38eca8 100644 --- a/packages/base-files/base-files/h5000/fstab +++ b/packages/base-files/base-files/h5000/fstab @@ -5,4 +5,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab index f2eeb25b36..f9b94d1960 100644 --- a/packages/base-files/base-files/h6300/fstab +++ b/packages/base-files/base-files/h6300/fstab @@ -2,6 +2,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 #The devpts file system provides an interface to pseudo terminal (pty) devices. devpts /dev/pts devpts mode=0620,gid=5 0 0 #Mount first partition from the mmc card. diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab index 1ec129e366..b4aa259c4e 100644 --- a/packages/base-files/base-files/htcuniversal/fstab +++ b/packages/base-files/base-files/htcuniversal/fstab @@ -4,6 +4,7 @@ devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 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/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab index 1c90d577ac..04ac4849fd 100644 --- a/packages/base-files/base-files/hx4700/fstab +++ b/packages/base-files/base-files/hx4700/fstab @@ -6,4 +6,5 @@ sys /sys sysfs defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab index 65db0c94a3..d8258a0c05 100644 --- a/packages/base-files/base-files/jornada56x/fstab +++ b/packages/base-files/base-files/jornada56x/fstab @@ -3,4 +3,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0
\ No newline at end of file +tmpfs /dev/shm tmpfs mode=0777 0 0 +devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab index 22a3d30e71..f0c23d936c 100644 --- a/packages/base-files/base-files/jornada6xx/fstab +++ b/packages/base-files/base-files/jornada6xx/fstab @@ -4,4 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda3 none swap sw 0 0 tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab index 22a3d30e71..f0c23d936c 100644 --- a/packages/base-files/base-files/jornada7xx/fstab +++ b/packages/base-files/base-files/jornada7xx/fstab @@ -4,4 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda3 none swap sw 0 0 tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/mtx-1/fstab b/packages/base-files/base-files/mtx-1/fstab index 06ba41dbb8..5c0e2b39d5 100644 --- a/packages/base-files/base-files/mtx-1/fstab +++ b/packages/base-files/base-files/mtx-1/fstab @@ -5,4 +5,5 @@ rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/mtx-2/fstab b/packages/base-files/base-files/mtx-2/fstab index a8f96f81b0..8b9ad0f308 100644 --- a/packages/base-files/base-files/mtx-2/fstab +++ b/packages/base-files/base-files/mtx-2/fstab @@ -5,4 +5,5 @@ rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab index 8c79a60df9..c7bf023f22 100644 --- a/packages/base-files/base-files/netbook-pro/fstab +++ b/packages/base-files/base-files/netbook-pro/fstab @@ -2,4 +2,5 @@ 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 auto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/netvista/fstab b/packages/base-files/base-files/netvista/fstab index f26a57d2cd..351041d66e 100644 --- a/packages/base-files/base-files/netvista/fstab +++ b/packages/base-files/base-files/netvista/fstab @@ -2,4 +2,5 @@ tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 devfs /dev/devfs devfs defaults 0 0 diff --git a/packages/base-files/base-files/nokia770/fstab b/packages/base-files/base-files/nokia770/fstab index c68c4d4b43..c09a851566 100644 --- a/packages/base-files/base-files/nokia770/fstab +++ b/packages/base-files/base-files/nokia770/fstab @@ -2,5 +2,6 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 proc /proc proc defaults 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/omap5912osk/fstab b/packages/base-files/base-files/omap5912osk/fstab index 988cf717b0..687fd00227 100644 --- a/packages/base-files/base-files/omap5912osk/fstab +++ b/packages/base-files/base-files/omap5912osk/fstab @@ -4,6 +4,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sysfs /sysfs sysfs defaults 0 0 tmpfs /dev tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/openmn/fstab b/packages/base-files/base-files/openmn/fstab index c3629a4887..06589b01dc 100644 --- a/packages/base-files/base-files/openmn/fstab +++ b/packages/base-files/base-files/openmn/fstab @@ -1,4 +1,5 @@ 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 diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 81de333ba7..9f87b91155 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/packages/base-files/base-files/poodle/fstab @@ -9,5 +9,6 @@ proc /proc proc defaults 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 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 c9f82ca2e8..3e57ae3534 100644 --- a/packages/base-files/base-files/simpad/fstab +++ b/packages/base-files/base-files/simpad/fstab @@ -1,6 +1,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/slugos/fstab b/packages/base-files/base-files/slugos/fstab index 3f35e7a3a7..d30f958401 100644 --- a/packages/base-files/base-files/slugos/fstab +++ b/packages/base-files/base-files/slugos/fstab @@ -2,4 +2,5 @@ rootfs / jffs2 defaults 1 1 proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index 8e667b63a5..f266212135 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -6,6 +6,8 @@ proc /proc proc defaults 0 0 # we can use a normal var filesystem with a microdrive # tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 + # Compact Flash memory cards /dev/hdc1 /media/cf auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index b439abeb2c..8607c79be8 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/packages/base-files/base-files/tosa/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbfs /proc/bus/usb usbfs auto 0 0 diff --git a/packages/base-files/base-files/wrt54/fstab b/packages/base-files/base-files/wrt54/fstab index 3dce9b3ed1..0e64d3015e 100644 --- a/packages/base-files/base-files/wrt54/fstab +++ b/packages/base-files/base-files/wrt54/fstab @@ -3,5 +3,6 @@ # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=50% 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 diff --git a/packages/base-files/base-files/xxs1500/fstab b/packages/base-files/base-files/xxs1500/fstab index d4e2eff592..655ea977b9 100644 --- a/packages/base-files/base-files/xxs1500/fstab +++ b/packages/base-files/base-files/xxs1500/fstab @@ -5,4 +5,5 @@ rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index d8335f7abb..ac12f5e08a 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 = "r69" +PR = "r71" LICENSE = "GPL" SRC_URI = " \ @@ -24,6 +24,8 @@ SRC_URI = " \ file://licenses/Artistic " S = "${WORKDIR}" +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + docdir_append = "/${P}" dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp" dirs2775 = "/home ${prefix}/src ${localstatedir}/local" diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.13.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb index ea5bbe6c2f..8900bda6bf 100644 --- a/packages/bluez/bluez-gnome_cvs.bb +++ b/packages/bluez/bluez-gnome_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+" SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome \ " -PV = "0.10+cvs${SRCDATE}" +PV = "0.13+cvs${SRCDATE}" S = "${WORKDIR}/gnome" inherit autotools pkgconfig gconf diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb deleted file mode 100644 index 8d3eaa183a..0000000000 --- a/packages/musicpd/mpc_0.11.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" -HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -SECTION = "console/multimedia" -LICENSE = "GPLv2" -PR = "r1" - -SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" -EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ - --with-iconv-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.1.bb index ccd6926fcd..ccd6926fcd 100644 --- a/packages/musicpd/mpc_0.12.0.bb +++ b/packages/musicpd/mpc_0.12.1.bb diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb deleted file mode 100644 index 9d3c5f90b0..0000000000 --- a/packages/musicpd/mpd_0.11.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Music Player Daemon (mpd)" -HOMEPAGE = "http://www.musicpd.org" -SECTION = "console/multimedia" -LICENSE = "GPLv2" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz" - -inherit autotools - -# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to -# be built, instead we use the OE built versions which should be installed -# in staging - remove the --with and replace with --enable to use the local -# versions. - -EXTRA_OECONF = "--enable-ogg \ - --with-id3tag-libraries=${STAGING_LIBDIR} \ - --with-id3tag-includes=${STAGING_INCDIR} \ - --with-mad-libraries=${STAGING_LIBDIR} \ - --with-mad-includes=${STAGING_INCDIR} \ - --without-faad" diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb deleted file mode 100644 index 7a1d17ef5d..0000000000 --- a/packages/musicpd/mpd_0.11.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Music Player Daemon (mpd)" -HOMEPAGE = "http://www.musicpd.org" -SECTION = "console/multimedia" -LICENSE = "GPLv2" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2" -PR = "r8" - -SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ - file://save-volume-state.patch;patch=1" - -inherit autotools - -# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to -# be built, instead we use the OE built versions which should be installed -# in staging - remove the --with and replace with --enable to use the local -# versions. - -EXTRA_OECONF = "--enable-ogg \ - --with-iconv-libraries=${STAGING_LIBDIR} \ - --with-iconv-includes=${STAGING_INCDIR} \ - --with-vorbis-libraries=${STAGING_LIBDIR} \ - --with-vorbis-includes=${STAGING_INCDIR} \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --with-ao-libraries=${STAGING_LIBDIR} \ - --with-ao-includes=${STAGING_INCDIR} \ - --with-id3tag-libraries=${STAGING_LIBDIR} \ - --with-id3tag-includes=${STAGING_INCDIR} \ - --with-mad-libraries=${STAGING_LIBDIR} \ - --with-mad-includes=${STAGING_INCDIR} \ - --with-faad-libraries=${STAGING_LIBDIR} \ - --with-faad-includes=${STAGING_INCDIR}" diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index 04ddf8fdc3..673ff03b98 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -3,23 +3,24 @@ HOMEPAGE = "http://www.musicpd.org" SECTION = "console/multimedia" LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" -SRCDATE = "20070120" PV = "0.12.1+svn${SRCDATE}" -PR = "r2" +PR = "r0" SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ - file://fix-mod-support.patch;patch=1;maxdate=20070302" + file://mpd/mpd.init" # file://save-volume-state.patch;patch=1" S = "${WORKDIR}/trunk" -inherit autotools +inherit autotools update-rc.d +INITSCRIPT_NAME = "mpd" # Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to # be built, instead we use the OE built versions which should be installed # in staging - remove the --with and replace with --enable to use the local # versions. -EXTRA_OECONF = "--enable-ogg \ +EXTRA_OECONF = "\ + --enable-ogg \ --with-id3tag-libraries=${STAGING_LIBDIR} \ --with-id3tag-includes=${STAGING_INCDIR} \ --with-mad-libraries=${STAGING_LIBDIR} \ diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb index 11738f76f1..f54a23de18 100644 --- a/packages/openmoko2/openmoko-common2_svn.bb +++ b/packages/openmoko2/openmoko-common2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Common files for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.0+svn${SRCDATE}" -PR = "r1" +PR = "r3" inherit openmoko2 @@ -12,10 +12,11 @@ dirs = "pixmaps" do_install() { find ${WORKDIR} -name ".svn" | xargs rm -rf - install -d ${D}${datadir}/openmoko/ + install -d ${D}${datadir} for i in ${dirs}; do - cp -fpPR ${S}/$i ${D}${datadir}/openmoko/ + cp -fpPR ${S}/$i ${D}${datadir} done } +PACKAGE_ARCH = "all" FILES_${PN} = "${datadir}" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 418993f079..046f59b3d9 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Custom MB session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" -RDEPENDS+= "openmoko-common2 openmoko-today2 openmoko-dialer2" +RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS = "openmoko-session" -PR = "r28" +PR = "r29" SRC_URI = "file://etc" S = ${WORKDIR} @@ -29,3 +29,5 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2 } + +PACKAGE_ARCH = "all" diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index 6594fcfbb6..f765bec1a1 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -27,6 +27,11 @@ PARALLEL_MAKE = "" export TARGET_PFPU = "${TARGET_FPU}" +# TODO: Use more fine granular version +#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:" +OE_LT_RPATH_ALLOW = "any" +OE_LT_RPATH_ALLOW[export]="1" + do_stage() { autotools_stage_all } @@ -77,7 +82,7 @@ pkg_postinst_${PN}-server() { fi grep -q pulse: /etc/group || addgroup pulse grep -q pulse: /etc/passwd || \ - adduser --disabled-password --home=/var/run/pulse/ --system \ + adduser --disabled-password --home=/var/run/pulse --system \ --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse /etc/init.d/populate-volatile.sh update } diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb index bc2bc4d061..a93c8ee251 100644 --- a/packages/pulseaudio/pulseaudio_0.9.6.bb +++ b/packages/pulseaudio/pulseaudio_0.9.6.bb @@ -1,4 +1,4 @@ require pulse.inc -PR = "r4" +PR = "r5" diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver index e59460f3b0..709d501dfc 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -15,12 +15,12 @@ fi if [ -f /usr/bin/Xomap ]; then XSERVER=/usr/bin/Xomap fi -if [ -f /usr/bin/Xw100 ]; then - XSERVER=Xw100 -fi -if [ -f /usr/bin/Ximageon ]; then - XSERVER=Ximageon -fi +if [ -f /usr/bin/Xw100 ]; then + XSERVER=Xw100 +fi +if [ -f /usr/bin/Ximageon ]; then + XSERVER=Ximageon +fi . /etc/profile @@ -32,7 +32,7 @@ fallback_screen_arg() { h=`echo $geom | awk '{ print $3 }'` b=`echo $geom | awk '{ print $6 }'` echo -n "${w}x${h}x${b}" -} +} module_id() { ## used to read from assets, but sometimes assets is corrupted @@ -59,35 +59,37 @@ fi # start off server in conventional location. case `module_id` in - "HP iPAQ H3100" | "HP iPAQ H3800") - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;; - "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") - ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@270" ;; - "HP iPAQ H5400" | "HP iPAQ H2200") - ARGS="$ARGS -dpi 100 -rgba rgb" ;; - "HP iPAQ HX4700") - ARGS="$ARGS -dpi 200" ;; - "Ramses") - # What is this "vt2" in aid of? - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; - # both 'Sharp-Collie' and just 'Collie' have been reported - *Poodle) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; - *Collie) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" - ;; - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -dpi 200 -rgba rgb" ;; - "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") - ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;; - "Simpad") - ARGS="$ARGS -dpi 100 -rgba rgb" ;; - "Generic OMAP1510/1610/1710") - ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;; - "Cellon C8000 Board") - ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;; - "HTC Universal") - ARGS="$ARGS -dpi 225 -screen 480x640@270" ;; + "HP iPAQ H3100" | "HP iPAQ H3800") + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;; + "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") + ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@270" ;; + "HP iPAQ H5400" | "HP iPAQ H2200") + ARGS="$ARGS -dpi 100 -rgba rgb" ;; + "HP iPAQ HX4700") + ARGS="$ARGS -dpi 200" ;; + "Ramses") + # What is this "vt2" in aid of? + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; + # both 'Sharp-Collie' and just 'Collie' have been reported + *Poodle) + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; + *Collie) + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" + ;; + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + ARGS="$ARGS -dpi 200 -rgba rgb" ;; + "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") + ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;; + "Simpad") + ARGS="$ARGS -dpi 100 -rgba rgb" ;; + "Generic OMAP1510/1610/1710") + ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;; + "Cellon C8000 Board") + ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;; + "HTC Magician") + ARGS="$ARGS -dpi 142" ;; + "HTC Universal") + ARGS="$ARGS -dpi 225 -screen 480x640@270" ;; "ARM-IntegratorCP" | "ARM-Versatile PB") ARGS="$ARGS -rgba vrgb" ;; "Compulab CM-x270") @@ -101,7 +103,7 @@ case `module_id` in *) # Its a device we dont know about - in which case force # kdrive to use the current framebuffer geometry otherwise - # it will defualt to trying to achieve 1024x768 + # it will defualt to trying to achieve 1024x768 S=`fallback_screen_arg` ARGS="$ARGS -screen $S" ;; diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver index efed60b2ad..dddced4b6f 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver @@ -15,12 +15,12 @@ fi if [ -f /usr/bin/Xomap ]; then XSERVER=/usr/bin/Xomap fi -if [ -f /usr/bin/Xw100 ]; then - XSERVER=Xw100 -fi -if [ -f /usr/bin/Ximageon ]; then - XSERVER=Ximageon -fi +if [ -f /usr/bin/Xw100 ]; then + XSERVER=Xw100 +fi +if [ -f /usr/bin/Ximageon ]; then + XSERVER=Ximageon +fi . /etc/profile @@ -32,7 +32,7 @@ fallback_screen_arg() { h=`echo $geom | awk '{ print $3 }'` b=`echo $geom | awk '{ print $6 }'` echo -n "${w}x${h}x${b}" -} +} module_id() { ## used to read from assets, but sometimes assets is corrupted @@ -59,35 +59,37 @@ fi # start off server in conventional location. case `module_id` in - "HP iPAQ H3100" | "HP iPAQ H3800") - ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90" ;; - "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") - ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@270" ;; - "HP iPAQ H5400" | "HP iPAQ H2200") - ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; - "HP iPAQ HX4700") - ARGS="$ARGS -br -dpi 200" ;; - "Ramses") - # What is this "vt2" in aid of? - ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; - # both 'Sharp-Collie' and just 'Collie' have been reported - *Poodle) - ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; - *Collie) - ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" - ;; - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -br -dpi 200 -rgba rgb" ;; - "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") - ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;; - "Simpad") - ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; - "Generic OMAP1510/1610/1710") - ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;; - "Cellon C8000 Board") - ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;; - "HTC Universal") - ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;; + "HP iPAQ H3100" | "HP iPAQ H3800") + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90" ;; + "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") + ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@270" ;; + "HP iPAQ H5400" | "HP iPAQ H2200") + ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; + "HP iPAQ HX4700") + ARGS="$ARGS -br -dpi 200" ;; + "Ramses") + # What is this "vt2" in aid of? + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; + # both 'Sharp-Collie' and just 'Collie' have been reported + *Poodle) + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; + *Collie) + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" + ;; + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + ARGS="$ARGS -br -dpi 200 -rgba rgb" ;; + "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") + ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;; + "Simpad") + ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; + "Generic OMAP1510/1610/1710") + ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;; + "Cellon C8000 Board") + ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;; + "HTC Magician") + ARGS="$ARGS -br -dpi 142" ;; + "HTC Universal") + ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;; "ARM-IntegratorCP" | "ARM-Versatile PB") ARGS="$ARGS -br -rgba vrgb" ;; "Compulab CM-x270") @@ -101,7 +103,7 @@ case `module_id` in *) # Its a device we dont know about - in which case force # kdrive to use the current framebuffer geometry otherwise - # it will defualt to trying to achieve 1024x768 + # it will defualt to trying to achieve 1024x768 S=`fallback_screen_arg` ARGS="$ARGS -screen $S" ;; |