Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

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

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 1e80f4c..f518de4 100644 (file)
--- 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 = "r82"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -11,7 +11,7 @@ SRC_URI = " \
            file://host.conf \
            file://profile \
            file://fstab \
-          file://filesystems \
+           file://filesystems \
            file://issue.net \
            file://issue \
            file://usbd \
@@ -19,13 +19,16 @@ SRC_URI = " \
            file://share/dot.profile \
            file://licenses/BSD \
            file://licenses/GPL-2 \
+           file://licenses/GPL-3 \
            file://licenses/LGPL-2 \
            file://licenses/LGPL-2.1 \
+           file://licenses/LGPL-3 \
+           file://licenses/GFDL-1.2 \
            file://licenses/Artistic "
 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 +36,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"
+          /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 +70,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
@@ -74,9 +83,11 @@ do_install () {
                echo ${hostname} > ${D}${sysconfdir}/hostname
        fi
 
+        install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
+
         if [ -n "${DISTRO_NAME}" ]; then
-               echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue
-               echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net
+               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
@@ -101,7 +112,7 @@ do_install () {
        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
+       for license in BSD GPL-2 LGPL-2 LGPL-2.1 Artistic GPL-3 LGPL-3 GFDL-1.2; do
                install -m 0644 ${WORKDIR}/licenses/$license ${D}${datadir}/common-licenses/
        done
 
@@ -111,7 +122,6 @@ do_install () {
 
 do_install_append_mnci () {
        rmdir ${D}/tmp
-       mkdir -p ${D}${localstatedir}/tmp
        ln -s var/tmp ${D}/tmp
 }
 
@@ -135,7 +145,15 @@ do_install_append_netbook-pro () {
        mkdir -p ${D}/initrd
 }
 
-PACKAGES = "${PN}-doc ${PN}"
+do_install_append_opendreambox() {
+       > ${D}/${sysconfdir}/resolv.conf
+       rm -rf ${D}/mnt
+       rm -rf ${D}/hdd
+       ln -sf media/hdd ${D}/hdd
+       ln -sf media ${D}/mnt
+}
+
+PACKAGES = "${PN}-dbg ${PN}-doc ${PN}"
 FILES_${PN} = "/*"
 FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
 
@@ -143,6 +161,8 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
 PACKAGE_ARCH_mnci = "mnci"
 PACKAGE_ARCH_rt3000 = "rt3000"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 # Unslung distribution specific packaging
 
 PACKAGES_unslung = "${PN}-unslung"