From patchwork Sun Sep 29 23:55:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 174700 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp6444727ill; Sun, 29 Sep 2019 16:56:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyrqJqmKl1T28qpzNo+SYCz4m1+vZIBJPxGPWl35APxSp3WtQEi/HaPNqrzYiSniqXo9ylG X-Received: by 2002:a17:902:9044:: with SMTP id w4mr16688504plz.228.1569801410910; Sun, 29 Sep 2019 16:56:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569801410; cv=none; d=google.com; s=arc-20160816; b=krnA9EbNcUwFvVO/+qWucJPGqoV01aZBF73vYxI5i/aGl3MOV3l/0Ps4MNYeSxm4tQ mYiEGH3TLw01YF/Si46THVRUP357MXlvA5ckugtYP1sfN8ErIvX0mhqX/qiad6FchE5e JayMxJ038oeo9/PcDDfGChQa4D3Uh0XHUMoYuDsLQt/YPv9dT+Qoez8EbhXIqlzNw/+Q 5zdnPfPl8hn4/2rANRrq2u+HGVhCxGhSq82G9t5dfDrJjohLdsTKPgNyaIrtTEMn5tKu rVm1Fc3YqEAc37SRFFQClNAjMpvjrs+LYt77U+vRWnjJGRZkT+n0hL70/ySNeUHrhSB8 iIXQ== 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; bh=K2WpGqjea9ief1PiBtI/esmcZURkxdPbjCzd8qY83Lo=; b=HzulKxgKN9E/ng3Y3RwaihT5r+eXuVupkiLDb0MDmaG13RjgdkMtlU8Vaxg+b5N5PE w/O0h50iVxllXQQ9VWXQN0H+Sfg8508eD5J1crA/+wzhw/wNakSL2AFiTwsFcnxam/js uM8d+ZSktgmnCqNUvHX6+hexM0TW2i/t8Omd8IItBnwepzmIex0sk4oYy8Q5U2I1bplC 9+gIun7Pv+1fVtmk1VX+twJtU+iIwNy6Vf3Q1cXTHz1vVb3loyVE6+X1iHE+zJ3/WP1B 5Edo+1tvZVuFQbA86oaaKxiO7cRO4PaPoo+Aa8PxqNPcbCVGRlMw+AvX/6ki9Y7HQtY+ Qe1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="BCZ//APG"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 j3si10385977pfi.199.2019.09.29.16.56.50; Sun, 29 Sep 2019 16:56:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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="BCZ//APG"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 242CB7F2EA; Sun, 29 Sep 2019 23:56:19 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mail.openembedded.org (Postfix) with ESMTP id 8C6917F281 for ; Sun, 29 Sep 2019 23:55:22 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id q7so4495097pfh.8 for ; Sun, 29 Sep 2019 16:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ObP6cnjm3WasINurilKzWRcavrYn46HbOvg//zwK4+0=; b=BCZ//APGPevN3ikhH/EuaZjSCalAlWsHZYQYwD3kq5y7K6bbZGtP3OxluSyI2B0C2T c9jhQoXnaI/6FIBtzqmCZ1kwIIHyD71SmINo0rhkvGvP4c43PYjtTqmB3YH6EtfAdxKJ qBJdhlUInfg+twSPr2xyfniKviuX01TQwmQrkCjw7t6kxGfdVxZGEeIa2FfCyUDurRSs Ra9rLu0NsmhclT4xXdprruLgNLktGkLnfzzayRrNm7BGgi69WcnasZm4qNDpOeYn25fR VoshalCBnR+cDKu8rb2G0DLz0MC8jNRfOtOBLtUHtFJwxa2O05eljzjn8E04jeQ5lozW lyQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ObP6cnjm3WasINurilKzWRcavrYn46HbOvg//zwK4+0=; b=lBY0KcamXDW5g2BywbAaHlPFiNtsipONahsP07jF+cnhjmaGaA3ObK9K8ub/JpRRBc +gUhjxxhq7sl/PNaXtRbIg7ztqV62WJJiUb2hOHa+L81lX5fpe5/HjLIvhPfovoE3TV5 GsXKkD3D5hrQ06qUY2ePNAdjE8+ZCV+gwQz0c4YeisvhZVYXFzn1OTf9/tf7RUViJVzK +4Si0BI17hpKEN2imZ9XZOsT183s5WrpYjMXoiaUXQiDW0+xaJ92rTBUYK67U0Qi8s3Q GMUjQbceDAknrSIVwD23vJidBQPKJr/r3nmSzc0kg+0ZIJBOTiFj9F1wtWTY/+Jxqmac 1hYQ== X-Gm-Message-State: APjAAAV8KYBdMI8KR8jMGVo6dWeM9RDjg+Sg5DBNFxoBg23PC63vseS8 ArDSCw5kYrkzhPFu3+KytJOn6zNvLJ4= X-Received: by 2002:a65:6102:: with SMTP id z2mr21156396pgu.391.1569801323370; Sun, 29 Sep 2019 16:55:23 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:a5c0:edf9:811d:ad92:85c2]) by smtp.gmail.com with ESMTPSA id p190sm14474778pfb.160.2019.09.29.16.55.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Sep 2019 16:55:22 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Date: Sun, 29 Sep 2019 16:55:04 -0700 Message-Id: <6748bb66d50cab6acb56a0c4596d9d3c7650e4fb.1569801183.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [oe] [warrior-next 06/10] klibc: Fix build with 5.2+ kernel headers X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit ab3072ee4cf555eb5eb8b6200fd0ffb3eab3f947) Signed-off-by: Armin Kuster --- .../0001-Fix-missing-include-in-sys-mman.h.patch | 36 ++++++++++++++++++++++ meta-initramfs/recipes-devtools/klibc/klibc.inc | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch new file mode 100644 index 0000000..4bedef8 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch @@ -0,0 +1,36 @@ +From 36360b16833400de7818151be5588b16ac4fd5bc Mon Sep 17 00:00:00 2001 +From: Barret Rhoden +Date: Thu, 14 Mar 2019 17:30:38 -0400 +Subject: [PATCH] Fix missing include in sys/mman.h + +Linux commit 746c9398f5ac ("arch: move common mmap flags to +linux/mman.h") moved a few mmap flags, particularly MAP_PRIVATE, from +asm/mman.h to linux/mman.h. This broke klibc's build, which uses +MAP_PRIVATE. + +linux/mman.h includes asm/mman.h, so this commit merely includes +linux/mman.h instead of asm/mman.h. + +Signed-off-by: Barret Rhoden +Signed-off-by: Ben Hutchings +--- +Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=d4853d030639cf3542ae39129c18b654d8d4f020] + usr/include/sys/mman.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/include/sys/mman.h b/usr/include/sys/mman.h +index 56f0b65c..3fd626e7 100644 +--- a/usr/include/sys/mman.h ++++ b/usr/include/sys/mman.h +@@ -7,7 +7,7 @@ + + #include + #include +-#include ++#include + + #define MAP_FAILED ((void *)-1) + +-- +2.23.0 + diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 86aae33..26689f8 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -23,6 +23,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ file://0001-klibc-add-getrandom-syscall.patch \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ file://0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch \ + file://0001-Fix-missing-include-in-sys-mman.h.patch \ " ARMPATCHES ?= ""