From bcf73715cf4c1d0fd89857661b8e6f3ec479277a Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 17 Mar 2011 14:25:04 +0100 Subject: [PATCH] base-files: use default fstab for Zaurus devices. Bump PR. * Zaurus boots from different media and we can't make any guess. Signed-off-by: Andrea Adami --- recipes/base-files/base-files/akita/fstab | 19 -------------- recipes/base-files/base-files/c7x0/fstab | 13 ---------- recipes/base-files/base-files/poodle/fstab | 14 ---------- recipes/base-files/base-files/spitz/fstab | 30 ---------------------- recipes/base-files/base-files/tosa/fstab | 15 ----------- recipes/base-files/base-files_3.0.14.bb | 2 +- 6 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 recipes/base-files/base-files/akita/fstab delete mode 100644 recipes/base-files/base-files/c7x0/fstab delete mode 100644 recipes/base-files/base-files/poodle/fstab delete mode 100644 recipes/base-files/base-files/spitz/fstab delete mode 100644 recipes/base-files/base-files/tosa/fstab diff --git a/recipes/base-files/base-files/akita/fstab b/recipes/base-files/base-files/akita/fstab deleted file mode 100644 index 3b488cf880..0000000000 --- a/recipes/base-files/base-files/akita/fstab +++ /dev/null @@ -1,19 +0,0 @@ -rootfs / auto defaults 1 1 -#/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 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 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - -# USB Storage -/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 - - diff --git a/recipes/base-files/base-files/c7x0/fstab b/recipes/base-files/base-files/c7x0/fstab deleted file mode 100644 index ea38eab1c6..0000000000 --- a/recipes/base-files/base-files/c7x0/fstab +++ /dev/null @@ -1,13 +0,0 @@ -rootfs / auto defaults 1 1 -#/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 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 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/recipes/base-files/base-files/poodle/fstab b/recipes/base-files/base-files/poodle/fstab deleted file mode 100644 index 733b13fddb..0000000000 --- a/recipes/base-files/base-files/poodle/fstab +++ /dev/null @@ -1,14 +0,0 @@ -rootfs / auto defaults 1 1 -#/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 - -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 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/recipes/base-files/base-files/spitz/fstab b/recipes/base-files/base-files/spitz/fstab deleted file mode 100644 index 324fb78482..0000000000 --- a/recipes/base-files/base-files/spitz/fstab +++ /dev/null @@ -1,30 +0,0 @@ -# don't mount /dev/mtdblock2 since Spitz uses pivot_root -# or 2.6 directly boots from the hdd -# /dev/mtdblock2 / jffs2 rw,noatime 1 1 -rootfs / auto defaults 1 1 -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 -# SD/MMC in kernel 2.4 -#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - -# -# USB -# -/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 - -# -# Harddisk -# -##/dev/hda2 /home ext3 defaults 0 0 -##/dev/hda3 /media/hdd vfat defaults 0 0 diff --git a/recipes/base-files/base-files/tosa/fstab b/recipes/base-files/base-files/tosa/fstab deleted file mode 100644 index f256c7409d..0000000000 --- a/recipes/base-files/base-files/tosa/fstab +++ /dev/null @@ -1,15 +0,0 @@ -rootfs / auto defaults 1 1 -#/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto 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 - -# SD/MMC in kernel 2.4 -#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index acd12a422a..641d43602b 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r100" +PR = "r101" LICENSE = "GPL" SRC_URI = " \ -- 2.39.5