summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
committerChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
commit2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch)
treecab0f25aca03f6162bd268a401945fbfbb63bff9 /util-linux
parent5df179157f90b18f437c6978efb451f515e3d1c9 (diff)
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 'util-linux')
-rw-r--r--util-linux/util-linux_2.12.oe14
1 files changed, 9 insertions, 5 deletions
diff --git a/util-linux/util-linux_2.12.oe b/util-linux/util-linux_2.12.oe
index 1ca1b67074..3dd537f4f0 100644
--- a/util-linux/util-linux_2.12.oe
+++ b/util-linux/util-linux_2.12.oe
@@ -3,15 +3,19 @@ DEPENDS = "virtual/libc zlib ncurses"
DESCRIPTION = "Util-linux is a suite of essential \
utilities for any Linux system."
-SRC_URI = "http://ftp.cwi.nl/aeb/util-linux/util-linux-${PV}.tar.gz"
+SRC_URI = "http://ftp.cwi.nl/aeb/util-linux/util-linux-${PV}.tar.gz \
+ file://MCONFIG \
+ file://make_include \
+ file://swapargs.h \
+ file://defines.h"
EXTRA_OEMAKE = ""
do_compile () {
set -e
- install ${FILESDIR}/MCONFIG ${S}/MCONFIG
- install ${FILESDIR}/make_include ${S}/make_include
- install ${FILESDIR}/swapargs.h ${S}/mount/swapargs.h
- install ${FILESDIR}/defines.h ${S}/defines.h
+ install ${WORKDIR}/MCONFIG ${S}/MCONFIG
+ install ${WORKDIR}/make_include ${S}/make_include
+ install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
+ install ${WORKDIR}/defines.h ${S}/defines.h
oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
'LDFLAGS=${LDFLAGS}'