From patchwork Tue Jun 13 16:51:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 105407 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp502500qgd; Tue, 13 Jun 2017 09:51:59 -0700 (PDT) X-Received: by 10.84.217.197 with SMTP id d5mr640925plj.282.1497372719257; Tue, 13 Jun 2017 09:51:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497372719; cv=none; d=google.com; s=arc-20160816; b=asmXalzxbsqZTemmX+FqBBsOS0zTwDmNFZRoyzj/F8cOH8p/vfzo3ONa+2wvP8skdt EHhBflFz23J0YqXziv+cQyiOdqm2MnbmE2mXnW+dv46J/+EzHOI3iAm9GwipeAPEtJks QEoSyXAXf2Kqn2u1U2VceJqOJoTk+EYn6vL4VZd7sINXrKWNHlrCySELFlg+1VYAhcvP 30YYc0+v+PvJUJwyjuFOCsjf0kFpxvgRB1SdQdfgFmKK+SiCJ0p/HrqcBJfQ6SarzYUr +9t4BWy6B8U90OlwUQBMx7Cmt9KZKmsRH6nrwTl3RIAyWfVAOddw4MQJud0kjpTrJVXn Byfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to :arc-authentication-results; bh=lKKlDiulqo0u1msSS3GuxkLXNrdu6QmprbkfTgLQLuA=; b=SlbySRglCVeMFONt1DB495nWJF4znOeGsvMRVoy5N7eHHi1I0HYGCGRnaZEa1WCq7n 9jqDTKkMCjpvAGwBGn34U0QpP88EbNH09gWv0gnxOLGUmvLDDMVcz56vdozNZRZ//FQW UXOj+hvJNbwXSOaOI9mgumptp6RAY5g68aYiTZa+hVvq9w7lVvvu5t9bUhQXMrfxoGkw a6tCRcYOiuiCJUM8AHlMMX1nohLbhK+AL3hp0bLOw6kNqKSBZkZwD5zClaawAQfyVogL F29nOA60kZ2mJsA+UQv7vALR2tKjS0xAh3FT5pbZ0DfneJnrYnaVgAyHpSn0QW7/5vYr RFpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p26si346778pli.104.2017.06.13.09.51.58; Tue, 13 Jun 2017 09:51:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 21089782EC; Tue, 13 Jun 2017 16:51:56 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id 60C07719F7 for ; Tue, 13 Jun 2017 16:51:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 35B6F20B7D; Tue, 13 Jun 2017 16:51:55 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qfMhEtq2Kcs4; Tue, 13 Jun 2017 16:51:55 +0000 (UTC) Received: from mail.denix.org (pool-100-15-85-143.washdc.fios.verizon.net [100.15.85.143]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 10536207AF; Tue, 13 Jun 2017 16:51:54 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id 937AA1624F9; Tue, 13 Jun 2017 12:51:53 -0400 (EDT) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Tue, 13 Jun 2017 12:51:52 -0400 Message-Id: <1497372712-46542-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [PATCH v2] util-linux: upgrade to 2.30 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Denys Dmytriyenko Drop uuid-test-error-api.patch as it's been fixed upstream differently: https://github.com/karelzak/util-linux/commit/b770b487004778f4425639c7ed1bb6ca22d157bf Drop ptest for tailf, as it got deprecated and removed: https://github.com/karelzak/util-linux/commit/70ca1a77721b41f2355eeb00d4e55e13dba3e313 Signed-off-by: Denys Dmytriyenko --- v2 - fix ptest breakage meta/recipes-core/util-linux/util-linux.inc | 2 +- .../util-linux/uuid-test-error-api.patch | 99 ---------------------- .../{util-linux_2.29.2.bb => util-linux_2.30.bb} | 7 +- 3 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch rename meta/recipes-core/util-linux/{util-linux_2.29.2.bb => util-linux_2.30.bb} (80%) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 63302a9..1656e92 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -304,7 +304,7 @@ do_install_ptest() { cp ${S}/tests/run.sh ${D}${PTEST_PATH}/tests/ cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected - list="bitops build-sys cal col colrm column dmesg fsck hexdump hwclock ipcs isosize login look md5 misc more namei paths schedutils script swapon tailf" + list="bitops build-sys cal col colrm column dmesg fsck hexdump hwclock ipcs isosize login look md5 misc more namei paths schedutils script swapon" # The following tests are not installed yet: # blkid scsi_debug module dependent # cramfs gcc dependent 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 deleted file mode 100644 index a6fde5d..0000000 --- a/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch +++ /dev/null @@ -1,99 +0,0 @@ -This patch adds error() API implementation for non-glibc system C libs - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - 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 - #include - #include - #include -@@ -38,6 +37,17 @@ - #include "xalloc.h" - #include "strutils.h" - -+#ifdef __GLIBC__ -+#include -+#else -+extern void (*error_print_progname)(void); -+extern unsigned int error_message_count; -+extern int error_one_per_line; -+ -+void error(int, int, const char *, ...); -+void error_at_line(int, int, const char *, unsigned int, const char *, ...); -+#endif -+ - #define LOG(level,args) if (loglev >= level) { fprintf args; } - - size_t nprocesses = 4; -@@ -256,6 +266,56 @@ static void object_dump(size_t idx, object_t *obj) - fprintf(stderr, "}\n"); - } - -+#ifndef __GLIBC__ -+extern char *__progname; -+ -+void (*error_print_progname)(void) = 0; -+unsigned int error_message_count = 0; -+int error_one_per_line = 0; -+ -+static void eprint(int status, int e, const char *file, unsigned int line, const char *fmt, va_list ap) -+{ -+ if (file && error_one_per_line) { -+ static const char *oldfile; -+ static unsigned int oldline; -+ if (line == oldline && strcmp(file, oldfile) == 0) -+ return; -+ oldfile = file; -+ oldline = line; -+ } -+ if (error_print_progname) -+ error_print_progname(); -+ else -+ fprintf(stderr, "%s: ", __progname); -+ if (file) -+ fprintf(stderr, "%s:%u: ", file, line); -+ vfprintf(stderr, fmt, ap); -+ if (e) -+ fprintf(stderr, ": %s", strerror(e)); -+ putc('\n', stderr); -+ fflush(stderr); -+ error_message_count++; -+ if (status) -+ exit(status); -+} -+ -+void error(int status, int e, const char *fmt, ...) -+{ -+ va_list ap; -+ va_start(ap,fmt); -+ eprint(status, e, 0, 0, fmt, ap); -+ va_end(ap); -+} -+ -+void error_at_line(int status, int e, const char *file, unsigned int line, const char *fmt, ...) -+{ -+ va_list ap; -+ va_start(ap,fmt); -+ eprint(status, e, file, line, fmt, ap); -+ va_end(ap); -+} -+#endif /* __GLIBC__ */ -+ - 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.29.2.bb b/meta/recipes-core/util-linux/util-linux_2.30.bb similarity index 80% rename from meta/recipes-core/util-linux/util-linux_2.29.2.bb rename to meta/recipes-core/util-linux/util-linux_2.30.bb index 11303f8..6b309b5 100644 --- a/meta/recipes-core/util-linux/util-linux_2.29.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.30.bb @@ -1,4 +1,4 @@ -MAJOR_VERSION = "2.29" +MAJOR_VERSION = "2.30" require util-linux.inc # To support older hosts, we need to patch and/or revert @@ -14,10 +14,9 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://uuid-test-error-api.patch \ " -SRC_URI[md5sum] = "63c40c2068fcbb7e1d5c1d281115d973" -SRC_URI[sha256sum] = "accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3" +SRC_URI[md5sum] = "eaa3429150268027908a1b8ae6ee9a62" +SRC_URI[sha256sum] = "c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"