diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
| commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
| tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /makedevs | |
| parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) | |
| download | openembedded-2b8f679ffe5929b5a11eb71e514aa4997c36f13e.tar.gz | |
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
Diffstat (limited to 'makedevs')
| -rw-r--r-- | makedevs/makedevs-native_1.0.0.oe | 3 | ||||
| -rw-r--r-- | makedevs/makedevs_1.0.0.oe | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/makedevs/makedevs-native_1.0.0.oe b/makedevs/makedevs-native_1.0.0.oe index 6fe5c8bf18..52c560fad7 100644 --- a/makedevs/makedevs-native_1.0.0.oe +++ b/makedevs/makedevs-native_1.0.0.oe @@ -4,7 +4,7 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/makedevs-${PV}" S = "${WORKDIR}/makedevs-native-${PV}" do_configure() { - cp -f ${FILESDIR}/makedevs.c ${S}/ + cp -f ${WORKDIR}/makedevs.c ${S}/ } do_compile() { @@ -15,4 +15,3 @@ do_stage() { install -d ${STAGING_BINDIR}/ install -m 0755 ${S}/makedevs ${STAGING_BINDIR}/ } - diff --git a/makedevs/makedevs_1.0.0.oe b/makedevs/makedevs_1.0.0.oe index 39d92d5471..d81519f63a 100644 --- a/makedevs/makedevs_1.0.0.oe +++ b/makedevs/makedevs_1.0.0.oe @@ -1,8 +1,9 @@ -SRC_URI = "file://${FILESDIR}/makedevs.c" +SRC_URI = "file://makedevs.c \ + file://makedevs.c" S = "${WORKDIR}/makedevs-${PV}" do_configure() { - cp -f ${FILESDIR}/makedevs.c ${S}/ + cp -f ${WORKDIR}/makedevs.c ${S}/ } do_compile() { |