From patchwork Mon May 28 15:58:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 137101 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2993101lji; Mon, 28 May 2018 08:58:39 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpKFucXIihBvT7XTSZFXkK1W9Svlux2n/H0JF52ePtScTDCOf1p62M6SdIYNhj7hir2WcOQ X-Received: by 2002:a17:902:268:: with SMTP id 95-v6mr14301183plc.386.1527523119755; Mon, 28 May 2018 08:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527523119; cv=none; d=google.com; s=arc-20160816; b=gIupg4vDMLpk3pf/u37p9gPPG4PKXZIvzse/2E+DRMdL60fDLspt/KqGJA7B6U5rGo tb5RyqiDg4fL6dpiX2jb59m9GTrZ76pEjYE+0q2cyH0tvEq+rtVIAgxiq48Y5Mz+A6do 1wr0x9NKgyU55bOLnnMbaaxmcP9baF2WzL3rxoGPT0z8G09+RKO6bWe/WaM29n66t3wr Vp52xfKr4h5NpeI+BybRFFhXv80Bpi+Z0U61rftMVxC6vdBw+cvfUi2KLLKMLPpsh3f/ gvFHuHe5zrSVtU5bmv5+brXGSizHZrrbO7nKweo0G8f8SEcNJOSyiAPSQVdw4XTs4k8o 0EqA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=hzpsqBKg8dzru4SEdeDJ3RSfvS3QGNcIDnh+1+jpLC4=; b=TwpTimZvHBSO0g935++187BZjzx5iupIsUN0/WBKq/0yQocUG5LNPXxrebiDJmTeGa ZFCTQhChBhyBN9Zaaqx3s9ohPhZV+IckR1RDQTrR92Ygt3+XE+m/k8xuceVN8nXUvKy6 pdZwZAUSWk2oAcvPhigxcx25Za/fadMS8IesTkiTIRuhocV0FAXAN9Jz+Nmna+C3zRkv F0F2XChJtAsX7OEb21UnD8QUOopeqran4iAXp2Mcvr38+ZNuAble9MnfbaDyQ/1DtQfO gGb8glTVfbNdV7LQ8nCW4FB6Yi7UD7GbTAKYsJVZBJunC557pbqFmlPfxn2XBcQIilb5 JZiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IaW+TkBG; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k127-v6si23777926pgk.256.2018.05.28.08.58.38; Mon, 28 May 2018 08:58:39 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IaW+TkBG; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 69B80747E3; Mon, 28 May 2018 15:58:34 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id 911A07458B for ; Mon, 28 May 2018 15:58:32 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a22-v6so6014804pfn.6 for ; Mon, 28 May 2018 08:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZsIV/u2Ybe5iP1S4AEdct9bKS5jFpnIbrhYLSpdjjM0=; b=IaW+TkBGZ3kcnsw2P/OadKPx7ZlI8kwNGOHVLG4azVCy9LGf8R6kjs+OvWXNxGFrcj TYAz4sgSODLOl6cSk0HGm8nY1uMhQUkf42p6ejeGyJeTkHi3Zz/NBz9J5alVqGCaERm/ vsHaqQuprDS2u2XNdxjJFEOEMs5Ah6O2xdeGO1Kun+SKxUbO5srnAzSDYHoYdgdAq/Yz 05RfZTdM8Y6udCFQjsw/7oTezZ1gjOeoe7L9ckYCRAgXQz3xh71izbg0dhZgqyQ6fCrd 5HkmBJRuvXDDsSaIywlFxO8sJddlYhHXXU/IP4Awi9IgbhSwZZ3LiTmh6LG/gkuA6IoZ nEbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZsIV/u2Ybe5iP1S4AEdct9bKS5jFpnIbrhYLSpdjjM0=; b=l2aDTpXN32PDQW+RVxOl+OH5fdJ2YMtQAKCb7I/Rs34f3cmFLUdSfAHmyuTJuUI0S2 dyjZecNdMaRtVa5pWD9Z8b8w89wTD4abHC9j+DKCD/DMjbYo9P3paF1w+94Hg8tptn04 UCjRsMWX8+u2m5TCb2oKRhkNXoju26e/sr7v14yyYHaWksI2BKpp2aNO0eCplDooShGM ePwQ0FalcTkDoPOQJ2CTvzerHsxZqDbnSmNXO7nC1TRl7z46Ho6yKyLoyVvYpuX8X6aF h3Q7fLeYIRewbLaZ36Wg+uDW0qGAu7/sWNC9mTmmGQAYf1XfI2XMkwsDE0gqyah50rJM u+WA== X-Gm-Message-State: ALKqPweuM87DV1KiBTnJ9lcvEJawTCZMpVc9Y6aLoBGWwtMPRgGaI8yN rRvFMnj4IDLrYG+6O8K6BQirjw== X-Received: by 2002:a63:9d8e:: with SMTP id i136-v6mr10817069pgd.288.1527523113720; Mon, 28 May 2018 08:58:33 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id v15-v6sm63041892pfa.107.2018.05.28.08.58.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 08:58:32 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 28 May 2018 08:58:31 -0700 Message-Id: <20180528155833.24224-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [OE-core] [PATCH 1/3] systemd: Fix build with gcc8 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 Signed-off-by: Khem Raj --- ...ange-the-default-device-timeout-to-2.patch | 9 +- ...ation-compile-failure-by-typecasting.patch | 173 ++++++++++++++++++ meta/recipes-core/systemd/systemd_237.bb | 1 + 3 files changed, 177 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch index b7b1ea0886..98c83620ff 100644 --- a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch +++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch @@ -1,4 +1,4 @@ -From 9820c165a9e559cf851e3beb60fad2571de4ded2 Mon Sep 17 00:00:00 2001 +From 7844e070745611a52e355b73e7890f360dd540d0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Dec 2015 04:09:19 +0000 Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec. @@ -16,10 +16,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/device.c b/src/core/device.c -index 77601c552..98bf49ba2 100644 +index a43664d3b..4b16a8aec 100644 --- a/src/core/device.c +++ b/src/core/device.c -@@ -112,7 +112,7 @@ static void device_init(Unit *u) { +@@ -113,7 +113,7 @@ static void device_init(Unit *u) { * indefinitely for plugged in devices, something which cannot * happen for the other units since their operations time out * anyway. */ @@ -28,6 +28,3 @@ index 77601c552..98bf49ba2 100644 u->ignore_on_isolate = true; } --- -2.16.1 - diff --git a/meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch b/meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch new file mode 100644 index 0000000000..e56061f41b --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch @@ -0,0 +1,173 @@ +From c2b3ebe112ebfd9f9e82fb1531ee225c3152ca83 Mon Sep 17 00:00:00 2001 +From: Patrick Uiterwijk +Date: Thu, 22 Feb 2018 19:41:30 +0100 +Subject: [PATCH] Fix format-truncation compile failure by typecasting USB IDs + (#8250) + +This patch adds safe_atoux16 for parsing an unsigned hexadecimal 16bit int, and +uses that for parsing USB device and vendor IDs. + +This fixes a compile error with gcc-8 because while we know that USB IDs are 2 bytes, +the compiler does not know that. + +../src/udev/udev-builtin-hwdb.c:80:38: error: '%04X' directive output may be +truncated writing between 4 and 8 bytes into a region of size between 2 and 6 +[-Werror=format-truncation=] + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/5547c12503a683290eaed47954ffcfb2d1bc03cd] + +Signed-off-by: Adam Williamson +Signed-off-by: Patrick Uiterwijk +--- + src/basic/parse-util.c | 24 ++++++++++++++++++++++ + src/basic/parse-util.h | 2 ++ + src/test/test-parse-util.c | 39 ++++++++++++++++++++++++++++++++++++ + src/udev/udev-builtin-hwdb.c | 13 ++++++------ + 4 files changed, 71 insertions(+), 7 deletions(-) + +diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c +index 97533721d..ff3fc298a 100644 +--- a/src/basic/parse-util.c ++++ b/src/basic/parse-util.c +@@ -532,6 +532,30 @@ int safe_atoi16(const char *s, int16_t *ret) { + return 0; + } + ++int safe_atoux16(const char *s, uint16_t *ret) { ++ char *x = NULL; ++ unsigned long l; ++ ++ assert(s); ++ assert(ret); ++ ++ s += strspn(s, WHITESPACE); ++ ++ errno = 0; ++ l = strtoul(s, &x, 16); ++ if (errno > 0) ++ return -errno; ++ if (!x || x == s || *x != 0) ++ return -EINVAL; ++ if (s[0] == '-') ++ return -ERANGE; ++ if ((unsigned long) (uint16_t) l != l) ++ return -ERANGE; ++ ++ *ret = (uint16_t) l; ++ return 0; ++} ++ + int safe_atod(const char *s, double *ret_d) { + _cleanup_(freelocalep) locale_t loc = (locale_t) 0; + char *x = NULL; +diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h +index 1eda1d7f9..727422056 100644 +--- a/src/basic/parse-util.h ++++ b/src/basic/parse-util.h +@@ -54,6 +54,8 @@ int safe_atou8(const char *s, uint8_t *ret); + int safe_atou16(const char *s, uint16_t *ret); + int safe_atoi16(const char *s, int16_t *ret); + ++int safe_atoux16(const char *s, uint16_t *ret); ++ + static inline int safe_atou32(const char *s, uint32_t *ret_u) { + assert_cc(sizeof(uint32_t) == sizeof(unsigned)); + return safe_atou(s, (unsigned*) ret_u); +diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c +index 937500213..a99cea5a1 100644 +--- a/src/test/test-parse-util.c ++++ b/src/test/test-parse-util.c +@@ -468,6 +468,44 @@ static void test_safe_atoi16(void) { + assert_se(r == -EINVAL); + } + ++static void test_safe_atoux16(void) { ++ int r; ++ uint16_t l; ++ ++ r = safe_atoux16("1234", &l); ++ assert_se(r == 0); ++ assert_se(l == 0x1234); ++ ++ r = safe_atoux16("abcd", &l); ++ assert_se(r == 0); ++ assert_se(l == 0xabcd); ++ ++ r = safe_atoux16(" 1234", &l); ++ assert_se(r == 0); ++ assert_se(l == 0x1234); ++ ++ r = safe_atoux16("12345", &l); ++ assert_se(r == -ERANGE); ++ ++ r = safe_atoux16("-1", &l); ++ assert_se(r == -ERANGE); ++ ++ r = safe_atoux16(" -1", &l); ++ assert_se(r == -ERANGE); ++ ++ r = safe_atoux16("junk", &l); ++ assert_se(r == -EINVAL); ++ ++ r = safe_atoux16("123x", &l); ++ assert_se(r == -EINVAL); ++ ++ r = safe_atoux16("12.3", &l); ++ assert_se(r == -EINVAL); ++ ++ r = safe_atoux16("", &l); ++ assert_se(r == -EINVAL); ++} ++ + static void test_safe_atou64(void) { + int r; + uint64_t l; +@@ -745,6 +783,7 @@ int main(int argc, char *argv[]) { + test_safe_atolli(); + test_safe_atou16(); + test_safe_atoi16(); ++ test_safe_atoux16(); + test_safe_atou64(); + test_safe_atoi64(); + test_safe_atod(); +diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c +index ca7f7c230..dbfe02429 100644 +--- a/src/udev/udev-builtin-hwdb.c ++++ b/src/udev/udev-builtin-hwdb.c +@@ -27,6 +27,7 @@ + + #include "alloc-util.h" + #include "hwdb-util.h" ++#include "parse-util.h" + #include "string-util.h" + #include "udev-util.h" + #include "udev.h" +@@ -63,7 +64,7 @@ int udev_builtin_hwdb_lookup(struct udev_device *dev, + + static const char *modalias_usb(struct udev_device *dev, char *s, size_t size) { + const char *v, *p; +- int vn, pn; ++ uint16_t vn, pn; + + v = udev_device_get_sysattr_value(dev, "idVendor"); + if (!v) +@@ -71,12 +72,10 @@ static const char *modalias_usb(struct udev_device *dev, char *s, size_t size) { + p = udev_device_get_sysattr_value(dev, "idProduct"); + if (!p) + return NULL; +- vn = strtol(v, NULL, 16); +- if (vn <= 0) +- return NULL; +- pn = strtol(p, NULL, 16); +- if (pn <= 0) +- return NULL; ++ if (safe_atoux16(v, &vn) < 0) ++ return NULL; ++ if (safe_atoux16(p, &pn) < 0) ++ return NULL; + snprintf(s, size, "usb:v%04Xp%04X*", vn, pn); + return s; + } +-- +2.17.0 + diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb index b7c2113255..c4743a6b9d 100644 --- a/meta/recipes-core/systemd/systemd_237.bb +++ b/meta/recipes-core/systemd/systemd_237.bb @@ -52,6 +52,7 @@ SRC_URI += "file://touchscreen.rules \ file://0032-memfd.patch \ file://0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch \ file://libmount.patch \ + file://0034-Fix-format-truncation-compile-failure-by-typecasting.patch \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" From patchwork Mon May 28 15:58:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 137102 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2993415lji; Mon, 28 May 2018 08:59:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq0LqbKw/ZmZp2nbUnfK/OBDCjA9uyi1leK68whCoCIKoU3+VMxPonOjZmBJM5Xm6WJKLZH X-Received: by 2002:a62:404f:: with SMTP id n76-v6mr14064774pfa.185.1527523143314; Mon, 28 May 2018 08:59:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527523143; cv=none; d=google.com; s=arc-20160816; b=FBeB1hHL0OGckbglhorQZV81sKYIFJzccJkcsTbMDOqsk2xGQaflB4wbFHCB8rW9Kp IDc5QOrlaiP6d0Ljt9+fC0weUYDy3NImb3jX/UvBUeW7CHHlzJqxm8GwvuS/tPBGivTz qfj4z5EcQGzvz3sAaVDHYFNz13JjLfPCFJf1OOlVLZ9W7Ve1XfnQaUfjOC4m6WOGWA5F tCTz+J6iQHWGPfyF3Hm3+aA9wBJEpuR5BihRhUdhrrCP5l5ajjiAFiiIJdAymq8lswdK 36fxcg2g9f/EhM/riuaIf6DufUMtw3beBAm7d+X/KbDJJ4mTDMwunpfVtqLj7S5A7b6r ckjQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=MT/iXUXPBpq/9WSFSp1Y4vR4x/pfmP2inCp8XovUenI=; b=IIP3M5ZKxr4Nj02/sEyF/z+HQh6L02NeGLg3aTs+Bdi4ujiCn7/tDOUS9a05HEVz+o MQF54H4H09R0AcNhkfqDt1pi91eWdleuv0bW148WDrAXT0+UIKRNTpj3uoZZ3wdgVwuW ZW+JI3IvvxS72PPyAm8tnto1tKIvcZ2GSQDThiME8x1zFEC1d8CfISlY1eojkvvysr23 dVh2fEWzDqZ8TjKgITy4GBJ79ObJGtEYu/MIn0Lt3Tz1Z9eHDMBMAx9LvURna9Su6gmO O14Y6C8JsY4t1K19Tp6QoshcvmEYUIG5Us6oVDvJtUHNap+nVlXCu6LNA0WLLO/y32Ia Fbqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Zjen7Tam; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r4-v6si31286485pff.24.2018.05.28.08.59.03; Mon, 28 May 2018 08:59:03 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Zjen7Tam; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9DCDE7481C; Mon, 28 May 2018 15:59:00 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f47.google.com (mail-pg0-f47.google.com [74.125.83.47]) by mail.openembedded.org (Postfix) with ESMTP id 2C52B7458B for ; Mon, 28 May 2018 15:58:33 +0000 (UTC) Received: by mail-pg0-f47.google.com with SMTP id a3-v6so5424085pgt.13 for ; Mon, 28 May 2018 08:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u6p/DpSapBT/mTbcHBPd0bwWfiu/TxHVWIEahU7rXyk=; b=Zjen7TamBvC6tegB5OnsO5y9DSSsv1uIb9bGEfx1QnnqT5nrIsM1zlhWIzGYYyHQzf AMDx+L5LL25TmM46+kCYpauXphWs5jgNu4kLAInQPgbIoAqh0NuSJ+heM6Uak7GaFXFL 4qZGazKVmrt1PQhu/63o9ljP2amB1yMekjmCfYVeRGKPbZD22KOqbnaXV+pubKVVxeLA 6SmbaTIchGVDNT37CZh9pYNY/blydh9+c1/i3iK2lKvk+hoeRI0wQI+PP+H0GyR09rBr Gvmpg9aAxT6XS86TI25TuY+ZuZ93d7apCsM05NlkgS3l/4QJcbhJ/QU9uHyFG775axug HF2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u6p/DpSapBT/mTbcHBPd0bwWfiu/TxHVWIEahU7rXyk=; b=YapZID3/C5AVDvek4LB6V2fYMomNw3EYV2xbjQ78sq87y1JBe/HpPRd4cJx4BfBSFG S9amtHVyb5vffwPquIiAj/n/29PY+RuUl99NDw5zK7vAdWQDfutHK8bbQNsj6cFtXdIt TyyuvSNU/GB4KDiy5HDyVMKGjEWPcfVGCBWGj2Hb2Jue6EyLsGsFcFsCTxJUGNtB7fwC W4qDE+AB+XBlAGM20iUpovHWcR2hictPhOhpvDIYTqe+4qOsRdKi4bMt0bOt/Sa5k4UC kTkm9Uy0dXtO4npFuZ64VMLZq43ocQhN5FT4YMRU/LKndsxX5YUKpOPuRCh7/5GQQOfv tWhg== X-Gm-Message-State: ALKqPwcUD29Q3svVcPT7Cu62Olb7oUnDNsUQS9Iz/OM115VyX8/1OiIw hrL1yAuJbTvxCXajEx2phX32yg== X-Received: by 2002:a65:418b:: with SMTP id a11-v6mr2151396pgq.118.1527523114488; Mon, 28 May 2018 08:58:34 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id v15-v6sm63041892pfa.107.2018.05.28.08.58.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 08:58:33 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 28 May 2018 08:58:32 -0700 Message-Id: <20180528155833.24224-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528155833.24224-1-raj.khem@gmail.com> References: <20180528155833.24224-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 2/3] systemd: Define basename() for musl 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 Signed-off-by: Khem Raj --- ...patible-basename-for-non-glibc-syste.patch | 33 +++++++++++++++++++ meta/recipes-core/systemd/systemd_237.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch new file mode 100644 index 0000000000..736d525ad3 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -0,0 +1,33 @@ +From 5f1f064c81ea30acf93cfa0fb466b38f094f488c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 27 May 2018 08:36:44 -0700 +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems + +Fixes builds with musl, even though systemd is adamant about +using non-posix basename implementation, we have a way out + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Khem Raj +--- + src/machine/machine-dbus.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c +index 2d7806491b..9a3bdb1d76 100644 +--- a/src/machine/machine-dbus.c ++++ b/src/machine/machine-dbus.c +@@ -29,6 +29,10 @@ + #include + #undef basename + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif ++ + #include "alloc-util.h" + #include "bus-common-errors.h" + #include "bus-internal.h" +-- +2.17.0 + diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb index c4743a6b9d..2e6558ded1 100644 --- a/meta/recipes-core/systemd/systemd_237.bb +++ b/meta/recipes-core/systemd/systemd_237.bb @@ -53,6 +53,7 @@ SRC_URI += "file://touchscreen.rules \ file://0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch \ file://libmount.patch \ file://0034-Fix-format-truncation-compile-failure-by-typecasting.patch \ + file://0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" From patchwork Mon May 28 15:58:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 137103 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2993504lji; Mon, 28 May 2018 08:59:08 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrvx9Wgaui/au3C67MopTe5Z2UlKeRLjyu/hLz3IQ5wB/y1YxqlpIPWyE1FKSbHwUA6TAaN X-Received: by 2002:aa7:864d:: with SMTP id a13-v6mr14082891pfo.199.1527523148036; Mon, 28 May 2018 08:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527523148; cv=none; d=google.com; s=arc-20160816; b=tGo1BBGyyI10WkFCmkARGAtrO9LbY0Lv++aSkWEW9xpAXKz6QJAWoDC8rIy+WJHqqn 2jOR2mFtEQcSOcPLPfR1CM1IkrLuX1BiF8jhSnum+dbWBxiIsQ6nuOCboyvFQmTHB1ME U75qAD3LYv+0KyJ4CPs9pbdEqKfuVofmVp6DWT6612stEQF3UtQUFX1pqOnqMcH7u589 WEULO/XqSTzgl8puRbngYUoucdrood2gHWaWSpa1UiyxBLmzxbUaWA/4NPbr2pvTBBuU EEAd1DnWGW/IKFwwslKQ6oRCDQEEJwi3PtWFUXsmNMtF3BEPf3G48MlnXcyMgKEbRP6x ElUg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=F3jbqFmqGvA7Q/OL8FLX1+EYoqsW8gfFfByOXKxGqJA=; b=iOb+Zvn+FG0bgcSBuZYVaOkqnZqLMIpsHLabhDBIZE5d5GmTV1B6VKMf10LSPZnpbT dxqL0aTqLw62N0Gak3SALLawdgjMZ2lEjL8tzsm49My7cbJklhGNE9YzdCgVSNiPTu57 FmgDTTNaifja4ik6jQq8rv4hjkMrITV8wEG8EwNC739QBtfSL1OUumoQSmI+pDKBZY8z d8qPaLr4PxR/GGxulp9SoHMDZWWfrZEOl/Tl6jZbg/U/QIyCvZSz9cmsq+Dmta8lD2MX Z82tEQOPX2f5twT6EjK5VVs+APC+YrPPnLVCE423pr4s9tysynTQQTiqLqgzAWvgMGNM 8mig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NDDlmD8+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m10-v6si23589312pge.245.2018.05.28.08.59.07; Mon, 28 May 2018 08:59:08 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NDDlmD8+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id F0F8574826; Mon, 28 May 2018 15:59:01 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by mail.openembedded.org (Postfix) with ESMTP id DC93D74814 for ; Mon, 28 May 2018 15:58:34 +0000 (UTC) Received: by mail-pf0-f180.google.com with SMTP id q22-v6so6013730pff.11 for ; Mon, 28 May 2018 08:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R97CogIa24/7UpdUKhE3ifhhLZfJLLa0BxqeWttH4xo=; b=NDDlmD8+HXK1lyqSf3xIw+WcgVxrzJYnLodrX/32weo4qFcE6w7hkVJDTdMQXtyQ6K REcGZEkJXe6Xr6z0VzXAX6MhaxjAngOD1nX48r0OG6IJlohdlnIX4l5EOTA57HW+y4IZ dGQJRm00DHpfBEQr/KmjY3JikjTgTkmmyhw5SiL9eel/7nswoFJteWJZ6DAEWlYF5ICA oZlqh4PnURyIwvan3BV/xaC5+UyQ9y76ZWPh5Pm/isBF5ONPGRgq17Tikqc8fok98NEU v9waKNNJWAD+NjtoENQdoMh2KxT9WMTbdpj13YBASFKRgZj2+8UV2JPeDqx0O72LPc3o Bp5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R97CogIa24/7UpdUKhE3ifhhLZfJLLa0BxqeWttH4xo=; b=D64L98WG8u1Ly3WcObLnGBl3mL6jkCqxhqQgYrqaJPVvccu+F65gX2TE3YXsyPsDQ/ cAusZJH0OeBJlLXh5OeNv1TNJjTCiF3qwv2ZAWDTU9zmJcX/ODBBDZCn9WoFaAcS27YJ yfd/qTPAIsad0K6nGhTWET/StoizBQGlk3Uj4y1U3e1H2S1BeKzanmK2ybxJFKwWW/EI 7H9recnQT+39hMJvyTSttpr3fhjk3r2+82ATiH/Vd8UV3TgBm8psa6fVMypVPk0BxS25 UEBE37A+6Tst+lkLtGT7n/LslbaxAA8DB8EeK+4Jxzb6RQ/Sha+q7uUByI9vGkuslK20 NAqg== X-Gm-Message-State: ALKqPwdEclSYHlkCu7qTpCkM0Ymomylm2IzEbaLnkiMLcbFj6Em1Dl7e V77rMhj+xLCUhFmm9Zj1CQTFCA== X-Received: by 2002:a63:ae43:: with SMTP id e3-v6mr616217pgp.181.1527523115286; Mon, 28 May 2018 08:58:35 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id v15-v6sm63041892pfa.107.2018.05.28.08.58.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 08:58:34 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 28 May 2018 08:58:33 -0700 Message-Id: <20180528155833.24224-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528155833.24224-1-raj.khem@gmail.com> References: <20180528155833.24224-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 3/3] rpcsvc-proto: Update to 1.4 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 Bring in an important fix https://bugzilla.redhat.com/show_bug.cgi?id=1559181 Signed-off-by: Khem Raj --- meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb | 4 ++-- .../0001-Use-cross-compiled-rpcgen.patch | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb index fdeafe283a..cb5b288c48 100644 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0daaf958d5531ab86169ec6e275e1517" SECTION = "libs" DEPENDS += "rpcsvc-proto-native" -PV = "1.3.1+git${SRCPV}" +PV = "1.4+git${SRCPV}" -SRCREV = "abcf24a09665b3def0f54c87d2acd4796de5d83a" +SRCREV = "9bc3b5b785723cfff459b0c01b39d87d4bed975c" SRC_URI = "git://github.com/thkukuk/${BPN} \ file://0001-Use-cross-compiled-rpcgen.patch \ diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch index 4ee4940295..208974004b 100644 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch +++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch @@ -10,17 +10,14 @@ Signed-off-by: Khem Raj rpcsvc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rpcsvc/Makefile.am b/rpcsvc/Makefile.am -index 83867c0..4753242 100644 ---- a/rpcsvc/Makefile.am -+++ b/rpcsvc/Makefile.am -@@ -12,5 +12,5 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_prot.h rstat.h spray.h \ +Index: git/rpcsvc/Makefile.am +=================================================================== +--- git.orig/rpcsvc/Makefile.am ++++ git/rpcsvc/Makefile.am +@@ -12,5 +12,5 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_p nfs_prot.h rquota.h sm_inter.h %.h: %.x - $(top_builddir)/rpcgen/rpcgen -h -o $@ $< + rpcgen -h -o $@ $< --- -2.17.0 -