GNOME.org
 

[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1089/8267] util-linux: upgrade to 2.28

commit 73dcfb6f1068acce0fcf05866c398a82fcba4b66
Author: Chen Qi <Qi Chen windriver com>
Date:   Wed Jun 15 14:25:16 2016 +0800

    util-linux: upgrade to 2.28
    
    Related patches are rebased.
    
    util-linux-ng-2.16-mount_lock_path.patch is removed because there's
    no _PATH_MOUNTED_LOCK in the latest codes.
    
    util-linux-native.patch is removed because 2.28 version of util-linux
    has taken mkostemp into consideration and provide fallback if mkostemp
    fails.
    
    avoid_unsupported_sleep_param.patch is removed and coreutils is added
    as a runtime dependency to util-linux-ptest to solve the same problem.
    
    avoid_unsupported_grep_opts.patch is removed and grep is added as a
    runtime dependency to util-linux-ptest to solve the sanme problem.
    
    (From OE-Core rev: fccf99d9130f3c5ce358c97c97c52cd74deef25c)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/util-linux/util-linux.inc        |    4 +-
 .../util-linux/avoid_unsupported_grep_opts.patch   |   57 --------------------
 .../util-linux/avoid_unsupported_sleep_param.patch |   20 -------
 .../util-linux/display_testname_for_subtest.patch  |   27 ++++++----
 .../recipes-core/util-linux/util-linux/ptest.patch |   16 ++++--
 .../util-linux/util-linux/util-linux-native.patch  |   57 --------------------
 .../util-linux-ng-2.16-mount_lock_path.patch       |   27 ---------
 .../util-linux/uuid-test-error-api.patch           |   21 +++++---
 .../{util-linux_2.27.1.bb => util-linux_2.28.bb}   |   15 ++----
 9 files changed, 49 insertions(+), 195 deletions(-)
---
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c0f2540..bac1a37 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c
                     file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
                     file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
 
-inherit autotools gettext pkgconfig systemd update-alternatives python3-dir ptest bash-completion
+inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest
 DEPENDS = "zlib ncurses"
 DEPENDS_append_class-native = " lzo-native"
 DEPENDS_append_class-nativesdk = " lzo-native"
@@ -282,7 +282,7 @@ python populate_packages_prepend() {
                       extra_depends='', prepend=True, allow_links=True)
 }
 
-RDEPENDS_${PN}-ptest = "bash"
+RDEPENDS_${PN}-ptest = "bash grep coreutils"
 
 do_compile_ptest() {
     oe_runmake buildtest-TESTS
diff --git a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch 
b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
index 0eb8810..417ca1d 100644
--- a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
+++ b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
@@ -3,16 +3,23 @@ Display testname for subtest
 Signed-off-by: Tudor Florea <tudor florea enea com>
 Upstream-Status: Pending
 
-diff -ruN a/functions.sh b/functions.sh
---- a/tests/functions.sh       2015-11-12 21:32:02.434542124 +0100
-+++ b/tests/functions.sh       2015-11-12 21:40:37.095317280 +0100
-@@ -297,7 +297,7 @@
-       if [ "$TS_PARALLEL" == "yes" ]; then
-               TS_TITLE=$(printf "%13s: %-30s ...\n%16s: %-27s ..." "$TS_COMPONENT" "$TS_DESC" "" 
"$TS_SUBNAME")
-       else
--              TS_TITLE=$(printf "%16s: %-27s ..." "" "$TS_SUBNAME")
-+               TS_TITLE=$(printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_SUBNAME")
-               echo -n "$TS_TITLE"
+---
+ tests/functions.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/functions.sh b/tests/functions.sh
+index 5246605..b24dc15 100644
+--- a/tests/functions.sh
++++ b/tests/functions.sh
+@@ -320,7 +320,7 @@ function ts_init_subtest {
+ 
+       if [ "$TS_PARSABLE" != "yes" ]; then
+               [ $TS_NSUBTESTS -eq 1 ] && echo
+-              printf "%16s: %-27s ..." "" "$TS_SUBNAME"
++              printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_SUBNAME"
        fi
  }
+ 
+-- 
+2.8.3
 
diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch 
b/meta/recipes-core/util-linux/util-linux/ptest.patch
index 837f189..0537f7d 100644
--- a/meta/recipes-core/util-linux/util-linux/ptest.patch
+++ b/meta/recipes-core/util-linux/util-linux/ptest.patch
@@ -2,16 +2,22 @@ Define TESTS variable
 
 Signed-off-by: Tudor Florea <tudor florea enea com>
 Upstream-Status: Pending
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
 
-diff -ruN a/Makefile.am b/Makefile.am
---- a/Makefile.am      2015-11-12 20:29:46.778396936 +0100
-+++ b/Makefile.am      2015-11-12 20:32:24.342450279 +0100
-@@ -48,7 +48,7 @@
+diff --git a/Makefile.am b/Makefile.am
+index bbaccb1..7d5a6bb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -48,6 +48,7 @@ systemdsystemunit_DATA =
  dist_bashcompletion_DATA =
  check_PROGRAMS =
  dist_check_SCRIPTS =
--TESTS =
 +TESTS = $(check_PROGRAMS)
  
  PATHFILES =
+ 
+-- 
+2.8.3
 
diff --git a/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch 
b/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch
index 1b0ff79..a6fde5d 100644
--- a/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch
+++ b/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch
@@ -3,19 +3,23 @@ This patch adds error() API implementation for non-glibc system C libs
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj khem gmail com>
 
-Index: util-linux-2.27.1/tests/helpers/test_uuidd.c
-===================================================================
---- util-linux-2.27.1.orig/tests/helpers/test_uuidd.c
-+++ util-linux-2.27.1/tests/helpers/test_uuidd.c
+---
+ misc-utils/test_uuidd.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 61 insertions(+), 1 deletion(-)
+
+diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
+index 36f3b3d..7d579ce 100644
+--- a/misc-utils/test_uuidd.c
++++ b/misc-utils/test_uuidd.c
 @@ -23,7 +23,6 @@
   *
   *    make uuidd uuidgen localstatedir=/var
   */
 -#include <error.h>
- #include <libgen.h>
  #include <pthread.h>
  #include <stdio.h>
-@@ -39,6 +38,17 @@
+ #include <stdlib.h>
+@@ -38,6 +37,17 @@
  #include "xalloc.h"
  #include "strutils.h"
  
@@ -33,7 +37,7 @@ Index: util-linux-2.27.1/tests/helpers/test_uuidd.c
  #define LOG(level,args) if (loglev >= level) { fprintf args; }
  
  size_t nprocesses = 4;
-@@ -257,6 +267,56 @@ static void object_dump(size_t idx, obje
+@@ -256,6 +266,56 @@ static void object_dump(size_t idx, object_t *obj)
        fprintf(stderr, "}\n");
  }
  
@@ -90,3 +94,6 @@ Index: util-linux-2.27.1/tests/helpers/test_uuidd.c
  int main(int argc, char *argv[])
  {
        size_t i, nfailed = 0, nignored = 0;
+-- 
+2.8.3
+
diff --git a/meta/recipes-core/util-linux/util-linux_2.27.1.bb 
b/meta/recipes-core/util-linux/util-linux_2.28.bb
similarity index 61%
rename from meta/recipes-core/util-linux/util-linux_2.27.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.28.bb
index 7549158..27fa88b 100644
--- a/meta/recipes-core/util-linux/util-linux_2.27.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.28.bb
@@ -1,28 +1,23 @@
-MAJOR_VERSION = "2.27"
+MAJOR_VERSION = "2.28"
 require util-linux.inc
 
 # To support older hosts, we need to patch and/or revert
 # some upstream changes.  Only do this for native packages.
 OLDHOST = ""
-OLDHOST_class-native = "file://util-linux-native.patch \
-                        file://util-linux-native-qsort.patch \
-                       "
+OLDHOST_class-native = "file://util-linux-native-qsort.patch"
 
-SRC_URI += "file://util-linux-ng-2.16-mount_lock_path.patch \
-            file://configure-sbindir.patch \
+SRC_URI += "file://configure-sbindir.patch \
             file://runuser.pamd \
             file://runuser-l.pamd \
             ${OLDHOST} \
             file://ptest.patch \
             file://run-ptest \
-            file://avoid_unsupported_sleep_param.patch \
-            file://avoid_unsupported_grep_opts.patch \
             file://display_testname_for_subtest.patch \
             file://avoid_parallel_tests.patch \
             file://uuid-test-error-api.patch \
 "
-SRC_URI[md5sum] = "3cd2698d1363a2c64091c2dadc974647"
-SRC_URI[sha256sum] = "0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290"
+SRC_URI[md5sum] = "e534e6ccc49107e5d31c329af798ef7d"
+SRC_URI[sha256sum] = "395847e2a18a2c317170f238892751e73a57104565344f8644090c8b091014bb"
 
 CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]