From c1de33c618fb13452e40073d97f66b0c089315c3 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Mon, 14 May 2007 12:16:07 +0000 Subject: basefiles, initscripts: make /var non-volatile, as discussed on the mailinglist --- packages/base-files/base-files/akita/fstab | 2 +- packages/base-files/base-files/amsdelta/fstab | 2 +- .../base-files/base-files/armzone-qt2410/fstab | 2 +- packages/base-files/base-files/c7x0/fstab | 2 +- packages/base-files/base-files/collie/fstab | 2 +- packages/base-files/base-files/efika/fstab | 2 +- packages/base-files/base-files/ep93xx/fstab | 2 +- packages/base-files/base-files/epia/fstab | 2 +- packages/base-files/base-files/fic-gta01/fstab | 2 +- packages/base-files/base-files/fstab | 2 +- packages/base-files/base-files/h2200/fstab | 2 +- packages/base-files/base-files/h3600/fstab | 2 +- packages/base-files/base-files/h3900/fstab | 2 +- packages/base-files/base-files/h5000/fstab | 2 +- packages/base-files/base-files/h6300/fstab | 2 +- packages/base-files/base-files/htcuniversal/fstab | 2 +- packages/base-files/base-files/hx4700/fstab | 2 +- packages/base-files/base-files/jornada56x/fstab | 2 +- packages/base-files/base-files/jornada6xx/fstab | 4 ++-- packages/base-files/base-files/jornada7xx/fstab | 4 ++-- packages/base-files/base-files/mtx-1/fstab | 2 +- packages/base-files/base-files/mtx-2/fstab | 2 +- packages/base-files/base-files/netbook-pro/fstab | 2 +- packages/base-files/base-files/netvista/fstab | 2 +- packages/base-files/base-files/nokia770/fstab | 2 +- packages/base-files/base-files/omap5912osk/fstab | 2 +- packages/base-files/base-files/openmn/fstab | 2 +- packages/base-files/base-files/poodle/fstab | 2 +- packages/base-files/base-files/simpad/fstab | 2 +- packages/base-files/base-files/slugos/fstab | 2 +- packages/base-files/base-files/spitz/fstab | 2 +- packages/base-files/base-files/tosa/fstab | 2 +- packages/base-files/base-files/wrt54/fstab | 2 +- packages/base-files/base-files/xxs1500/fstab | 2 +- packages/base-files/base-files_3.0.14.bb | 19 ++++++++++------- packages/initscripts/initscripts-1.0/volatiles | 24 ++++++++++------------ packages/initscripts/initscripts_1.0.bb | 2 +- 37 files changed, 60 insertions(+), 57 deletions(-) diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab index 0b64a3bc80..ba53cd6fd4 100644 --- a/packages/base-files/base-files/akita/fstab +++ b/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 mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab index bf87f5f11b..0285a1f7e7 100644 --- a/packages/base-files/base-files/amsdelta/fstab +++ b/packages/base-files/base-files/amsdelta/fstab @@ -1,6 +1,6 @@ /dev/mtdblock4 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 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 d339f800d3..88d057c40d 100644 --- a/packages/base-files/base-files/armzone-qt2410/fstab +++ b/packages/base-files/base-files/armzone-qt2410/fstab @@ -6,7 +6,7 @@ proc /proc proc defaults 0 0 # usb? # Temporary -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab index fb37e07aec..03945ca81b 100644 --- a/packages/base-files/base-files/c7x0/fstab +++ b/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 mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab index ce5bc3bac5..cbb38d1831 100644 --- a/packages/base-files/base-files/collie/fstab +++ b/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 mode=0755 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 ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/efika/fstab +++ b/packages/base-files/base-files/efika/fstab @@ -2,4 +2,4 @@ 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 /var tmpfs defaults 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 ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/ep93xx/fstab +++ b/packages/base-files/base-files/ep93xx/fstab @@ -2,4 +2,4 @@ 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 /var tmpfs defaults 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 70f0b07353..83d673c8b5 100644 --- a/packages/base-files/base-files/epia/fstab +++ b/packages/base-files/base-files/epia/fstab @@ -1,4 +1,4 @@ /dev/ram0 / ext2 rw 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 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 392422ea6f..2f4a38e703 100644 --- a/packages/base-files/base-files/fic-gta01/fstab +++ b/packages/base-files/base-files/fic-gta01/fstab @@ -7,7 +7,7 @@ proc /proc proc defaults 0 0 # Temporary tmpfs /tmp tmpfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # microSD slot diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab index 00d0072a41..0720daf432 100644 --- a/packages/base-files/base-files/fstab +++ b/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 usbfs /proc/bus/usb usbfs defaults 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/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab index 397da6c123..6b008b3834 100644 --- a/packages/base-files/base-files/h2200/fstab +++ b/packages/base-files/base-files/h2200/fstab @@ -1,6 +1,6 @@ /dev/mtdblock3 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 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 4228c15c00..d300b02566 100644 --- a/packages/base-files/base-files/h3600/fstab +++ b/packages/base-files/base-files/h3600/fstab @@ -2,5 +2,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 tmpfs defaults 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/h3900/fstab b/packages/base-files/base-files/h3900/fstab index 2a3929fd17..afa028bf90 100644 --- a/packages/base-files/base-files/h3900/fstab +++ b/packages/base-files/base-files/h3900/fstab @@ -4,5 +4,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 tmpfs defaults 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/h5000/fstab b/packages/base-files/base-files/h5000/fstab index 63711f989e..4ae3ad1344 100644 --- a/packages/base-files/base-files/h5000/fstab +++ b/packages/base-files/base-files/h5000/fstab @@ -4,5 +4,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 tmpfs defaults 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/h6300/fstab b/packages/base-files/base-files/h6300/fstab index 6884b4cc6d..f2eeb25b36 100644 --- a/packages/base-files/base-files/h6300/fstab +++ b/packages/base-files/base-files/h6300/fstab @@ -1,7 +1,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 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 21b2bb1360..1ec129e366 100644 --- a/packages/base-files/base-files/htcuniversal/fstab +++ b/packages/base-files/base-files/htcuniversal/fstab @@ -2,7 +2,7 @@ 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 defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 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/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab index 3dfde917e6..1c90d577ac 100644 --- a/packages/base-files/base-files/hx4700/fstab +++ b/packages/base-files/base-files/hx4700/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 mode=0755 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 07ccff0fe6..65db0c94a3 100644 --- a/packages/base-files/base-files/jornada56x/fstab +++ b/packages/base-files/base-files/jornada56x/fstab @@ -1,6 +1,6 @@ /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 /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 diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab index 504a1a2f4e..22a3d30e71 100644 --- a/packages/base-files/base-files/jornada6xx/fstab +++ b/packages/base-files/base-files/jornada6xx/fstab @@ -2,6 +2,6 @@ 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 /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0 \ No newline at end of file +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 504a1a2f4e..22a3d30e71 100644 --- a/packages/base-files/base-files/jornada7xx/fstab +++ b/packages/base-files/base-files/jornada7xx/fstab @@ -2,6 +2,6 @@ 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 /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0 \ No newline at end of file +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 ffab21cf68..06ba41dbb8 100644 --- a/packages/base-files/base-files/mtx-1/fstab +++ b/packages/base-files/base-files/mtx-1/fstab @@ -2,7 +2,7 @@ # # rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +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 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 f6f23ac2aa..a8f96f81b0 100644 --- a/packages/base-files/base-files/mtx-2/fstab +++ b/packages/base-files/base-files/mtx-2/fstab @@ -2,7 +2,7 @@ # # rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +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 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 ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/netbook-pro/fstab +++ b/packages/base-files/base-files/netbook-pro/fstab @@ -2,4 +2,4 @@ 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 /var tmpfs defaults 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 e235acaa27..f26a57d2cd 100644 --- a/packages/base-files/base-files/netvista/fstab +++ b/packages/base-files/base-files/netvista/fstab @@ -1,5 +1,5 @@ /dev/hdc2 / ext2 rw,noatime 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 tmpfs /tmp tmpfs defaults 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 40823df5fa..c68c4d4b43 100644 --- a/packages/base-files/base-files/nokia770/fstab +++ b/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 mode=0755 0 0 tmpfs /media/ram tmpfs defaults 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 77331c0dac..988cf717b0 100644 --- a/packages/base-files/base-files/omap5912osk/fstab +++ b/packages/base-files/base-files/omap5912osk/fstab @@ -4,6 +4,6 @@ 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 /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 a2e78a2011..c3629a4887 100644 --- a/packages/base-files/base-files/openmn/fstab +++ b/packages/base-files/base-files/openmn/fstab @@ -2,5 +2,5 @@ devfs /dev devfs defaults 0 0 proc /proc proc defaults 0 0 none /sys sysfs defaults 0 0 rootfs / rootfs rw 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /tmp tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 06b9672504..81de333ba7 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/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 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 51aaaf9256..c9f82ca2e8 100644 --- a/packages/base-files/base-files/simpad/fstab +++ b/packages/base-files/base-files/simpad/fstab @@ -2,7 +2,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 mode=0755 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/packages/base-files/base-files/slugos/fstab b/packages/base-files/base-files/slugos/fstab index 0ac6b1460c..3f35e7a3a7 100644 --- a/packages/base-files/base-files/slugos/fstab +++ b/packages/base-files/base-files/slugos/fstab @@ -1,5 +1,5 @@ rootfs / jffs2 defaults 1 1 proc /proc proc defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 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 a1fb3d4da1..8e667b63a5 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -4,7 +4,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 # we can use a normal var filesystem with a microdrive -# tmpfs /var tmpfs defaults 0 0 +# tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 # Compact Flash memory cards diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index 4a784180ca..b439abeb2c 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/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 mode=0755 0 0 tmpfs /media/ram tmpfs defaults 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 c1e52f8927..3dce9b3ed1 100644 --- a/packages/base-files/base-files/wrt54/fstab +++ b/packages/base-files/base-files/wrt54/fstab @@ -2,6 +2,6 @@ # # rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=50% 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=50% 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 7007ab021b..d4e2eff592 100644 --- a/packages/base-files/base-files/xxs1500/fstab +++ b/packages/base-files/base-files/xxs1500/fstab @@ -2,7 +2,7 @@ # # rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +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 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 1e80f4c7f3..37068780fd 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 = "r65" +PR = "r66" LICENSE = "GPL" SRC_URI = " \ @@ -25,7 +25,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 \ @@ -33,13 +33,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" +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 \ @@ -64,6 +67,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 @@ -111,7 +117,6 @@ do_install () { do_install_append_mnci () { rmdir ${D}/tmp - mkdir -p ${D}${localstatedir}/tmp ln -s var/tmp ${D}/tmp } diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index 4320485663..3c680b2643 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -21,18 +21,16 @@ # 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/run/utmp none diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 21e3bb2afe..d814e937db 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r90" +PR = "r91" SRC_URI = "file://halt \ file://ramdisk \ -- cgit v1.2.3 From 0c6b5ebaa68722f6570de910369309aa0c88c823 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 14:52:53 +0000 Subject: bluez-utils 3.10.1: configure and package according to upstream guidelines * still DEFAULT_PREFERENCE = -1 --- packages/bluez/bluez-utils_3.10.1.bb | 107 +++++++++++++++++++++++++++++++++++ packages/bluez/bluez-utils_3.10.bb | 10 ---- 2 files changed, 107 insertions(+), 10 deletions(-) create mode 100644 packages/bluez/bluez-utils_3.10.1.bb delete mode 100644 packages/bluez/bluez-utils_3.10.bb diff --git a/packages/bluez/bluez-utils_3.10.1.bb b/packages/bluez/bluez-utils_3.10.1.bb new file mode 100644 index 0000000000..4cf72631bf --- /dev/null +++ b/packages/bluez/bluez-utils_3.10.1.bb @@ -0,0 +1,107 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + " +PR = "r1" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-bcm203x \ + --disable-hid2hci \ + --disable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the +SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat bluez-cups-backend" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + " + +FILES_${PN}-compat = " \ + ${bindir}/sdptool \ + ${bindir}/dund \ + ${bindir}/rctest \ + ${bindir}/ciptool \ + ${bindir}/l2test \ + ${bindir}/rfcomm \ + ${bindir}/hcitool \ + ${bindir}/pand \ + ${bindir}/hidd \ + ${bindir}/l2ping \ + ${bindir}/hciconfig \ + ${bindir}/bccmd \ + ${bindir}/hciattach \ + ${bindir}/hciemu \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + diff --git a/packages/bluez/bluez-utils_3.10.bb b/packages/bluez/bluez-utils_3.10.bb deleted file mode 100644 index fd7cb235f9..0000000000 --- a/packages/bluez/bluez-utils_3.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -require bluez-utils.inc - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://02dtl1_cs.sh \ - " - -PR = "r0" -- cgit v1.2.3 From fa95eff78942ca4b28e62fe5f42739586cf7fa9b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 15:15:13 +0000 Subject: task-openmoko: remove unused lmsensors --- packages/tasks/task-openmoko.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 51ccf96bb7..d2d501c4f5 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -199,7 +199,7 @@ RDEPENDS_task-openmoko-debug = "\ usbutils \ uucp \ cu \ - sensors-i2cdetect sensors-i2cdump sensors-i2cset \ +# sensors-i2cdetect sensors-i2cdump sensors-i2cset \ xev \ " -- cgit v1.2.3 From 0992dcd0f125e74ee158b81cb219d12e7e3f86ed Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 16:10:34 +0000 Subject: gdb: only RRECOMMEND glibc stuff when building for glibc, the check isn't optimal --- packages/gdb/gdb_6.6.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb index 1bfe3dfecf..7be444012d 100644 --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@ -4,12 +4,13 @@ LICENSE="GPL" SECTION = "devel" PRIORITY = "optional" DEPENDS = "ncurses readline" -PR = "r0" +PR = "r1" PACKAGES =+ 'gdbserver ' FILES_gdbserver = '${bindir}/gdbserver' -RRECOMMENDS_gdb = "glibc-thread-db" +#only append it for glib, not for uclibcc +RRECOMMENDS_gdb_append_linux = " glibc-thread-db " inherit autotools gettext -- cgit v1.2.3 From 6580c8ec2b8563d851906e45cdd519f48acfd59d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 16:19:08 +0000 Subject: bluez-utils 3.10.1: move hciattach to main package till hcid can handle that functionality --- packages/bluez/bluez-utils_3.10.1.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/bluez/bluez-utils_3.10.1.bb b/packages/bluez/bluez-utils_3.10.1.bb index 4cf72631bf..42f62f2cc9 100644 --- a/packages/bluez/bluez-utils_3.10.1.bb +++ b/packages/bluez/bluez-utils_3.10.1.bb @@ -8,7 +8,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ file://02dtl1_cs.sh \ " -PR = "r1" +PR = "r2" EXTRA_OECONF = " \ --enable-bccmd \ @@ -25,6 +25,8 @@ EXTRA_OECONF = " \ --enable-echo \ --enable-configfile \ --enable-initscripts \ + --enable-test \ + " # The config options are explained below: @@ -81,6 +83,7 @@ FILES_${PN} = " \ ${sysconfdir}/bluetooth/hcid.conf \ ${sysconfdir}/default \ ${sysconfdir}/dbus-1 \ + ${bindir}/hciattach \ " FILES_${PN}-compat = " \ @@ -96,7 +99,6 @@ FILES_${PN}-compat = " \ ${bindir}/l2ping \ ${bindir}/hciconfig \ ${bindir}/bccmd \ - ${bindir}/hciattach \ ${bindir}/hciemu \ ${sysconfdir}/bluetooth/rfcomm.conf \ " -- cgit v1.2.3 From 11ce042f0e1226016aa746e0e8beda896e4155d9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 16:35:39 +0000 Subject: bluez 3.10.1: ~lart linebreaks --- packages/bluez/bluez-utils_3.10.1.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/bluez/bluez-utils_3.10.1.bb b/packages/bluez/bluez-utils_3.10.1.bb index 42f62f2cc9..59dde38571 100644 --- a/packages/bluez/bluez-utils_3.10.1.bb +++ b/packages/bluez/bluez-utils_3.10.1.bb @@ -39,8 +39,7 @@ EXTRA_OECONF = " \ # --enable-dfutool install DFU firmware upgrade utility # --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the -SDP server +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server #Following services can be enabled so far: # --enable-network -- cgit v1.2.3 From b6b08780f028f66c1ac41b16451a5480a0fb32c1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 16:39:39 +0000 Subject: angstrom-uclibc: turn on NLS for glibc --- conf/distro/include/angstrom-uclibc.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 9c3274e58f..febfea2e26 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -5,6 +5,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -- cgit v1.2.3 From cec14859bf57043d16896e07b08a7a88a5919542 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 17:32:07 +0000 Subject: gettext: fix building against uclibc --- .../gettext-0.14.1/gettext-error_print_progname.patch | 12 ++++++++++++ packages/gettext/gettext_0.14.1.bb | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch diff --git a/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch b/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch new file mode 100644 index 0000000000..615a53edd5 --- /dev/null +++ b/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch @@ -0,0 +1,12 @@ +diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h +--- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500 ++++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600 +@@ -50,7 +50,7 @@ + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +-extern DLL_VARIABLE void (*error_print_progname) (void); ++void (*error_print_progname) (void); + + /* This variable is incremented each time `error' is called. */ + extern DLL_VARIABLE unsigned int error_message_count; diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 906aba8d53..1cc272bf14 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" -PR = "r4" +PR = "r5" PROVIDES = "virtual/libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ @@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://fixchicken.patch;patch=1;pnum=1 \ file://getline.m4.patch;patch=1" +SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" +SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" + PARALLEL_MAKE = "" inherit autotools -- cgit v1.2.3 From 41af26d6a6e9eda30691b0d21a82de2d9524870e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 17:42:13 +0000 Subject: uclibc 0.9.29: turn on SUSV3 stuff on angsgrom to build perl --- packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro | 4 ++-- packages/uclibc/uclibc_0.9.29.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro index 039e89649e..a7f6c36d9f 100644 --- a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro +++ b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro @@ -25,8 +25,8 @@ MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y COMPAT_ATEXIT=y -# UCLIBC_SUSV3_LEGACY is not set -# UCLIBC_SUSV3_LEGACY_MACROS is not set +UCLIBC_SUSV3_LEGACY=y +UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_HAS_SHADOW=y # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set UCLIBC_HAS___PROGNAME=y diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index cbcffa22ea..3e418637a1 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r0" +PR = "r1" require uclibc.inc -- cgit v1.2.3 From d272cc519ecb26016ac4978640e5757a72684735 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 17:56:03 +0000 Subject: install-native: inherit native --- packages/install/install-native_0.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/install/install-native_0.1.bb b/packages/install/install-native_0.1.bb index 059342e920..70c027bfe1 100644 --- a/packages/install/install-native_0.1.bb +++ b/packages/install/install-native_0.1.bb @@ -9,6 +9,8 @@ PR = "r1" SRC_URI = "file://install-sh" +inherit native + PACKAGES = "" S = "${WORKDIR}" -- cgit v1.2.3 From ab1d28338ceef255c4a74a426786621fc994938d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 May 2007 19:06:01 +0000 Subject: gimp 2.3.10: fix packaging, closes #2313 --- packages/gimp/gimp_2.3.10.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb index a1e875be89..f43140eca4 100644 --- a/packages/gimp/gimp_2.3.10.bb +++ b/packages/gimp/gimp_2.3.10.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" SECTION = "x11/graphics" LICENSE = "GPL" -PR = "r1" +PR = "r2" DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" @@ -25,3 +25,11 @@ do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } + +FILES_${PN} += "${datadir}/icons \ + ${datadir}/mime-info \ + ${datadir}/application-registry " + +FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \ + ${libdir}/gimp/2.0/modules/.debug" + -- cgit v1.2.3 From 52a906868117bd95fd3e4a3dfe41608c4fc3f600 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 14 May 2007 22:39:38 +0000 Subject: wlan-ng-utils: unify --- packages/wlan-ng/wlan-ng-utils.inc | 65 ++++++++++++++++++++ packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb | 68 +-------------------- packages/wlan-ng/wlan-ng-utils_0.2.3.bb | 71 ++-------------------- .../wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb | 56 +---------------- packages/wlan-ng/wlan-ng-utils_0.2.7.bb | 70 +-------------------- packages/wlan-ng/wlan-ng-utils_svn.bb | 55 +---------------- 6 files changed, 77 insertions(+), 308 deletions(-) create mode 100644 packages/wlan-ng/wlan-ng-utils.inc diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc new file mode 100644 index 0000000000..bfd2ce377c --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils.inc @@ -0,0 +1,65 @@ +DESCRIPTION = "linux-wlan-ng userland utilities" +HOMEPAGE = "http://www.linux-wlan.org" +SECTION = "kernel/userland" +LICENSE = "GPL" +DEPENDS = "virtual/kernel" + +SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ + file://only-the-utils.patch;patch=1 \ + file://wlan-ng.modutils \ + file://wlan.agent \ + file://usbctl \ + file://resume \ + file://pre-up \ + file://post-down \ + file://config.in" + +# yeah, it's kind of backwards, but otherwise the config step will fail +inherit module + +do_configure() { + install -m 0655 ${WORKDIR}/config.in ${S}/config.in + oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config + + if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then + echo "PRISM2_PCMCIA=y" >> config.mk + echo "WLAN_KERN_PCMCIA=y" >> config.mk + fi + echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk + echo "FIRMWARE_DIR=/etc/wlan" >> config.mk + echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk + echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk + echo "RC_DIR=${sysconfdir}/" >> config.mk + echo "CC=${CC}" >> config.mk + echo "LD=${LD}" >> config.mk + + # Shut up, you broken buildsystem + install -m 0655 config.mk src/prism2/config.mk + install -d src/prism2/driver/include + ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan + ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 +} + +do_compile() { + oe_runmake all +} + +do_install() { + oe_runmake install + mkdir -p ${D}${sysconfdir}/modutils/ + mkdir -p ${D}${sysconfdir}/hotplug/ + mkdir -p ${D}${base_sbindir}/ + install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf + install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent + install -d ${D}${sysconfdir}/network/if-pre-up.d + install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng + install -d ${D}${sysconfdir}/network/if-post-down.d + install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng + install -d ${D}${sysconfdir}/apm/resume.d + install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng + install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl + install -d ${D}${mandir}/man1 + install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ +} + +FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb index 7fd9844e7d..9ac5348a98 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb @@ -1,67 +1,3 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk +require wlan-ng-utils.inc - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" +PR = "r1" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb index 6206bbbbf5..d4e0a39c70 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb @@ -1,70 +1,7 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc + PR = "r2" -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ +SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" + file://hostldflags.patch;patch=1" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb index 27cb04e97f..f71a2ee34a 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc SRCDATE = "20060823" PV = "0.2.4+svn${SRCDATE}" @@ -20,53 +16,3 @@ SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ file://post-down \ file://config.in" S = "${WORKDIR}/trunk" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb index 929f67fe16..da76ea36f7 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb @@ -1,69 +1,5 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ +SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" + file://hostldflags.patch;patch=1" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb index c85779abc2..fae48545ff 100644 --- a/packages/wlan-ng/wlan-ng-utils_svn.bb +++ b/packages/wlan-ng/wlan-ng-utils_svn.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc + PR = "r2" PV = "0.2.4+svn${SRCDATE}" @@ -20,54 +17,6 @@ SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ file://config.in" S = "${WORKDIR}/trunk" -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - FILES_${PN} = "/etc /sbin" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From e7f57a37a1c80f37eda84798befd772bc7f9321f Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 14 May 2007 22:49:37 +0000 Subject: wlan-ng-utils: put ${S} back in. It is indeed needed after all ;-) --- packages/wlan-ng/wlan-ng-utils.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc index bfd2ce377c..2b47b51241 100644 --- a/packages/wlan-ng/wlan-ng-utils.inc +++ b/packages/wlan-ng/wlan-ng-utils.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.linux-wlan.org" SECTION = "kernel/userland" LICENSE = "GPL" DEPENDS = "virtual/kernel" +S = "${WORKDIR}/linux-wlan-ng-${PV}" SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ file://only-the-utils.patch;patch=1 \ -- cgit v1.2.3 From d00f3c23f5b44d6abdbdbaa969077582b1763d8e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 14 May 2007 22:51:57 +0000 Subject: wlan-ng-utils: package up debug files. Fixes QA compilation error. --- packages/wlan-ng/wlan-ng-utils.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc index 2b47b51241..cc1ec927e0 100644 --- a/packages/wlan-ng/wlan-ng-utils.inc +++ b/packages/wlan-ng/wlan-ng-utils.inc @@ -63,4 +63,5 @@ do_install() { install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ } +FILES_${PN}_dbg += "/sbin/.debug/" FILES_${PN} = "/etc /sbin" -- cgit v1.2.3 From 6cae298da4fd494bb28a77e48d4f0383f0cb6272 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 15 May 2007 00:29:53 +0000 Subject: altboot: Add SVNR44 which unb0rks reboot/shutdown for all Z and adds an advanced bootscript with multi-partition support for SL-C3x00. Not perfect yet but useable, feedback welcome --- packages/altboot/altboot_1.1.1+wip-SVNR43.bb | 124 --------------------------- packages/altboot/altboot_1.1.1+wip-SVNR44.bb | 124 +++++++++++++++++++++++++++ packages/altboot/altboot_svn.bb | 2 +- 3 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR43.bb create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR44.bb diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR43.bb b/packages/altboot/altboot_1.1.1+wip-SVNR43.bb deleted file mode 100644 index 93056c3d60..0000000000 --- a/packages/altboot/altboot_1.1.1+wip-SVNR43.bb +++ /dev/null @@ -1,124 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: MIT (see COPYING.MIT) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -SVN_REV = "43" -PR = "r0" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "${MACHINE}" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" - -S = "${WORKDIR}/trunk/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -MACHINE_DIR = "${MACHINE}" -MACHINE_DIR_nslu2be = "nslu2le" - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - if test -d ${S}/${MACHINE_DIR} - then - install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ - else - install -m 0644 ${S}/altboot*.cfg ${D}/etc/ - fi - - install -m 0644