]> code.ossystems Code Review - openembedded-core.git/commitdiff
util-linux: Update to 2.20.1
authorSaul Wold <sgw@linux.intel.com>
Thu, 1 Dec 2011 22:45:39 +0000 (14:45 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 3 Jan 2012 12:10:46 +0000 (12:10 +0000)
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

Signed-off-by: Saul Wold <sgw@linux.intel.com>
13 files changed:
meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG [moved from meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/defines.h [moved from meta/recipes-core/util-linux/util-linux-2.19.1/defines.h with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/make_include [moved from meta/recipes-core/util-linux/util-linux-2.19.1/make_include with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch [moved from meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch [moved from meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h [moved from meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch [moved from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch [moved from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch [moved from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch with 100% similarity]
meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch [moved from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch with 100% similarity]
meta/recipes-core/util-linux/util-linux.inc
meta/recipes-core/util-linux/util-linux_2.20.1.bb [moved from meta/recipes-core/util-linux/util-linux_2.19.1.bb with 84% similarity]
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb

index acc4a39c491f0627f3f4c234601b8c079a30b91b..5445f4f7cd22cee6192ef6d14630b7dac20313df 100644 (file)
@@ -18,7 +18,7 @@ DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native = " lzo-native"
 
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
            file://MCONFIG \
            file://swapargs.h \
            file://defines.h \
@@ -78,9 +78,7 @@ do_compile () {
        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}'
+       oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' 
 }
 
 checklink() {
similarity index 84%
rename from meta/recipes-core/util-linux/util-linux_2.19.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.20.1.bb
index 82040eff784d1f78455746f14e8e1441c8c9235f..a569131eabc1cd90b3c9459bdad812ca279a493e 100644 (file)
@@ -1,5 +1,5 @@
-MAJOR_VERSION = "2.19"
-PR = "r12"
+MAJOR_VERSION = "2.20"
+PR = "r0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
@@ -8,11 +8,10 @@ LICENSE_util-linux-lscpu = "GPLv3+"
 SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://util-linux-ng-2.16-mount_lock_path.patch \
             file://uclibc-__progname-conflict.patch \      
-            file://remove_sigsetmark.patch \
 "
 
-SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c"
-SRC_URI[sha256sum] = "d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d"
+SRC_URI[md5sum] = "079b37517fd4e002a2e6e992e8b4e361"
+SRC_URI[sha256sum] = "d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0"
 
 # Only lscpu part is gplv3; rest of the code is not, 
 # so take out the lscpu parts while running non-gplv3 build.
@@ -42,7 +41,7 @@ addtask remove_lscpu before do_configure after do_patch
 
 # fallocate is glibc 2.10, fallocate64 is glibc 2.11
 # we need to disable it for older versions
-EXTRA_OECONF += "ac_cv_func_fallocate=no"
+EXTRA_OECONF += "ac_cv_func_fallocate=no scanf_cv_type_modifier=as"
 EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
 
 do_install_append () {
index c6c1f0d48c6d17c2405bf8d5dcaeafde25ffac95..a26d89a5b400ec16b93f80760145701c204f94fe 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aa
 
 PARALLEL_MAKE = ""
 
-EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
+EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
 EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
 EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs"