From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 12:47:30 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 11:34:13+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/23 11:33:31+01:00 mn-solutions.de!schurig fix installation stage 2005/02/23 09:27:44+00:00 (none)!xora New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission 2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though. 2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl bump cvsdate on oz-3.5.3 2005/02/22 17:37:44-06:00 ti.com!kergoth Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out. BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A --- packages/base-files/base-files_3.0.14.bb | 102 +++++++++++++++---------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'packages/base-files') diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 38c3bf7d32..677ff0f4f7 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -49,104 +49,104 @@ hostname_ramses = "MNCI" do_install () { for d in ${dirs755}; do - install -m 0755 -d ${D}/$d + install -m 0755 -d ${D}$d done for d in ${dirs1777}; do - install -m 1777 -d ${D}/$d + install -m 1777 -d ${D}$d done for d in ${dirs2775}; do - install -m 2755 -d ${D}/$d + install -m 2755 -d ${D}$d done for d in card cf net ram; do - ln -sf /media/$d ${D}/mnt/$d + ln -sf /media/$d ${D}mnt/$d done if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then - echo ${MACHINE} > ${D}/${sysconfdir}/hostname + echo ${MACHINE} > ${D}${sysconfdir}/hostname else - echo ${hostname} > ${D}/${sysconfdir}/hostname + 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 + 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 + 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 + 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 + 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}/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 + 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/ + install -m 0644 ${WORKDIR}/licenses/$license ${D}${datadir}/common-licenses/ done - if (grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}/${sysconfdir}/fstab); then + if (grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}${sysconfdir}/fstab); then # /var is in a ramdisk - install -d ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/rcS.d + install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/rcS.d for d in ${dirs755}; do if (echo $d|grep -q "^${localstatedir}"); then - echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh - echo "chmod 0775 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh + echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh + echo "chmod 0775 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh fi done for d in ${dirs1777}; do if (echo $d|grep -q "^${localstatedir}"); then - echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh - echo "chmod 1777 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh + echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh + echo "chmod 1777 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh fi done for d in ${dirs2775}; do if (echo $d|grep -q "^${localstatedir}"); then - echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh - echo "chmod 2775 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh + echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh + echo "chmod 2775 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh fi done - echo ">/var/run/utmp" >> ${D}/${sysconfdir}/init.d/populate-var.sh - echo ">/var/log/wtmp" >> ${D}/${sysconfdir}/init.d/populate-var.sh - echo ">/var/log/lastlog" >> ${D}/${sysconfdir}/init.d/populate-var.sh - echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog" >> ${D}/${sysconfdir}/init.d/populate-var.sh - echo "touch /var/run/resolv.conf" >> ${D}/${sysconfdir}/init.d/populate-var.sh + echo ">/var/run/utmp" >> ${D}${sysconfdir}/init.d/populate-var.sh + echo ">/var/log/wtmp" >> ${D}${sysconfdir}/init.d/populate-var.sh + echo ">/var/log/lastlog" >> ${D}${sysconfdir}/init.d/populate-var.sh + echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog" >> ${D}${sysconfdir}/init.d/populate-var.sh + echo "touch /var/run/resolv.conf" >> ${D}${sysconfdir}/init.d/populate-var.sh -# rmdir ${D}/${localstatedir}/* - chmod 0755 ${D}/${sysconfdir}/init.d/populate-var.sh - ln -sf ../init.d/populate-var.sh ${D}/${sysconfdir}/rcS.d/S37populate-var.sh - ln -sf ${localstatedir}/run/resolv.conf ${D}/${sysconfdir}/resolv.conf - ln -sf ${localstatedir}/ld.so.cache ${D}/${sysconfdir}/ld.so.cache - ln -sf /proc/mounts ${D}/${sysconfdir}/mtab +# rmdir ${D}${localstatedir}/* + chmod 0755 ${D}${sysconfdir}/init.d/populate-var.sh + ln -sf ../init.d/populate-var.sh ${D}${sysconfdir}/rcS.d/S37populate-var.sh + ln -sf ${localstatedir}/run/resolv.conf ${D}${sysconfdir}/resolv.conf + ln -sf ${localstatedir}/ld.so.cache ${D}${sysconfdir}/ld.so.cache + ln -sf /proc/mounts ${D}${sysconfdir}/mtab fi } do_install_append_ramses () { - rmdir ${D}/tmp - mkdir -p ${D}/${localstatedir}/tmp - ln -s var/tmp ${D}/tmp + rmdir ${D}tmp + mkdir -p ${D}${localstatedir}/tmp + ln -s var/tmp ${D}tmp } do_install_append_nylon() { - rm ${D}/${sysconfdir}/resolv.conf - touch ${D}/${sysconfdir}/resolv.conf - rm -r ${D}/mnt/* + rm ${D}${sysconfdir}/resolv.conf + touch ${D}${sysconfdir}/resolv.conf + rm -r ${D}mnt/* } PACKAGES = "${PN}-doc ${PN}" -- cgit v1.2.3