diff options
Diffstat (limited to 'packages/base-files/base-files_3.0.14.bb')
| -rw-r--r-- | packages/base-files/base-files_3.0.14.bb | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index db06b92471..d8335f7abb 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 = "r61" +PR = "r69" 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 \ @@ -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" + /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 @@ -74,9 +80,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 @@ -111,7 +119,6 @@ do_install () { do_install_append_mnci () { rmdir ${D}/tmp - mkdir -p ${D}${localstatedir}/tmp ln -s var/tmp ${D}/tmp } |