fix typo

[vuplus_openembedded] / recipes / base-files / base-files_3.0.14.bb

diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index c3c1515..afa3b5b 100755 (executable)
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,18 +1,21 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r91"
-PR_vuplus = "r58"
-
+PR = "r94"
+PR_dm7025 = "r92"
+PR_vusolo = "r96"
 LICENSE = "GPL"
 
+FSTAB_dm7025 = "${@base_contains('PREFERRED_VERSION_linux-dm7025', '2.6.12.6', 'fstab_old', 'fstab', d)}"
+FSTAB ?= "fstab"
+
 SRC_URI = " \
            file://nsswitch.conf \
            file://motd \
            file://inputrc \
            file://host.conf \
            file://profile \
-           file://fstab \
+           file://${FSTAB} \
            file://filesystems \
            file://issue.net \
            file://issue \
@@ -27,29 +30,10 @@ SRC_URI = " \
            file://licenses/LGPL-3 \
            file://licenses/GFDL-1.2 \
            file://licenses/Artistic "
-SRC_URI_vuplus = " \
-           file://nsswitch.conf \
-           file://motd \
-           file://inputrc \
-           file://host.conf \
-           file://profile \
-           file://fstab \
-          file://filesystems \
-           file://issue.net \
-           file://issue \
-           file://usbd \
-           file://share/dot.bashrc \
-           file://share/dot.profile \
-           file://licenses/BSD \
-           file://licenses/GPL-2 \
-           file://licenses/LGPL-2 \
-           file://licenses/LGPL-2.1 \
-           file://licenses/Artistic "
 S = "${WORKDIR}"
 
 docdir_append = "/${P}"
 dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
-dirs1777_vuplus = "/tmp ${localstatedir}/lock ${localstatedir}/tmp"
 dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
 dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
           ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \
@@ -66,19 +50,6 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
           /mnt /media /media/card /media/cf /media/net /media/ram \
           /media/union /media/realroot /media/hdd \
           /media/mmc1"
-dirs755_vuplus = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
-          ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \
-          ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
-          ${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 \
-          /mnt /media /media/card /media/cf /media/net /media/ram \
-          /media/union /media/realroot /media/hdd \
-           /media/mmc1"
 dirs755_micro = "/dev /proc /sys ${sysconfdir}"
 dirs2775_micro = ""
 dirs1777_micro = "/tmp"
@@ -145,7 +116,7 @@ do_install () {
                         install -m 0644 ${WORKDIR}/issue.net ${D}${sysconfdir}/issue.net
                 fi
 
-                install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
+                install -m 0644 ${WORKDIR}/${FSTAB} ${D}${sysconfdir}/fstab
                install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
                install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
                install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
@@ -164,60 +135,6 @@ do_install () {
        install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
 }
 
-do_install_vuplus () {
-       for d in ${dirs755}; do
-               install -m 0755 -d ${D}$d
-       done
-       for d in ${dirs1777}; do
-               install -m 1777 -d ${D}$d
-       done
-       for d in ${dirs2775}; do
-               install -m 2755 -d ${D}$d
-       done
-       for d in card cf net ram; do
-               ln -sf /media/$d ${D}/mnt/$d
-       done
-
-       if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then
-               echo ${MACHINE} > ${D}${sysconfdir}/hostname
-       else
-               echo ${hostname} > ${D}${sysconfdir}/hostname
-       fi
-
-        if [ -n "${DISTRO_NAME}" ]; then
-               echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue
-               echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net
-               if [ -n "${DISTRO_VERSION}" ]; then
-                       echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
-                       echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
-               fi
-               echo "\n \l" >> ${D}${sysconfdir}/issue
-               echo >> ${D}${sysconfdir}/issue
-               echo "%h"    >> ${D}${sysconfdir}/issue.net
-               echo >> ${D}${sysconfdir}/issue.net
-       else
-              install -m 0644 ${WORKDIR}/issue ${D}${sysconfdir}/issue
-              install -m 0644 ${WORKDIR}/issue.net ${D}${sysconfdir}/issue.net
-       fi
-
-       install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
-       install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
-       install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
-       install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
-       install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
-       install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
-       install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
-       install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
-       install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
-       install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
-
-       for license in BSD GPL-2 LGPL-2 LGPL-2.1 Artistic; do
-               install -m 0644 ${WORKDIR}/licenses/$license ${D}${datadir}/common-licenses/
-       done
-
-       ln -sf /proc/mounts ${D}${sysconfdir}/mtab
-}
-
 do_install_append_mnci () {
        rmdir ${D}/tmp
        ln -s var/tmp ${D}/tmp
@@ -259,8 +176,6 @@ do_install_append_vuplus() {
 
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}"
 FILES_${PN} = "/*"
-PACKAGES_vuplus = "${PN}-doc ${PN}"
-FILES_${PN}_vuplus = "/"
 FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
 
 # M&N specific packaging