diff options
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/defines.h (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/defines.h) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/make_include (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/make_include) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch (renamed from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.20.1.bb (renamed from meta/recipes-core/util-linux/util-linux_2.19.1.bb) | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb | 2 |
13 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG b/meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG index 3fea2c02d70..3fea2c02d70 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/defines.h b/meta/recipes-core/util-linux/util-linux-2.20.1/defines.h index 6ce6b86df53..6ce6b86df53 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/defines.h +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/defines.h diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/make_include b/meta/recipes-core/util-linux/util-linux-2.20.1/make_include index e6abcd91f76..e6abcd91f76 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/make_include +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/make_include diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch index afa50f46b84..afa50f46b84 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch index 02e4d16ff7f..02e4d16ff7f 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h b/meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h index e960eef05f9..e960eef05f9 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch index 45826b180af..45826b180af 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch index 75774d82009..75774d82009 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch index 5773d7ea1b7..5773d7ea1b7 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch index c5c0affcb88..c5c0affcb88 100644 --- a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index acc4a39c491..5445f4f7cd2 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" 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() { diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.20.1.bb index 82040eff784..a569131eabc 100644 --- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.20.1.bb @@ -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 () { diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb index c6c1f0d48c6..a26d89a5b40 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb @@ -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" |