From 2b8f679ffe5929b5a11eb71e514aa4997c36f13e Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 22 May 2004 16:47:36 +0000 Subject: Merges. 2004/05/22 12:46:48-04:00 local!kergoth Bugfixes per the recent FILESDIR cleanup. 2004/05/22 01:03:38-04:00 local!kergoth Run a perl script against the repo to kill off direct FILESDIR usage in favor of relative file:// paths in SRC_URI, and WORKDIR references in functions. 2004/05/21 23:07:58-04:00 local!kergoth Switch file:// FILESDIR uris in SRC_URI to the new relative path format. BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w --- busybox/busybox_1.00-pre10.oe | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'busybox') diff --git a/busybox/busybox_1.00-pre10.oe b/busybox/busybox_1.00-pre10.oe index 49a1eb465d..fbbea6f13e 100644 --- a/busybox/busybox_1.00-pre10.oe +++ b/busybox/busybox_1.00-pre10.oe @@ -11,9 +11,12 @@ functionality and behave very much like their GNU counterparts. BusyBox \ provides a fairly complete POSIX environment for any small or embedded \ system." -# file://${FILESDIR}/busybox-1.00-pre10-fuser.patch;patch=1 +# file://busybox-1.00-pre10-fuser.patch;patch=1 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://${FILESDIR}/bb-iproute-iftunnel.patch;patch=1" + file://bb-iproute-iftunnel.patch;patch=1 \ + file://defconfig \ + file://syslog \ + file://hwclock.sh" S = "${WORKDIR}/busybox-${PV}" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" @@ -22,7 +25,7 @@ FILES_${PN} += " ${datadir}/udhcpc" inherit cml1 do_configure () { - install -m 0644 ${FILESDIR}/defconfig ${S}/.config + install -m 0644 ${WORKDIR}/defconfig ${S}/.config cml1_do_configure } @@ -34,8 +37,8 @@ do_compile () { do_install () { install -d ${D}/etc/init.d oe_runmake 'PREFIX=${D}' install - install -m 0755 ${FILESDIR}/syslog ${D}/etc/init.d/syslog - install -m 0755 ${FILESDIR}/hwclock.sh ${D}/etc/init.d/hwclock.sh + install -m 0755 ${WORKDIR}/syslog ${D}/etc/init.d/syslog + install -m 0755 ${WORKDIR}/hwclock.sh ${D}/etc/init.d/hwclock.sh install -d ${D}${datadir}/udhcpc install -m 0755 ${S}/examples/udhcp/simple.script ${D}${datadir}/udhcpc/default.script } -- cgit v1.2.3