From 72567733033347b662d9baa07432985fd2da3efa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Apr 2011 14:32:45 +0100 Subject: Remove machine-specific metadata for machines no longer in oe-core Signed-off-by: Paul Eggleton --- .../recipes-core/base-files/base-files/akita/fstab | 16 ------------- .../base-files/base-files/akita/rotation | 1 - meta/recipes-core/base-files/base-files/c7x0/fstab | 12 ---------- meta/recipes-core/base-files/base-files/c7x0/usbd | 1 - .../base-files/base-files/collie/fstab | 8 ------- .../recipes-core/base-files/base-files/collie/usbd | 1 - .../base-files/base-files/htcuniversal/rotation | 1 - .../base-files/base-files/hx2000/fstab | 9 ------- .../recipes-core/base-files/base-files/mtx-1/fstab | 8 ------- .../base-files/base-files/mtx-1/profile | 25 ------------------- .../base-files/base-files/nokia770/fstab | 6 ----- .../base-files/base-files/poodle/fstab | 13 ---------- .../recipes-core/base-files/base-files/poodle/usbd | 1 - .../recipes-core/base-files/base-files/spitz/fstab | 28 ---------------------- .../base-files/base-files/spitz/rotation | 1 - meta/recipes-core/base-files/base-files/tosa/fstab | 12 ---------- meta/recipes-core/base-files/base-files/tosa/usbd | 5 ---- meta/recipes-core/base-files/base-files_3.0.14.bb | 17 +------------ 18 files changed, 1 insertion(+), 164 deletions(-) delete mode 100644 meta/recipes-core/base-files/base-files/akita/fstab delete mode 100644 meta/recipes-core/base-files/base-files/akita/rotation delete mode 100644 meta/recipes-core/base-files/base-files/c7x0/fstab delete mode 100644 meta/recipes-core/base-files/base-files/c7x0/usbd delete mode 100644 meta/recipes-core/base-files/base-files/collie/fstab delete mode 100644 meta/recipes-core/base-files/base-files/collie/usbd delete mode 100644 meta/recipes-core/base-files/base-files/htcuniversal/rotation delete mode 100644 meta/recipes-core/base-files/base-files/hx2000/fstab delete mode 100644 meta/recipes-core/base-files/base-files/mtx-1/fstab delete mode 100644 meta/recipes-core/base-files/base-files/mtx-1/profile delete mode 100644 meta/recipes-core/base-files/base-files/nokia770/fstab delete mode 100644 meta/recipes-core/base-files/base-files/poodle/fstab delete mode 100644 meta/recipes-core/base-files/base-files/poodle/usbd delete mode 100644 meta/recipes-core/base-files/base-files/spitz/fstab delete mode 100644 meta/recipes-core/base-files/base-files/spitz/rotation delete mode 100644 meta/recipes-core/base-files/base-files/tosa/fstab delete mode 100644 meta/recipes-core/base-files/base-files/tosa/usbd (limited to 'meta/recipes-core/base-files') diff --git a/meta/recipes-core/base-files/base-files/akita/fstab b/meta/recipes-core/base-files/base-files/akita/fstab deleted file mode 100644 index 5f2c941345..0000000000 --- a/meta/recipes-core/base-files/base-files/akita/fstab +++ /dev/null @@ -1,16 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 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 defaults 0 0 -tmpfs /media/ram tmpfs defaults 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 - diff --git a/meta/recipes-core/base-files/base-files/akita/rotation b/meta/recipes-core/base-files/base-files/akita/rotation deleted file mode 100644 index 2a14d60899..0000000000 --- a/meta/recipes-core/base-files/base-files/akita/rotation +++ /dev/null @@ -1 +0,0 @@ -270 \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/c7x0/fstab b/meta/recipes-core/base-files/base-files/c7x0/fstab deleted file mode 100644 index e065e8112e..0000000000 --- a/meta/recipes-core/base-files/base-files/c7x0/fstab +++ /dev/null @@ -1,12 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 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 defaults 0 0 -tmpfs /media/ram tmpfs defaults 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/meta/recipes-core/base-files/base-files/c7x0/usbd b/meta/recipes-core/base-files/base-files/c7x0/usbd deleted file mode 100644 index 40931ee8e9..0000000000 --- a/meta/recipes-core/base-files/base-files/c7x0/usbd +++ /dev/null @@ -1 +0,0 @@ -usbdmodule=pxa_bi diff --git a/meta/recipes-core/base-files/base-files/collie/fstab b/meta/recipes-core/base-files/base-files/collie/fstab deleted file mode 100644 index dc3499b909..0000000000 --- a/meta/recipes-core/base-files/base-files/collie/fstab +++ /dev/null @@ -1,8 +0,0 @@ -/dev/mtdblock4 / jffs2 defaults 1 1 -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 defaults 0 0 - -# we use a non-volatile ramdisk, see /etc/init.d/ramdisk -#tmpfs /media/ram tmpfs defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/collie/usbd b/meta/recipes-core/base-files/base-files/collie/usbd deleted file mode 100644 index 4257614583..0000000000 --- a/meta/recipes-core/base-files/base-files/collie/usbd +++ /dev/null @@ -1 +0,0 @@ -usbdmodule=sa1100_bi diff --git a/meta/recipes-core/base-files/base-files/htcuniversal/rotation b/meta/recipes-core/base-files/base-files/htcuniversal/rotation deleted file mode 100644 index 2a14d60899..0000000000 --- a/meta/recipes-core/base-files/base-files/htcuniversal/rotation +++ /dev/null @@ -1 +0,0 @@ -270 \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/hx2000/fstab b/meta/recipes-core/base-files/base-files/hx2000/fstab deleted file mode 100644 index 2d4b7aae72..0000000000 --- a/meta/recipes-core/base-files/base-files/hx2000/fstab +++ /dev/null @@ -1,9 +0,0 @@ -/dev/mtdblock2 / jffs2 defaults 1 1 -/dev/mtdblock3 /home jffs2 defaults 1 1 - -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/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/mtx-1/fstab b/meta/recipes-core/base-files/base-files/mtx-1/fstab deleted file mode 100644 index ee3fab0c13..0000000000 --- a/meta/recipes-core/base-files/base-files/mtx-1/fstab +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/fstab: static file system information. mtx-1 -# -# -rootfs / auto defaults 1 1 -tmpfs /var/volatile tmpfs size=10m 0 0 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files/mtx-1/profile b/meta/recipes-core/base-files/base-files/mtx-1/profile deleted file mode 100644 index bedf2fc7d8..0000000000 --- a/meta/recipes-core/base-files/base-files/mtx-1/profile +++ /dev/null @@ -1,25 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" - -if [ "`id -u`" -eq 0 ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in `ls /etc/profile.d/`; do - . /etc/profile.d/$i - done - unset i -fi - -export PATH PS1 - -umask 022 - -alias ll="ls -lah" \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/nokia770/fstab b/meta/recipes-core/base-files/base-files/nokia770/fstab deleted file mode 100644 index 7dbae252fb..0000000000 --- a/meta/recipes-core/base-files/base-files/nokia770/fstab +++ /dev/null @@ -1,6 +0,0 @@ -rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 -/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 -proc /proc proc defaults 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files/poodle/fstab b/meta/recipes-core/base-files/base-files/poodle/fstab deleted file mode 100644 index b96b750eb6..0000000000 --- a/meta/recipes-core/base-files/base-files/poodle/fstab +++ /dev/null @@ -1,13 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 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 /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/poodle/usbd b/meta/recipes-core/base-files/base-files/poodle/usbd deleted file mode 100644 index 40931ee8e9..0000000000 --- a/meta/recipes-core/base-files/base-files/poodle/usbd +++ /dev/null @@ -1 +0,0 @@ -usbdmodule=pxa_bi diff --git a/meta/recipes-core/base-files/base-files/spitz/fstab b/meta/recipes-core/base-files/base-files/spitz/fstab deleted file mode 100644 index 3d0e508dfd..0000000000 --- a/meta/recipes-core/base-files/base-files/spitz/fstab +++ /dev/null @@ -1,28 +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 tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 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 noauto 0 0 - -# -# Harddisk -# -/dev/hda2 /home ext3 defaults 0 0 -/dev/hda3 /media/hdd vfat defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files/spitz/rotation b/meta/recipes-core/base-files/base-files/spitz/rotation deleted file mode 100644 index 2a14d60899..0000000000 --- a/meta/recipes-core/base-files/base-files/spitz/rotation +++ /dev/null @@ -1 +0,0 @@ -270 \ No newline at end of file diff --git a/meta/recipes-core/base-files/base-files/tosa/fstab b/meta/recipes-core/base-files/base-files/tosa/fstab deleted file mode 100644 index e065e8112e..0000000000 --- a/meta/recipes-core/base-files/base-files/tosa/fstab +++ /dev/null @@ -1,12 +0,0 @@ -/dev/mtdblock2 / jffs2 rw,noatime 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 defaults 0 0 -tmpfs /media/ram tmpfs defaults 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/meta/recipes-core/base-files/base-files/tosa/usbd b/meta/recipes-core/base-files/base-files/tosa/usbd deleted file mode 100644 index 8c80044167..0000000000 --- a/meta/recipes-core/base-files/base-files/tosa/usbd +++ /dev/null @@ -1,5 +0,0 @@ -# I know that this was created for usb-client stuff -# but tosa/2.6 need (un)loading USB Host module -# on suspend/resume and this way is simplest one ;) - -usbdmodule=ohci-hcd diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 857df13332..1c5078eb77 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -2,7 +2,7 @@ SUMMARY = "Miscellaneous files for the base system." DESCRIPTION = "The base-files package creates the basic system directory structure and provides a small set of key configuration files for the system." SECTION = "base" PRIORITY = "required" -PR = "r67" +PR = "r68" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "file://rotation \ @@ -64,8 +64,6 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ # hostname = "openembedded" hostname_slugos = "nslu2" -hostname_mnci = "MNCI" -hostname_rt3000 = "MNRT" hostname_jlime = "JLime" BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" @@ -135,11 +133,6 @@ do_install_basefilesissue () { fi } -do_install_append_mnci () { - rmdir ${D}/tmp - ln -s var/tmp ${D}/tmp -} - do_install_append_nylon() { printf "" "" >${D}${sysconfdir}/resolv.conf rm -r ${D}/mnt/* @@ -156,10 +149,6 @@ do_install_append_slugos() { ln -s ../root ${D}/home/root } -do_install_append_netbook-pro () { - mkdir -p ${D}/initrd -} - do_install_append_linuxstdbase() { for d in ${dirs3755}; do install -m 0755 -d ${D}$d @@ -174,10 +163,6 @@ PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg" FILES_${PN} = "/" FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" -# M&N specific packaging -PACKAGE_ARCH_mnci = "mnci" -PACKAGE_ARCH_rt3000 = "rt3000" - PACKAGE_ARCH = "${MACHINE_ARCH}" # Unslung distribution specific packaging -- cgit 1.2.3-korg