From patchwork Tue Jan 30 04:31:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126199 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp3021683ljd; Mon, 29 Jan 2018 20:32:37 -0800 (PST) X-Google-Smtp-Source: AH8x22697I28aRH8hxpntyZ5h2M0rWzbFXBVPPkwSZ/Dekut2B8WVBzkbc+Q+/osSkvKKfdjy2Kt X-Received: by 10.99.132.200 with SMTP id k191mr22406040pgd.177.1517286757583; Mon, 29 Jan 2018 20:32:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517286757; cv=none; d=google.com; s=arc-20160816; b=fjzKYfZwxX97caVbbi5ekABsg1QmsymMvTrmxHTsUlk3L5+en3loiIPoeV8E5pstFa /+mrMpxvllB5ySXjF00xEfunY7bWV9OSzxNv9l/ld+g6SYA+RtnY7Ik8utomnzSYXGiH 5XlVwSySXgjOO7b4tubiJ4Xh73vnVwsz0cRt0qopy3vNHa2bbWQr2AXne18klQvEiHjO zDa307++ZCkqt9Y+ux5mPqIODWGgRyadmssdK0ZVwVj6Rskm9+A7AuO4h48PYbjj6pWl EB+vafOWF7sTWMXFx6K1AiwWO3IFmQJH/Tpey9ugvgWTm6MvSFOd78baAgKykBfaNrFw oZIA== 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=pakZBA+T0wWwmRflETByOHmWXfbTwkSZLaNCFqaq+5I=; b=RRNp+ixKrYwQI4Zdm9uFLJ2oW6j9ecYHCWzAmyJRhQcIGAlinDOboVckmRzzqr1A6u uC9UNEoiO5p1/vwm0hls2fy97DqfcHg9V9OR2tN38T7HrQFFgnryOm87O+9potQIoiLE hvM5G43JuyD5VBpf3e02Y5MdTOgz9fSHrvB44lgaamhDeurAvg6IzqFzf1id9rU4114x KpkHozvh3NRlf34qlLyBq2I4UEIhkouEyaITPhdUgriJo2+VOr0xMoXPK/Vw1Dwg1iPO Ath3goYJs+2ZDJnwVMAp8fRz7TMpl0MzRqh9qRaEqL4HeYTbZqYpEekJQivc1iHNmh9t OKhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PTHg1B7T; 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=NONE 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 bg5-v6si1270407plb.822.2018.01.29.20.32.37; Mon, 29 Jan 2018 20:32:37 -0800 (PST) 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=PTHg1B7T; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AD5F4788C7; Tue, 30 Jan 2018 04:32:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 7EDD178872 for ; Tue, 30 Jan 2018 04:32:09 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id e76so7619313pfk.1 for ; Mon, 29 Jan 2018 20:32:11 -0800 (PST) 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=BnkiC3ww1ECrLLLYY83d3CzFfK0uz+JiB+ssjfL6iI8=; b=PTHg1B7TMaZ7jr8xxJBnq3suFeChQrUtzzfCENSUO9PyoeZF/rDZHKp2uNYpLid5LL ige6z2pwlLKaqvUwGfGK71MS7qFB9U8/PrTRMN36dBbnp76nJ/phWNngSjL6ub/SOSUm 564PpVcmaFHjt3Ja/vfDR7cgnAMLzOmuWVVq+dLMIKZrr86I6fpI5ksWv+MkZ7BFRCE/ A/zJndHIUBbZK9gutbOIhxa0iFE/zLVjCyIyGBKWGguDNtQJaxUzdWCJCEUdewegXUzd oQdnwg4LXzQEDeBjvTky3cp8PGpFWadwHY1Z/4Io5YXTmWZqHju6f0BzJ6Wg2PLMSqGh gOJA== 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=BnkiC3ww1ECrLLLYY83d3CzFfK0uz+JiB+ssjfL6iI8=; b=qEZaKLUxj8jkEptAhjW2UV7R1FHAq9U5g/Xz3ZPtq7bFPqRW0eI4aOTrEnVmAzrphT rhVW+gSQnYY2n6DVJs/RiZI5rBGHjR66uUB9e/B8D+wEVJ4K92lnF6VaC2YOyTvh4YlJ gbYTnQkKazvZeTlh5fgo7eZkAcYUJLDImX5FQyvze2bjeu81/OJ27PlIKS7e3XQsZCnj rlYP/ULVCjRNpm+t/8UCbVYASBchl+is+bYYDjGUZ5Xx/iu0Rp0cUmnX+N56kiMJNKIU S5KIuuEygGNxYFPaQFjdcp+CzRzP3+hvfptjyEC7FHTwqzmeQ6iNr6YfeKmKboIVacnT Uevw== X-Gm-Message-State: AKwxytdCDSoKAaNYqWPti37lR026hH/BlsVeWljN1YD4wlERewsZPVFZ lu2Eo6Bv5smgA4gfvLatbYirIw== X-Received: by 2002:a17:902:8284:: with SMTP id y4-v6mr3361630pln.194.1517286730777; Mon, 29 Jan 2018 20:32:10 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::a8d6]) by smtp.gmail.com with ESMTPSA id u67sm1134233pfd.169.2018.01.29.20.32.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 20:32:09 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 20:31:53 -0800 Message-Id: <3b73df7a319fef412528dc1335e1f148a7aa0cc4.1517286478.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: Subject: [OE-core] [PATCH 5/8] systemd: Fix build with glibc 2.27 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 --- ....c-Change-the-default-device-timeout-to-2.patch | 7 +++--- ...update-header-file-to-detect-memfd_create.patch | 28 ++++++++++++++++++++++ ...c-Check-if-memfd_create-is-already-define.patch | 27 +++++++++++++++++++++ .../systemd/0003-fileio-include-sys-mman.h.patch | 26 ++++++++++++++++++++ meta/recipes-core/systemd/systemd_234.bb | 3 +++ 5 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch create mode 100644 meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch create mode 100644 meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch -- 2.16.1 -- _______________________________________________ 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 7f1bc447fe..b7b1ea0886 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,8 +1,7 @@ -From f1b5a6f717bda6f80a6b5e3e4d50b450f6cc7b09 Mon Sep 17 00:00:00 2001 +From 9820c165a9e559cf851e3beb60fad2571de4ded2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Dec 2015 04:09:19 +0000 -Subject: [PATCH 14/14] core/device.c: Change the default device timeout to 240 - sec. +Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -30,5 +29,5 @@ index 77601c552..98bf49ba2 100644 u->ignore_on_isolate = true; } -- -2.13.2 +2.16.1 diff --git a/meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch b/meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch new file mode 100644 index 0000000000..c6431209d0 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch @@ -0,0 +1,28 @@ +From 2207e1ffe4f7e2dcc5e745dadb48738aa1048d63 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Sun, 26 Nov 2017 02:17:06 +0900 +Subject: [PATCH 1/3] meson: update header file to detect memfd_create() + +--- +Upstream-Status: Backport + + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 20b27c860..550dd4ad8 100644 +--- a/meson.build ++++ b/meson.build +@@ -414,7 +414,8 @@ foreach ident : ['secure_getenv', '__secure_getenv'] + endforeach + + foreach ident : [ +- ['memfd_create', '''#include '''], ++ ['memfd_create', '''#define _GNU_SOURCE ++ #include '''], + ['gettid', '''#include '''], + ['pivot_root', '''#include '''], # no known header declares pivot_root + ['name_to_handle_at', '''#define _GNU_SOURCE +-- +2.16.1 + diff --git a/meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch b/meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch new file mode 100644 index 0000000000..da798a79a3 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch @@ -0,0 +1,27 @@ +From 025408c87869962f511de044dd41a1f4b1d80165 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Jan 2018 11:53:38 -0800 +Subject: [PATCH 2/3] configure.ac: Check if memfd_create is already defined + +Upstream-Status: Inappropriate [upstream systemd uses meson] + +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 3674190fb..c7a184d72 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -340,6 +340,7 @@ AC_CHECK_DECLS([ + [], [], [[ + #include + #include ++#include + #include + #include + #include +-- +2.16.1 + diff --git a/meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch b/meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch new file mode 100644 index 0000000000..c466d0d87b --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch @@ -0,0 +1,26 @@ +From 52e922343faaa87b9efb8aa9ea578399ccc9bec9 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Sun, 26 Nov 2017 02:40:23 +0900 +Subject: [PATCH 3/3] fileio: include sys/mman.h + +--- +Upstream-Status: Backport + + src/basic/fileio.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/fileio.c b/src/basic/fileio.c +index 9a185e3e6..1015afd29 100644 +--- a/src/basic/fileio.c ++++ b/src/basic/fileio.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.16.1 + diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 4132cdf40f..d12e94f463 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -48,6 +48,9 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ file://0001-Use-uintmax_t-for-handling-rlim_t.patch \ file://0001-core-evaluate-presets-after-generators-have-run-6526.patch \ file://0001-main-skip-many-initialization-steps-when-running-in-.patch \ + file://0001-meson-update-header-file-to-detect-memfd_create.patch \ + file://0002-configure.ac-Check-if-memfd_create-is-already-define.patch \ + file://0003-fileio-include-sys-mman.h.patch \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"