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

13 files changed, 36 insertions, 115 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
diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 1b25242c89..ac8fd569c3 100644
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -10,13 +10,6 @@ SRC_URI = "file://halt \
            file://ramdisk \
            file://umountfs \
            file://devices \
-           file://h3600/devices \
-           file://collie/devices \
-           file://shepherd/devices \
-           file://husky/devices \
-           file://boxer/devices \
-           file://corgi/devices \
-           file://poodle/devices \
            file://devpts.sh \
            file://devpts \
            file://bootlogo-simpad.gz \
@@ -26,12 +19,8 @@ SRC_URI = "file://halt \
            file://finish \
            file://bootmisc.sh \
            file://mountnfs.sh \
-           file://ramses/umountfs \
-           file://ramses/extractfs \
            file://reboot \
            file://checkfs.sh \
-           file://simpad/devices \
-           file://simpad/banner \
            file://single \
            file://sendsigs \
            file://urandom \
@@ -76,10 +65,10 @@ do_install () {
 #
 # Install device dependent scripts
 #
-	oe_machinstall -m 0755 ${WORKDIR}/banner	${D}/etc/init.d/banner
-	oe_machinstall -m 0755 ${WORKDIR}/devices	${D}/etc/init.d/devices
-	oe_machinstall -m 0755 ${WORKDIR}/extractfs	${D}/etc/init.d/extractfs
-	oe_machinstall -m 0755 ${WORKDIR}/umountfs	${D}/etc/init.d/umountfs
+	install -m 0755 ${WORKDIR}/banner	${D}/etc/init.d/banner
+	install -m 0755 ${WORKDIR}/devices	${D}/etc/init.d/devices
+	install -m 0755 ${WORKDIR}/extractfs	${D}/etc/init.d/extractfs
+	install -m 0755 ${WORKDIR}/umountfs	${D}/etc/init.d/umountfs
 #
 # Create runlevel links
 #
diff --git a/linux/gumstix_2.6.5-gnalm1-gum0.oe b/linux/gumstix_2.6.5-gnalm1-gum0.oe
index bae18ef450..4ba8e73184 100644
--- a/linux/gumstix_2.6.5-gnalm1-gum0.oe
+++ b/linux/gumstix_2.6.5-gnalm1-gum0.oe
@@ -13,7 +13,7 @@ inherit kernel
 KERNEL_IMAGETYPE = "zImage"
 
 do_configure_prepend() {
-	oe_machinstall -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
         oe_runmake oldconfig
 }
 
diff --git a/linux/omap_2.6.5-omap1.oe b/linux/omap_2.6.5-omap1.oe
index d35dfced88..8593e83072 100644
--- a/linux/omap_2.6.5-omap1.oe
+++ b/linux/omap_2.6.5-omap1.oe
@@ -11,7 +11,7 @@ inherit kernel
 KERNEL_IMAGETYPE = "zImage"
 
 do_configure_prepend() {
-	oe_machinstall -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
         oe_runmake oldconfig
 }
 
diff --git a/modutils/modutils-collateral.oe b/modutils/modutils-collateral.oe
index 0d01ae2c2e..d73ad635cc 100644
--- a/modutils/modutils-collateral.oe
+++ b/modutils/modutils-collateral.oe
@@ -1,28 +1,12 @@
 DESCRIPTION = "modutils configuration files"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files"
 
-SRC_URI = "\
-		file://shepherd/modules		\
-		file://shepherd/modules.conf	\
-		file://h3600/modules		\
-		file://h3600/modules.conf		\
-		file://corgi/modules		\
-		file://corgi/modules.conf		\
-		file://husky/modules		\
-		file://husky/modules.conf		\
-		file://modutils-notest.patch	\
-		file://modutils			\
-		file://collie/modules		\
-		file://collie/modules.conf		\
-		file://configure.patch		\
-		file://poodle/modules		\
-		file://poodle/modules.conf		\
-		file://ramses/modules		\
-		file://ramses/modules-ramses	\
-		file://ramses/modules.conf		\
-		file://simpad/modules		\
-		file://simpad/modules.conf		\
-		file://program_prefix.patch"
+SRC_URI = "file://modutils-notest.patch	\
+	   file://configure.patch \
+	   file://program_prefix.patch \
+	   file://modules \
+	   file://modules.conf \
+	   file://modutils"
 
 INITSCRIPT_NAME = "modutils"
 INITSCRIPT_PARAMS = "start 20 S ."
@@ -35,6 +19,6 @@ do_compile () {
 do_install () {
 	install -d ${D}/${sysconfdir} ${D}/etc/init.d/
 	install -m 0755 ${WORKDIR}/modutils ${D}/etc/init.d/
-	oe_machinstall -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules
-	oe_machinstall -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf
+	install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules
+	install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf
 }
diff --git a/modutils/modutils_2.4.27.oe b/modutils/modutils_2.4.27.oe
index ffb8ed596b..4b328d5913 100644
--- a/modutils/modutils_2.4.27.oe
+++ b/modutils/modutils_2.4.27.oe
@@ -9,25 +9,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${
            file://modutils-notest.patch;patch=1 \
            file://configure.patch;patch=1 \
            file://program_prefix.patch;patch=1 \
-           file://collie/modules \
-           file://collie/modules.conf \
-           file://corgi/modules \
-           file://corgi/modules.conf \
-           file://h3600/modules \
-           file://h3600/modules.conf \
-           file://husky/modules \
-           file://husky/modules.conf \
-           file://boxer/modules \
-           file://boxer/modules.conf \
-           file://poodle/modules \
-           file://poodle/modules.conf \
-           file://ramses/modules \
-           file://ramses/modules.conf \
-           file://shepherd/modules \
-           file://shepherd/modules.conf \
-           file://simpad/modules \
-           file://simpad/modules.conf \
-           file://modutils"
+           file://modules \
+           file://modules.conf"
 
 inherit autotools
 
@@ -39,8 +22,8 @@ export BUILDCC = "${BUILD_CC}"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}/${sysconfdir}
-	oe_machinstall -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules
-	oe_machinstall -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf
+	install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules
+	install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf
 }
 
 pkg_postinst_modutils () {
diff --git a/netbase/netbase_4.17.oe b/netbase/netbase_4.17.oe
index 61830a3461..071e6ccdda 100644
--- a/netbase/netbase_4.17.oe
+++ b/netbase/netbase_4.17.oe
@@ -11,13 +11,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
            file://options \
            file://init \
            file://hosts \
-           file://epia/interfaces \
-           file://collie/interfaces \
-           file://husky/interfaces \
-           file://boxer/interfaces \
-           file://shepherd/interfaces \
-           file://poodle/interfaces \
-           file://corgi/interfaces \
            file://interfaces"
 
 do_install () {
@@ -36,5 +29,5 @@ do_install () {
 	install -m 0644 etc-services ${D}/${sysconfdir}/services
 	install -m 0755 update-inetd ${D}/${sbindir}/
 	install -m 0644 update-inetd.8 ${D}/${mandir}/man8/
-	oe_machinstall -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces
+	install -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces
 }
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index fb958059cf..cf0ad96698 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -57,7 +57,7 @@ do_install() {
 	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
 	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
 	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
-	oe_machinstall -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
 }
 
 FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
diff --git a/prelink/prelink_20031029.oe b/prelink/prelink_20031029.oe
index a60c04541d..61bb2c55c9 100644
--- a/prelink/prelink_20031029.oe
+++ b/prelink/prelink_20031029.oe
@@ -19,7 +19,7 @@ inherit autotools
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/default
-	oe_machinstall -m 0644 ${WORKDIR}/prelink.conf ${D}/${sysconfdir}/prelink.conf
-	oe_machinstall -m 0644 ${WORKDIR}/prelink.cron.daily ${D}/${sysconfdir}/cron.daily/prelink
-	oe_machinstall -m 0644 ${WORKDIR}/prelink.default ${D}/${sysconfdir}/default/prelink
+	install -m 0644 ${WORKDIR}/prelink.conf ${D}/${sysconfdir}/prelink.conf
+	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}/${sysconfdir}/cron.daily/prelink
+	install -m 0644 ${WORKDIR}/prelink.default ${D}/${sysconfdir}/default/prelink
 }
diff --git a/prelink/prelink_20040304.oe b/prelink/prelink_20040304.oe
index 1cc8f57b84..fc5df0e399 100644
--- a/prelink/prelink_20040304.oe
+++ b/prelink/prelink_20040304.oe
@@ -13,7 +13,7 @@ inherit autotools
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/default
-	oe_machinstall -m 0644 ${WORKDIR}/prelink.conf ${D}/${sysconfdir}/prelink.conf
-	oe_machinstall -m 0644 ${WORKDIR}/prelink.cron.daily ${D}/${sysconfdir}/cron.daily/prelink
-	oe_machinstall -m 0644 ${WORKDIR}/prelink.default ${D}/${sysconfdir}/default/prelink
+	install -m 0644 ${WORKDIR}/prelink.conf ${D}/${sysconfdir}/prelink.conf
+	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}/${sysconfdir}/cron.daily/prelink
+	install -m 0644 ${WORKDIR}/prelink.default ${D}/${sysconfdir}/default/prelink
 }
diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe
index b809b6628d..1b57317821 100644
--- a/sysvinit/sysvinit_2.85.oe
+++ b/sysvinit/sysvinit_2.85.oe
@@ -44,7 +44,7 @@ do_install () {
 #	echo "/etc/default/rcS" >> ${D}/CONTROL/conffiles
 #	install -m 0755    ${FILESDIR}/prerm		${D}/CONTROL/
 #	install -m 0755    ${FILESDIR}/postinst		${D}/CONTROL/
-	oe_machinstall -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab
+	install -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab
 	if [ ! -z "${SERIAL_CONSOLE}" ]; then
 		echo "S:2345:respawn:/sbin/getty ${SERIAL_CONSOLE}" >> ${D}/etc/inittab
 	fi
diff --git a/tslib/tslib.oe b/tslib/tslib.oe
index dfae3293a4..58d3978075 100644
--- a/tslib/tslib.oe
+++ b/tslib/tslib.oe
@@ -11,12 +11,7 @@ SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
            file://pthres.patch;patch=1 \
            file://raw.patch;patch=1 \
            file://raw-hwread.patch;patch=1 \
-           file://collie/ts.conf \
-           file://corgi/ts.conf \
-           file://h3600/ts.conf \
-           file://husky/ts.conf \
-           file://poodle/ts.conf \
-           file://shepherd/ts.conf"
+           file://ts.conf"
 #           file://collie-module.patch;patch=1
 #           file://devfs.patch;patch=1
 #           file://event1.patch;patch=1
@@ -37,7 +32,7 @@ do_stage () {
 }
 
 do_install_prepend () {
-	oe_machinstall -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
+	install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
 }
 
 FILES_tslib_append = " ${datadir}/ts/plugins/*.so"
diff --git a/tslib/tslib_cvs.oe b/tslib/tslib_cvs.oe
index b9c0a5d4b9..e09a4ca595 100644
--- a/tslib/tslib_cvs.oe
+++ b/tslib/tslib_cvs.oe
@@ -6,22 +6,8 @@ DESCRIPTION = "tslib is a touchscreen access library."
 CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/tslib \
-           file://collie/ts.conf \
-           file://collie/tslib.sh \
-           file://corgi/ts.conf \
-           file://corgi/tslib.sh \
-           file://h3600/ts.conf \
-           file://h3600/tslib.sh \
-           file://husky/ts.conf \
-           file://husky/tslib.sh \
-           file://boxer/ts.conf \
-           file://boxer/tslib.sh \
-           file://poodle/ts.conf \
-           file://poodle/tslib.sh \
-	   file://simpad/ts.conf \
-	   file://simpad/tslib.sh \
-           file://shepherd/ts.conf \
-           file://shepherd/tslib.sh"
+	   file://ts.conf \
+	   file://tslib.sh"
 S = "${WORKDIR}/tslib"
 
 inherit autotools
@@ -36,12 +22,12 @@ do_stage () {
 }
 
 do_install_prepend () {
-	oe_machinstall -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
+	install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
 }
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/profile.d/
-	oe_machinstall -m 0755 ${WORKDIR}/tslib.sh ${D}/${sysconfdir}/profile.d/
+	install -m 0755 ${WORKDIR}/tslib.sh ${D}/${sysconfdir}/profile.d/
 }
 
 FILES_${PN} += " ${libdir}/ts/*.so ${datadir}/ts/plugins/*.so"