diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-12-01 14:45:39 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:30 +0000 |
commit | 0203b2b3af5858931fc82072551a264ec4506d52 (patch) | |
tree | 28946aa775299947330f4a02a100738ee7feaa64 /meta/recipes-core/util-linux/util-linux.inc | |
parent | 60a8f94c00101eff39428ff7548f45ffe1233103 (diff) | |
download | poky-0203b2b3af5858931fc82072551a264ec4506d52.tar.gz |
util-linux: Update to 2.20.1
Add patch remove setting CC, LD and LDFLAGS on commandline
since they are passed correctly via configure. Those setting
also caused the configure information about -std=gnu99 from
being passed correctly.
Removed patch that was fixed upstream
Added scanf configuration, since this is a cross-compile target check
libuuid removed an API that e2fsprogs uuidd used (uuid__generate_*),
thus we disable it in this patch and will now provide uuidd from
util-linux.
See http://sourceforge.net/projects/e2fsprogs/forums/forum/7053/topic/4639484
(From OE-Core rev: fdaf4e791fcacb48ea430ec768ad9a6919c65ce0)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux.inc')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index acc4a39c49..5445f4f7cd 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -18,7 +18,7 @@ DEPENDS = "zlib ncurses" | |||
18 | DEPENDS_virtclass-native = " lzo-native" | 18 | DEPENDS_virtclass-native = " lzo-native" |
19 | 19 | ||
20 | 20 | ||
21 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ | 21 | SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ |
22 | file://MCONFIG \ | 22 | file://MCONFIG \ |
23 | file://swapargs.h \ | 23 | file://swapargs.h \ |
24 | file://defines.h \ | 24 | file://defines.h \ |
@@ -78,9 +78,7 @@ do_compile () { | |||
78 | install ${WORKDIR}/make_include ${S}/make_include | 78 | install ${WORKDIR}/make_include ${S}/make_include |
79 | install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h | 79 | install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h |
80 | install ${WORKDIR}/defines.h ${S}/defines.h | 80 | install ${WORKDIR}/defines.h ${S}/defines.h |
81 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ | 81 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' |
82 | 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ | ||
83 | 'LDFLAGS=${LDFLAGS}' | ||
84 | } | 82 | } |
85 | 83 | ||
86 | checklink() { | 84 | checklink() { |