summaryrefslogtreecommitdiff
path: root/base-files
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-07-01 00:44:57 +0000
committerChris Larson <clarson@kergoth.com>2004-07-01 00:44:57 +0000
commit3abb2b2ab999f428c9e8f1215cf393eea8589e9f (patch)
tree9497333c4ee67255d53f715aedef7b0098574e41 /base-files
parentb86cd133209a4c9cbcba168444258f76b9dee966 (diff)
Merges.
2004/06/30 19:43:22-05:00 (none)!kergoth Clean up SRC_URI and remove oe_machinstall usage per the recent FILESPATH change. BKrev: 40e35e89nLvooGCio5W-357_SZU3iA
Diffstat (limited to 'base-files')
-rw-r--r--base-files/base-files_3.0.14.oe15
1 files changed, 3 insertions, 12 deletions
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index c4d86baa69..3fe02b7d29 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -17,17 +17,11 @@ SRC_URI = " \
file://etc/inputrc \
file://etc/host.conf \
file://etc/profile \
- file://shepherd/fstab \
- file://epia/fstab \
- file://corgi/fstab \
file://fstab \
- file://husky/fstab \
- file://boxer/fstab \
file://share/dot.bashrc \
file://share/dot.profile \
file://share/info.dir \
file://share/motd.md5sums \
- file://collie/fstab \
file://debian/FAQ \
file://debian/directory-list \
file://debian/control \
@@ -43,9 +37,6 @@ SRC_URI = " \
file://debian/remove-base \
file://debian/README.base \
file://debian/current-md5sums \
- file://poodle/fstab \
- file://ramses/fstab \
- file://simpad/fstab \
file://licenses/BSD \
file://licenses/GPL-2 \
file://licenses/LGPL-2 \
@@ -82,13 +73,13 @@ do_install () {
cd ${D} && chmod 2775 `cat ${S}/debian/2775-dirs`
install -d ${D}/${sysconfdir}
- oe_machinstall -m 0644 ${WORKDIR}/fstab ${D}/${sysconfdir}/fstab
+ install -m 0644 ${WORKDIR}/fstab ${D}/${sysconfdir}/fstab
[ -z "${MACHINE}" ] && echo "openembedded" >${D}/${sysconfdir}/hostname || echo ${MACHINE} >${D}/${sysconfdir}/hostname
- oe_machinstall -m 0644 ${WORKDIR}/profile ${D}/${sysconfdir}/profile
+ install -m 0644 ${WORKDIR}/profile ${D}/${sysconfdir}/profile
install -m 0644 ${WORKDIR}/etc/issue-${DISTRO} ${D}/${sysconfdir}/issue
install -m 0644 ${WORKDIR}/etc/issue.net-${DISTRO} ${D}/${sysconfdir}/issue.net
cat ${WORKDIR}/etc/motd | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/motd
- for f in inputrc nsswitch.conf host.conf profile
+ for f in inputrc nsswitch.conf host.conf
do
install -m 0644 ${WORKDIR}/etc/$f ${D}/${sysconfdir}/
done