From patchwork Tue Jul 18 03:09:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108038 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5335291qge; Mon, 17 Jul 2017 20:10:28 -0700 (PDT) X-Received: by 10.98.129.3 with SMTP id t3mr786145pfd.167.1500347428812; Mon, 17 Jul 2017 20:10:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347428; cv=none; d=google.com; s=arc-20160816; b=sZBDb3iL9AtxusSwtRajzEmbD94s8/xaAJ228NridfBJ4YyE21tE6WCtqtKhXZrJ0V YCDNkhA0QH1Q6GmaZu4fjgWjYyKo93CtNrhYF1PJlySsmvm3o3w7WKHaT64LobTylgyC SCb+4e8aKHBUbpW1Oqmn6PzmWzhj45uQbdAJqueiKvoYjfnbl9f87TsFEn/N/cQgPaSm rqLDqGdS2Mj7ZNmeheuJpxhsP41oGxKx2Ky4JYslF14/aGp0AjYo/AjpontPkgV1MZNc 9uhDNVZsZKRik/Ls79NgIN4uGqck+FIlqOqS/E25xrfr1/yGn/QEepuJdU9/O0hiz5gV 6w8A== 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=PzJSkH6S8q+1QA6dIYwacp188Wp6yn+SbUUMesbzQ14=; b=X1WovyJpsCsYVgJf5TjDlFBxK6Sph4DS69OlELuZELOyZNDaB8XXwWDkKGNEzLAR8T ehq6e2O+3o21KNBwSlM/w6MT6o1YlrWwAbhLCwrxBYJWvDBxpV+Wt0yFAbOn5Ttb+VXH qtiXespJoKnXn13yyDoXc9i0axHxs/j5gQWfGnpFmqgqTFFV/xsjyG5FZnOzp3MKKieF JPcCJGrnN0Bx0cE4+OqT/o6jQ5pkEvCMEDFo6JVuNws9tkTCNsKK6tcP7g7gLgnEXDL4 w5ofotvmEMafqPqVjmhjUBPAMNoVAsgoeTPVWnsBUp3Q51JyNGoI7OC4BqfqPxR7k1tD mY3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ZknbnfUN; 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=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 u22si745454plk.573.2017.07.17.20.10.27; Mon, 17 Jul 2017 20:10:28 -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.b=ZknbnfUN; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4AC3877E93; Tue, 18 Jul 2017 03:10:25 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 3C11977E88 for ; Tue, 18 Jul 2017 03:10:23 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id z1so1059196pgs.0 for ; Mon, 17 Jul 2017 20:10:25 -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=04lNUDGZAQTA8w+18V3nh8+A8HJFiR7EyKYTMTKjL+o=; b=ZknbnfUNqzIUCx7laeRqZpTmljenlVaugozpnSMr8emdBMVwm19nD4HcKfoxaHdL/R nfJUTFnCcZXbDeeJUCcHIbIUAT9BHja+Ugs53MZ6S7nJDEEkfTTXK4ITD29Q5XEOuA7I eELCYMesD/aPWdfk5ERdJr6Cdpnh6qf74/7dNudOh91JZX2kF/2r5dOZQNGIsYCnf0h6 BzDcv8oWL/DlVk5FKaOH3uI4tsbBoVTkGdBSljJqV/tNvT83CI7cqYACELYEZOuSLMh+ /JxRR9E976IfX7nOoXENDBUwVah6ZwRM3+1wvmP3XMNpNoTn2SlSrYgSkn4VPMphjFhS m15A== 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=04lNUDGZAQTA8w+18V3nh8+A8HJFiR7EyKYTMTKjL+o=; b=NccGOKjzU0kEm09R2ACss2la0ap1YyQgW5ZXUvRGHQrZrrMDCi+4quqcJmC+LbDK/4 A40M8f68JgXr/Q0/mwHnolG39yilVvVGkW/Pl+NQAHkNMUM0aqbeu7UXNK44jl9wCveE ryVecM3CLV2BsApV6v/PboSpSoHPBOPkXtBL1t0i+fahD6C0btRqqpUOxw8r8wD30ZCK zVNUlU1rH0nizLVF81ebtRZPKkoSTeaLkZ3GRKk+c7AU6YWBrpsSGO11zwgk0q8d2bS+ hwHpe+8H7q5O2hcgmE1NL4/UrXL583163/OM/cLtQyHGMqHQHUGgcfy0eXBHXbTluYk6 OvXw== X-Gm-Message-State: AIVw112n9OdN4aVOaxVyGFfnaR8M5+yXFzgitOQRn+ZVJ1tw3UfrN8y8 ij0gxYRrlKu0i2uE X-Received: by 10.84.143.129 with SMTP id 1mr820513plz.185.1500347425111; Mon, 17 Jul 2017 20:10:25 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:24 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:09:57 -0700 Message-Id: <20170718031013.44536-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [oe] [meta-networking][PATCH 01/17] igmpproxy: Include missing sys/tupes.h and define _GNU_SOURCE 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 Signed-off-by: Khem Raj --- ...xy.h-Include-sys-types.h-for-u_short-u_in.patch | 25 ++++++++++++++++++++++ .../recipes-daemons/igmpproxy/igmpproxy_0.1.bb | 5 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch b/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch new file mode 100644 index 000000000..82cdc36ac --- /dev/null +++ b/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch @@ -0,0 +1,25 @@ +From a557651a08e21e3c7c7f5eca9f5405f86624903f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 22:42:51 -0700 +Subject: [PATCH] src/igmpproxy.h: Include sys/types.h for u_short/u_init + +Signed-off-by: Khem Raj +--- + src/igmpproxy.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/igmpproxy.h b/src/igmpproxy.h +index 4dabd1c..4454729 100644 +--- a/src/igmpproxy.h ++++ b/src/igmpproxy.h +@@ -46,6 +46,7 @@ + #include + + #include ++#include + #include + #include + #include +-- +2.13.3 + diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb index c3d2f1afa..5424dc455 100644 --- a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb +++ b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb @@ -5,9 +5,12 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=1e995e2799bb0d27d63069b97f805420" SRC_URI = "http://sourceforge.net/projects/igmpproxy/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - " + file://0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch \ + " SRC_URI[md5sum] = "c56f41ec195bc1fe016369bf74efc5a1" SRC_URI[sha256sum] = "ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae" inherit autotools pkgconfig + +CFLAGS += "-D_GNU_SOURCE" From patchwork Tue Jul 18 03:09:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108039 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5335430qge; Mon, 17 Jul 2017 20:10:39 -0700 (PDT) X-Received: by 10.98.88.66 with SMTP id m63mr795368pfb.51.1500347439535; Mon, 17 Jul 2017 20:10:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347439; cv=none; d=google.com; s=arc-20160816; b=vmKE7hu34E/8gbRd11M7ch2dVduptxVpyx/yyZTjp9Qdiq1iV+XU65ByUOmsHFaLLe XOiqSpQGmnR1iZGyDFGE1uu/RvK7n+pnUg6Dm6HQQa1OG6vJT4XWEZ+KLOsUwI67YTy0 yTqhDqcGNAVUC7k7b1ykS8skNBxsWe5a3swi7Rf5l67iqunD1kKZV4DzAPGNfbheCLnX uBUM80zX2UBgBSbWGscKJ1RClEWApdaAJAPMT5v8H2iBjLJgIJkQpMN76r353LbfYg++ 0zj9hvdbzx3nBQk81fscQ2mytQM+OIbQisHf3VSBPNhvTJtgOHn7YcFiNMDd/aRJEsdC BcFQ== 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=wmPIWo+ymU5xo+PUx8RBwQWhmZPqGOAAtoIYJ8s0dfE=; b=YIt9S6QYa9HY+J00SCpU2LOtyDt1lIgg9AhiScgTqqNzUMv9uHBN0pXTqLpPnKbIS8 xtx0MChVPuwG2l1lh/cXWLKKlDZJDVX59QfHyTL6ioHLpQeQIKVJbANoyH+mfiMaVmG+ 8i/0oQy+bb7a091Dkj2iPWd0RzFHHmtPuJxa9AtAqHe9etwfW6/jb+kaugutB7GLQ68o AFNy96EWSYBPAnlmswB1lHooQGp4JTfQsALX0wQm//4GrQKw8xAzhVxKPWuxl6AfEH3A 9RaFAlp2YeB8hRsosJ2Q7ggrDBVLq8bQw+0uomov8rWRAr94z0YthFH5Sr+/BCc1tBJE HxAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=u4fXPRFb; 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=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 n9si752677pgt.351.2017.07.17.20.10.39; Mon, 17 Jul 2017 20:10:39 -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.b=u4fXPRFb; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2605777E9C; Tue, 18 Jul 2017 03:10:37 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by mail.openembedded.org (Postfix) with ESMTP id C4DDF77E8A for ; Tue, 18 Jul 2017 03:10:25 +0000 (UTC) Received: by mail-pg0-f49.google.com with SMTP id v190so4683561pgv.2 for ; Mon, 17 Jul 2017 20:10:27 -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=Xd0HbgPBNvXneRsH/4lbPCZvmlen17w3b7t2A6SmIC4=; b=u4fXPRFbSjzTQ5FpPMmJA1vppgMFnW/2M0vWlWB4IqOELG2g44Q/sOY7lZjhCc1aUK yWFDfQ67Y+b1FHVVQBXckK1k+NYWthPu2+8v7KQStjcoR1M7omTR7WUbmV/cS0JrGKTz w8wv10hOfLXO/t37Xq36LSOjbDXQgmMACeq68JP3uZ/j+TvX/baAhDDrjGmrjUKrdHeY lR5AxErCRpcE5PZ8oselwGI4Atgs96Oi78ggo43uU+i0GXu4Tza7lZDbGy7oRqElC9cR y5UEilKaAda6DqAFAV5yZnLFydIJ7ggE55KK0ZCxGjDzxDvBofAjMvE6ayX61DPzjTbC RhQA== 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=Xd0HbgPBNvXneRsH/4lbPCZvmlen17w3b7t2A6SmIC4=; b=WRagzxbZiGoUfW1uqDBy6C4QKR0Anz8UDPzbiDzUrNcDI8t057QAj7WXrQKHETACiu ReAOSI8TcOnQjKBzfZDWptr90JFuzOOuxH1i5Pl4jMqfK2/xrB7MpktT3KQRW1NwJ/Iw Ihvk6Qxx8tgR61xJ/YQCKzKK++2x+Mqauh5UNuV9S1wSMkd6unre3nR8Lbk10owKlrSi VGJnlVywL32THtuCTdf62hiJBVJWdTioz1E5McV9+2/XbdoK45tpgNwirtPVoBHqG57k HfTAB2gcGBI+6Snz3hSiM4AJ36u2oPzQU83k4eJFw+J1ngJ0eMPMQsMD3tugPEIEWS++ xSJg== X-Gm-Message-State: AIVw113DsImDIc8qVh5oAG6JC0HorcXf2NSme9J40JHpt9mahXRo0cww Z3nzY4smjAzbzyYi X-Received: by 10.84.248.66 with SMTP id e2mr877983pln.118.1500347426420; Mon, 17 Jul 2017 20:10:26 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:25 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:09:58 -0700 Message-Id: <20170718031013.44536-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 02/17] rdate: Define logwtmp if libc != glibc 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 Signed-off-by: Khem Raj --- .../0001-rdate-define-logwtmp-on-libc-glibc.patch | 40 ++++++++++++++++++++++ .../recipes-connectivity/rdate/rdate_1.5.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch b/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch new file mode 100644 index 000000000..08ba2c31e --- /dev/null +++ b/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch @@ -0,0 +1,40 @@ +From e0c690acfcddd3c3421f6eb0182c54815fd70f8f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 23:21:08 -0700 +Subject: [PATCH] rdate: define logwtmp on libc != glibc + +Signed-off-by: Khem Raj +--- + src/rdate.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/rdate.c b/src/rdate.c +index 943d481..685b1b8 100644 +--- a/src/rdate.c ++++ b/src/rdate.c +@@ -41,7 +41,22 @@ static int print_mode = 0; // display the time + static int timeout = 10; // timeout for each connection attempt + static char *service = DEFAULT_SERVICE; + ++#ifndef __GLIBC__ ++static void logwtmp(const char * line, const char * name, const char * host) ++{ ++ struct utmp u; ++ memset(&u, 0, sizeof(u)); ++ ++ u.ut_pid = getpid(); ++ u.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; ++ strncpy(u.ut_line, line, sizeof(u.ut_line)); ++ strncpy(u.ut_name, name, sizeof(u.ut_name)); ++ strncpy(u.ut_host, host, sizeof(u.ut_host)); ++ gettimeofday(&(u.ut_tv), NULL); + ++ updwtmp(_PATH_WTMP, &u); ++} ++#endif /* __GLIBC__ */ + + // Returns string from address info pointer + static char* +-- +2.13.3 + diff --git a/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb b/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb index b3af9275e..cd4db12c0 100644 --- a/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb +++ b/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "https://www.aelius.com/njh/${BPN}/${BP}.tar.gz \ file://0001-src-rdate-Fix-printf-format-errors.patch \ + file://0001-rdate-define-logwtmp-on-libc-glibc.patch \ " SRC_URI[md5sum] = "0a4f612480777fdf25264ac03c57eae6" SRC_URI[sha256sum] = "6e800053eaac2b21ff4486ec42f0aca7214941c7e5fceedd593fa0be99b9227d" From patchwork Tue Jul 18 03:09:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108040 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5335519qge; Mon, 17 Jul 2017 20:10:46 -0700 (PDT) X-Received: by 10.99.171.67 with SMTP id k3mr811603pgp.128.1500347446224; Mon, 17 Jul 2017 20:10:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347446; cv=none; d=google.com; s=arc-20160816; b=LnoOBt/cZFVUh6o7i/I2xFYtOm9b3W3aYbm7SrRMXdvuLh0DhfI7Byoy4XQrqdzSf0 cbT8+nB2ZShCH4S4i7RQbvN3g7y0BxUbPhBuoq44fpvBGNRNIMOVDjxyaRXdCWPmvNvb B+gKpFDg50C1090Jz5ZRbtyr1uSDsTIbc/LYxYaf5yKOlffB1zf49VpkPEoqTxccwsOL tPSsl4oTPz2bYYH05oU2Y3J98qmzB143VHI0R9db2W6akT++8RCjtXCJLX38n+I4kr2y G8V3DO4q0pPoquVDXQCXHPBGBlXy+2j0MNMD3HlWKaFRNcA3ycJ6fqH8WHglXZI3o9Oj tnXg== 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=+Hz/T18POtLbZBvmKxGRM/77nLqul6k/GxwEYTV/8Qs=; b=CGBVpiaVyf23KA1PNiOsLm2W7uYLJAE5b2Q6Y8Wnvc/s0qQfwaAEkTTaA2LENdDxLf PBGFmB8WpPLPNDC8OmB2kA/V4uqjfCFWwXdXcHdvaVBUoVmZ3yvl/epM7FuEAL9NN72M SFQoMutQCREjuXec30TrUYk8LNMozt9VGKNanDnp9yFyfGciyexw3RcCwRTnCKjr50g2 AzEHbberFvp58E0DbMWR8KtW/ldqNaLFhYtwU524RPUD3FDZM0pOA73ub3Sxuf88hT2P 2+QhdVJ6AIxC9gqrTi16tMvx6CHxu44tdjbVFDyyypwHClris+VbiACE5sk1anw3X93w 3y+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=JEnQT2kY; 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=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 f72si731877pff.403.2017.07.17.20.10.45; Mon, 17 Jul 2017 20:10:46 -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.b=JEnQT2kY; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 41F6977FC9; Tue, 18 Jul 2017 03:10:38 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f51.google.com (mail-pg0-f51.google.com [74.125.83.51]) by mail.openembedded.org (Postfix) with ESMTP id 1036A77E91 for ; Tue, 18 Jul 2017 03:10:26 +0000 (UTC) Received: by mail-pg0-f51.google.com with SMTP id 123so4705755pgj.1 for ; Mon, 17 Jul 2017 20:10:28 -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=ZzJfCmQviDgb5h0jIgVcWo1BqPm7gzDHhKxabUzi/mg=; b=JEnQT2kYEz+myOGVyuBwwn+P4/T6XK3D1PUNkhaXAXEDBvjqidNJiAyou0RXunCUX0 7a18F9FkFOtcK+gipOFeKcGwQDXgKsglsYdvDbg+2KkkugZToSxsoJP9zlqi3Xj6tNUz dHdyc0z1D3UNWmOavmdeCY61/uHrBTFdlU65e47zrELMmGYnEXSsEyBzXS4Dzh0DHCEk 8T8PcuyQ8+BFt38usAa+v/RU+BcOTMcCTkGzCnCkkhGERV0qqeiVXsj2zYUSIygBzkHi X7tCzHCxQ1QAtQWyP0KGd0jCPfeQ708OMCyxwglH+zkBK0mgqIN83JC7LGDupRt+ijiI gpfQ== 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=ZzJfCmQviDgb5h0jIgVcWo1BqPm7gzDHhKxabUzi/mg=; b=Whc3TmaibOSIuBAtUbCB+aR615RJ6+FXFzYovqCr9te1B7oKb9BzUZlUMapcP0m5Rv 9vq4LprVGVRwEFktOlm9OvSJi+hBWC7qSOCUfFJfRF/kqdAcYY+jwonAU9Pj9mUUbvlE Cg4t2PgLY1ArsTx2hevb20rFYYB51UyMJKOWDjKB3Cvlt/rahiQJfUOO2yAomD0NI4b+ bevxv8P5VR7jI2DT86pFRPpgfRi08sXVdyuMUbwc9tZ+lryQ8IIQFcKnHvpsdzt9ugk2 ToOZCsa0gLF28YfcFn/rvLNlWR2hsNvRSIDW145j2fg10O6WhnB9QEJaMA++JN91yNZd 8Qew== X-Gm-Message-State: AIVw110+NMB8iL1Jw/GlwuF7oekqg7JCWSQCWWbMhylqe0f8IedWH5RG SYo4MLMqy3g8YHy/ X-Received: by 10.84.209.165 with SMTP id y34mr844519plh.200.1500347427905; Mon, 17 Jul 2017 20:10:27 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:26 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:09:59 -0700 Message-Id: <20170718031013.44536-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 03/17] multipath-tools: Include limits.h for PATH_MAX 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 Signed-off-by: Khem Raj --- ...0001-kpartx-include-limits.h-for-PATH_MAX.patch | 29 ++++++++++++++++++++++ .../multipath-tools/multipath-tools_0.7.1.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch new file mode 100644 index 000000000..46dd8e23b --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch @@ -0,0 +1,29 @@ +From 330028a5a904a0da3788141030e614569dc5aaa7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 23:28:12 -0700 +Subject: [PATCH] kpartx: include limits.h for PATH_MAX + +lopart.c:76:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'INT8_MAX'? + char path[PATH_MAX]; + ^~~~~~~~ + +Signed-off-by: Khem Raj +--- + kpartx/lopart.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kpartx/lopart.c b/kpartx/lopart.c +index 7005445..5efe5dc 100644 +--- a/kpartx/lopart.c ++++ b/kpartx/lopart.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.13.3 + diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb index 93312116f..610ba7a94 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb @@ -45,6 +45,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ file://0013-Always-use-devmapper.patch \ file://0014-Always-use-devmapper-for-kpartx.patch \ + file://0001-kpartx-include-limits.h-for-PATH_MAX.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" From patchwork Tue Jul 18 03:10:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108041 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5335616qge; Mon, 17 Jul 2017 20:10:54 -0700 (PDT) X-Received: by 10.84.169.4 with SMTP id g4mr879685plb.94.1500347454523; Mon, 17 Jul 2017 20:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347454; cv=none; d=google.com; s=arc-20160816; b=u+ozHeFBcrHn6E0x3V/fGcPBM1K9qZk9EqIKc2LzV+wsAIz0wALkKdt9kFHQcn1yIm nFvGWYUTQ2pPndk9AykyaI6HFQkEyPl65aXJFV5U5K4BEYbAuE2qI0XQ4uxDgTsH/6Sl mA6+ZhBXpXuJ0GSc5MXRCzk1k8j0lhXqmWYfmA3Lr1NNiz0o67JTBAsq1gpZADxPdGAb /URJDjJR6e8Npi23bJl6XpwwDUNkKip/aJxqLaNxvQnJHCO+QYF0MWi60BfaSuV3H2CB lK3RTyGwZV3d/4ra+P7j4QibpaIXGFXcAhY8UHqc3vtUDit3i+di4Scp2bz+23jDq5bo 4ljA== 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=2CCyAlhspMOIhqxb87PL7ybzNbIZS2HF0kLjFLZdyfA=; b=ycIhNtH8jZJLYTvDkJXY7WAdl48tV57T26tenTAZlskKi62WMilsuL59y8cpSuWSLR v15euY9+OWolAIIC21piaX5fC5VFEmHgzin898pswoMxwxguNc00U9gisRcjXTSVlz7v FrWCx5EEllJm7KAumR2F+Xnn0Nt/J/r2mejgdZALi5M50zzB0KdEwxPNq6yaQWKAGEB5 BDBmUCIdCal1VaHlr+BQug2bn0i83fJoQyIgdjady3Gb/kclSS6Lx3ce1rr6RJIru7ud FV4e3prY0W5KqTOw9zeoKLGcXTrSDhSrzZ9LQYpJxnX1gmTWf4izH/HHHjV7T4PftBOS Y2Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=vK8fKYn1; 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=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 h191si715077pgc.590.2017.07.17.20.10.54; Mon, 17 Jul 2017 20:10:54 -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.b=vK8fKYn1; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6B19B77FED; Tue, 18 Jul 2017 03:10:39 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id BED1F77E91 for ; Tue, 18 Jul 2017 03:10:28 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id a11so1023453pfj.3 for ; Mon, 17 Jul 2017 20:10:30 -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=1Fdfge968DcTxZzhYt4fgXGXzpNHrEbab9olOC3VYJE=; b=vK8fKYn1aTB5qF5VJJ9kgQqoL6xm534is3cX69nbGDCR+KCkx6QmUjtH3+KDmSylyh PzXsBfbmgeRiWO7sD4WwryG0hBu+1TrozalRAn9OomvVEhUXAJgHCdlYh2FvpZ6kDd1V lDgTnIGKGEKc7R4mP/iBi3S+ytg2fI83IbSKOOp0/x5iLZZUH76y07eRDRCmTV/bldAC 7i53/rDVitfaWVAkJ3bptvPKK9SzI7OaDMbKZ8NGGlGqA5UfW54WM1HXICMQxHgtN0Yu 9seXx5LopKTCKk/QCWNUj0zPIX0MEgwXD58AtGcIBMy3IljV7YgxEeLYJKHlphbmGfac tT/g== 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=1Fdfge968DcTxZzhYt4fgXGXzpNHrEbab9olOC3VYJE=; b=FrIZBTmZMEVazabC251cH4jcKP+uQBdzS+M5P22ERj/KJRz9lvZU2P78D3+eDEUJNw l7GcVbOlrTLJb1wUl9XNLCe3+aoh50/TH3AV8XcMfngT0nNH3BTqwbBobemRrKNWEfwH cI2cYKVSGi+yvfFm645Wu4IG2K/OgMpcIWgF7QlAWQBEYWgVeReViVGwxlJ5i/PvzSHr wYypRc1il6P+oVgh1DDdh7/U63T7YGWVqrDBMM/97jzV93uiyTRj16lwgY6kBmvEmzPd k48jxtobpD/Kl3gmLdYW9B4+9Bqi829G1vexP2cjn78lkyoNaZNLc8Skid7sQ8IvKklq QJQQ== X-Gm-Message-State: AIVw110MPfveQA31yVv7UCktaerS2hhCgtY5T1FPhIQSp2oJVFc58UQf x+np4ePSPRvcOKqE X-Received: by 10.98.19.138 with SMTP id 10mr780803pft.87.1500347429510; Mon, 17 Jul 2017 20:10:29 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:28 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:00 -0700 Message-Id: <20170718031013.44536-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 04/17] a2jmidid: Link with libexecinfo on musl 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 Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb index a520f98e1..59b73f8e8 100644 --- a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +++ b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = " \ " DEPENDS = "alsa-lib jack dbus" +DEPENDS_append_libc-musl = " libexecinfo" SRC_URI = " \ http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \ @@ -18,6 +19,8 @@ SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d35826 inherit waf pkgconfig +LDFLAGS_append_libc-musl = " -lexecinfo" + export LINKFLAGS="${LDFLAGS}" FILES_${PN} += "${datadir}/dbus-1/services" From patchwork Tue Jul 18 03:10:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108042 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5335745qge; Mon, 17 Jul 2017 20:11:03 -0700 (PDT) X-Received: by 10.84.232.134 with SMTP id i6mr865043plk.50.1500347463365; Mon, 17 Jul 2017 20:11:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347463; cv=none; d=google.com; s=arc-20160816; b=R8jFyt/53V0ys7watKFutvQMWM/RZWOV2sNykFP4Ex149+3ePiq6Pp/kzep4GcyfoN NK5baKfLZJpVQsam0Rkcx6iVRPvDULXqJX8yp4zSxSd+4bzWB7yUpiCidNZKhMxbzDXk pVjbzBQZ8HU12c6g0FhT6Spfm8KXlVEVS7/1pk0Q2V8YTPNDcbm/p4A8wBDhqnQlLwW8 mg0d4k62Zztau5PebTEzUpZCA/Uh5vcIeLz7vYt6PMdSDuahAsz31qRtY/t4VxudRuB0 ewo6EuooCUazvnN4ql8l+625Sy0HYlObkI5o2ct5xvBrcwL4BCQJ2nqcPIW6EpbSDFm6 Iy4Q== 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=lom52CujsyTmiedE896dPABtounSWG7z5LPyVJkgerk=; b=mmlw6QkGXJtbQSrPBEDfXZ8VizaO1pOyiC8xFgLn6kG7Gfna2d1b7IY0hl2FVfwlAl l0c9721UL6af1hePDUs6917GrgZ4BxxcFHdNGIC3BbYJ+4PzqgdsQRafa/u3F3M5JIs7 0jgqZTST+d3qDX9V8IhONLCtO2rvuX3wVGtUUBXoldHU43awA42PC+o4u1+mU7RKSt2L 6HQDW3d9T+2UTFGZieaxmD5Kt8DXsZqMBKATDj6/lVs8mm2Jje0QFfbN4029ZmwpSQ1V plYZhHQZOmL4W7CYvQYfIwXHxteE3wShKzVeDtysY1w5zWNUGtqK1ZUguTJk/V2Jlo3P Y9kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=KU1ECJUm; 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=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 z30si744560plh.355.2017.07.17.20.11.03; Mon, 17 Jul 2017 20:11:03 -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.b=KU1ECJUm; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8661B78066; Tue, 18 Jul 2017 03:10:40 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 2D11D77EFE for ; Tue, 18 Jul 2017 03:10:29 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id y129so1044687pgy.3 for ; Mon, 17 Jul 2017 20:10:31 -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=xR6R26k3Eu4pPQkWgRk3ZmNNLg+5h7FdK02qF/yEI7M=; b=KU1ECJUm1TqEeMQjMzAujHWa/bakq6enpfuIN3NJ275CPnc92qL3PzNCS7thN6+z0g z9nunAAVxZQSuxLLeG4Hjg/wsui/any9Za5d3QIrWP5degH53ydYcBS6P3yRALt098HV g7EzKTkK0kXBk7mESYd79Wc1fJzE7jP6mQ4EXMKQQsrsgauFFLOzTVpa/4PWLu/S1kho ZL4cRLHMuB8JroRBRDW/mvl7l9czz/jl94G3WXu1snxdh68660EoDN3NW2rBIA1/H0A4 oSSkrqOAjsB9g99MEPB053OZgcu+CHzp4dWEXSZSNX288O1kjeib7SkK8LezWKhiyBHu pg1w== 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=xR6R26k3Eu4pPQkWgRk3ZmNNLg+5h7FdK02qF/yEI7M=; b=Z8aRLUccifTbzAqwflfdPs4LIkItmQkIW+I70qIvE8qKHnPrGLU7MSx1eQ1b1JOWCy NmClb/JAAxHbYBFkCD+6d8qjlrzd2WYZznlDlFkobxD3B78ywTxgS791nuf1czrRpsrc nMhzTIhMdNN0ptu+8XXFevO4IxWridK+NCLpnLYHRLFJxCzAAelntqLQ54umtVIsMeAA 0+V9BjfYN+q7q1XzF9uWVjeWEQ2A61yBpY7uJGtWi7gR7FRoGrjQsWsJNwbeOkV6yGqm TjOsSaM/ZoWq0YVBr+PFQiiCR5viQ+j5f+E94qbMVHSi/a+EgscQTlQif+csUa8Jfwsj JzWA== X-Gm-Message-State: AIVw110TANZG9UDo6hW7kVsc1yjvPuuhBRbCAIdzf6CpxqS63kXKHF0M xHaepLvgXn/di+1g X-Received: by 10.84.234.15 with SMTP id m15mr798589plk.247.1500347431035; Mon, 17 Jul 2017 20:10:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:01 -0700 Message-Id: <20170718031013.44536-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 05/17] netkit-ftp: Include sys/types.h for u_long definition 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 Signed-off-by: Khem Raj --- .../0001-ftp-include-sys-types.h-for-u_long.patch | 30 ++++++++++++++++++++++ .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 7 ++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch new file mode 100644 index 000000000..8376603ea --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch @@ -0,0 +1,30 @@ +From 2ee0c51d81a0a08d64b64ab624074e5f7cd9615a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 00:07:32 -0700 +Subject: [PATCH] ftp: include sys/types.h for u_long + +fixes +ftp.c:1091:2: error: unknown type name 'u_long'; did you mean 'long'? + u_long a1,a2,a3,a4,p1,p2; + ^~~~~~ + +Signed-off-by: Khem Raj +--- + ftp/ftp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ftp/ftp.c b/ftp/ftp.c +index 7a56af6..5dcb513 100644 +--- a/ftp/ftp.c ++++ b/ftp/ftp.c +@@ -43,6 +43,7 @@ char ftp_rcsid[] = + #include + #include + #include ++#include + + #include + #include +-- +2.13.3 + diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb index 37f5bc725..394a69e62 100644 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb @@ -6,9 +6,10 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://ftp/ftp.c;beginline=2;endline=3;md5=2d40a75a50d83b8f6317b3f53db72bfa" SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-31.debian.tar.xz;name=patch31 \ - file://Add_ARG_MAX_define.patch \ -" + ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-31.debian.tar.xz;name=patch31 \ + file://Add_ARG_MAX_define.patch \ + file://0001-ftp-include-sys-types.h-for-u_long.patch \ + " SRC_URI[archive.md5sum] = "94441610c9b86ef45c4c6ec609444060" SRC_URI[archive.sha256sum] = "61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349" From patchwork Tue Jul 18 03:10:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108043 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5335850qge; Mon, 17 Jul 2017 20:11:12 -0700 (PDT) X-Received: by 10.84.210.205 with SMTP id a71mr822414pli.201.1500347472196; Mon, 17 Jul 2017 20:11:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347472; cv=none; d=google.com; s=arc-20160816; b=mTqBGeYNRHVC5KFFAlwib0VfOyec7ESrG28KyBiUkTDSqGCFhh7WJgNyUkhdEs6tpV YbTZrIzasYLJcOJmUf5ZSAI/KwLxoq+YSPbVFFYzRAIkWWfypB+MPohFsptoMBTyPchC N5EwjAzkunuNdmUmsg9kyF2D2LMxYGj2vBKLCrpZ4q7vX5trZQr9D5ySpxL8A/pzvsI3 2Ajpk7D+NbvLP9fM3YDvzKQ/SjNf0LebHTfL0BUswXJQ+4raQolBLt5JEeeT6ZsgjG7o TiXvP6ouJ9bDs3a3XniF8w/+E18Yb7wSr8oA6BmbNJDUqLaGZ2w38AF/bGWU6MbTO+O6 iN7g== 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=4I3JGez0Kukp6qvWk7Qzgrn4nfmhIe7mwxMksXamOaA=; b=xqcv8CUHah83emvloIytWAyQqiFtpR5qfAPDRwmS/f2vWukVVlopJgmazgrABYYZT0 Jr5tmBfSYTBwVldtLxAlk75W6Rxg+7v6wZV25w7Ov7hUzGMxU0yBbp665hjjEW5k9PR/ ZR1ALRl3svt6z5oA68amOA91lnuO8/hItfzW0Eg7kUyBXIoLCXJyREBY3ec06vqJWmJj yBUKuAY0cr9zsre8F9r177qurD9wOpffBVyP5zX3iBnf9DVh5nL6+Zebmfse8yQqO89n FO/YT8fUwMdEx/eDXpZd1QafIo9ddUJOKwQrhCxD4ImS3UNeoEkmP8pDhnnjBIgii6y7 K4yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=FC6/4Gxl; 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=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 g12si747228pgf.388.2017.07.17.20.11.11; Mon, 17 Jul 2017 20:11:12 -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.b=FC6/4Gxl; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9924777F85; Tue, 18 Jul 2017 03:10:41 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@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 A3BCA77E91 for ; Tue, 18 Jul 2017 03:10:31 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a11so1023562pfj.3 for ; Mon, 17 Jul 2017 20:10:33 -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=7dET+T1FiovB/QMNw7jGiVgPRrySUQUUYbgvjrg+CD4=; b=FC6/4GxlTBtrAUcH5UKY2ZTU7m3RRFqKqcjpzlENVauI11j5GGeVI4sFwpnNdUdbTc mUQX965ab1D5lI8F+9uS7WIRXem0B+hkJEXM8Q7tdkBzXEWI4xp8yKGKdIL0OUov91JX M/usGaxMXgt2tjs06wjefhNJGrJHhbrkDzCpAK/IZJXtK3JVG7fD8/vKdBx4iO+wv6lP XKDb3J9QPsrIEBb5kY4yh7PslTnuqO3NrVk9MOzHO4Kz3xq6n1FjqvrUqpBku4gIHfhJ OVzimuorACt9aBFMcNMkVDucnMdsPCQte20/K5Cz6SmVsrCtBY0zfsB2nc0MF5utYAvc snJA== 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=7dET+T1FiovB/QMNw7jGiVgPRrySUQUUYbgvjrg+CD4=; b=IJBDzC2zKguSzbDYZekMVc/E5r5q85ahznGKRjl1IW1D1eF07xDVq62YeB6s2lmZ46 Fn9dyvYDT8hQA0Wvf639m1THucN1BFOSyCR/N06+jCbRt/uRJvg/E3hX9qFqATDemM5u PiBAiRaD5smgIflroarS9xLsCcS47pjBlgD9kYsyciEZbwIkqzSsNGOQwMOkEplq3OZa SVTdMkwnsW3r1fdakcyc//ORRNMP9XeCXLXOBQq/zuRwW14wddZUImDWVfXXktSsDqN4 EUqnSo4FsgUxMXgXH9epLd/Ec/FqDwJhGjWh3sJJMSdglE/0VS6ZBNkfwOMoe0jgkhfH 2d7Q== X-Gm-Message-State: AIVw1125aHF3UpyxI9QivpXSjzZCBYbrCTBVMsBBwMv2S9/PemJhcQ0N 8cJS9cz8CXvb95DE X-Received: by 10.99.110.1 with SMTP id j1mr802600pgc.218.1500347432383; Mon, 17 Jul 2017 20:10:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:02 -0700 Message-Id: <20170718031013.44536-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 06/17] postfix: Disable nis support on musl 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 Signed-off-by: Khem Raj --- ...libc-before-setting-CANT_USE_SEND_RECV_MS.patch | 26 ++++++++++++++++++++++ .../recipes-daemons/postfix/postfix.inc | 6 ++++- .../recipes-daemons/postfix/postfix_3.1.1.bb | 11 +++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch b/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch new file mode 100644 index 000000000..6b86e3925 --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch @@ -0,0 +1,26 @@ +From 63619acf25151d4dade6d65732722ec4a710a5ac Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 09:54:25 -0700 +Subject: [PATCH] Check for glibc before setting CANT_USE_SEND_RECV_MSG + +Signed-off-by: Khem Raj +--- + src/util/sys_defs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h +index f720e2a..7314c63 100644 +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -813,7 +813,7 @@ extern int initgroups(const char *, int); + #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1) + #endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0)) \ +- || (__GLIBC__ < 2) ++ || (defined(__GLIBC__) && (__GLIBC__ < 2)) + #define CANT_USE_SEND_RECV_MSG + #define DEF_SMTP_CACHE_DEMAND 0 + #else +-- +2.13.3 + diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index 4c794ffd6..0ec182a05 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -60,6 +60,9 @@ export AUXLIBS-ldap = "\ export CCARGS-ldap_class-native = "" export AUXLIBS-ldap_class-native = "" +export CCARGS-nonis_libc-musl = "-DNO_NIS" +export CCARGS-nonis = "" + # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH # current openldap didn't enable SASL export CCARGS-sasl = "\ @@ -70,10 +73,11 @@ export CCARGS-sasl_class-native = "" export AUXLIBS-sasl_class-native = "" # PCRE, TLS support default -export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS ${CCARGS-ldap} ${CCARGS-sasl}" +export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" export AUXLIBS = "-lpcre -lssl -lcrypto ${AUXLIBS-sasl} ${AUXLIBS-ldap}" export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" +export CCARGS-nonis_libc-musl = "-DNO_NIS" # OPT,DEBUG is aready in CFLAGS # ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS EXTRA_OEMAKE += "OPT= DEBUG= OPTS= " diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb b/meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb index dbbe24ca3..839317d31 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb @@ -1,4 +1,15 @@ require postfix.inc +SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ + file://makedefs.patch \ + file://install.patch \ + file://main.cf_2.0 \ + file://postfix \ + file://internal_recipient \ + file://postfix.service \ + file://aliasesdb \ + file://check_hostname.sh \ + file://0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch \ + " SRC_URI[md5sum] = "40d72ea143af7ab0038c2cee1f483707" SRC_URI[sha256sum] = "3deda4c34631970490b1b5fbb559905f93531bf1c7eb00e38b0d0deb1dba9982" From patchwork Tue Jul 18 03:10:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108044 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5335967qge; Mon, 17 Jul 2017 20:11:21 -0700 (PDT) X-Received: by 10.84.202.163 with SMTP id x32mr821283pld.99.1500347480832; Mon, 17 Jul 2017 20:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347480; cv=none; d=google.com; s=arc-20160816; b=QaIzxde4XiYGrneV/VbSqFjZ4CKFQ6AOCUh6K2jw3o4fRJK3J99Dkxk8jxhIf1oe6e 4dshQuCjH3DnxSP1fSLFmy1bkLlC3kGmqm9iNGdPNks1m+gtiKw1xMuIUZoc3nX2z7Tn zsEgTUfjXXzcymtySDdpGJFdumddjZiu1KFMlbsKAnGtQKY/O5ONG4sUeJH3o4nXVOqE DkFdwkzthlNyYTeUQ/2eQLKowXXWAdIuzupHocB0HKkBbrHKEJ4n/ZfHzAVHCYv/tW5l XndX3qcgHx9msnd+Rgs1tXMQR5b3Tzku2WPGXQRZW/JtL1CqN+csCUGZxP5jbpuKuMqf DW3w== 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=jFcnEreXpkrMOGNuPU9VmvGoBHudKYdGZLTveY6MC40=; b=tRykTeyc+AUlQi+NcQ1xOtiiNKdr9IA3K354mln56PV7Hdz4o8ehTvtOKIYH9ffsbT xgSVKqtQkAfagqov5P9PowOgWrwh0qzQoPDO2AbFPK8KBKJ92r2pcyBDmtg0n4rJFJNd gKpcmH9c1p5ccuuGS1Evyt+p6KbpKcFcQZZJ+5ithVL99bXtEKEAa6SwmR7wC4Hc6Agu nkFBGceanpXudXgDcJzXZxWXyogPj83GYBLV6ebR7Jy3g5fZ1g0QysWTaToUF69CBTXX D3dm6Azk2Uczx5hpdTvmtP9n8bCKZRYL8ZbNq3XF9LveDIFYZVHn7YPWBiE2kxjRuqhI qzWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=PtRkQwA0; 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=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 c32si754744plj.292.2017.07.17.20.11.20; Mon, 17 Jul 2017 20:11:20 -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.b=PtRkQwA0; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B54BF77FC7; Tue, 18 Jul 2017 03:10:42 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by mail.openembedded.org (Postfix) with ESMTP id B95E777E91 for ; Tue, 18 Jul 2017 03:10:32 +0000 (UTC) Received: by mail-pf0-f171.google.com with SMTP id q86so4249246pfl.3 for ; Mon, 17 Jul 2017 20:10: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:in-reply-to:references; bh=BNrg951i67z8FX0KTg6MKw/08eadrQLDuRPJe2aC24I=; b=PtRkQwA0BBcORpHa1rvLhnXoMaX2rN8fcgrBQ/WCrUjFcZh8dGb/sX+La+d08MAI9q GqwvBCQr/KreVDZgfn9TzqRWDvIL1+eHnWlkhbf5L/ncrOSa3nyTRxKSz4h9nlEWPF5o tuJMcY0ZJzfY3AboVf+CT3gsUXVmdOGh15/8aUSTNACfdJlleMXuitW7skTmrUpfJV8O 9r9yJy8sjqARah9e0awAS149V65V47JNnd9b6wy7nsGm7O32PP0bbg2+7JKbbLBGbCVY UURV3ctIklwGxGweEeRlzv5yCWKdYmwvLenAYgveNeey2m3wEU1yadt2Ale0w+EWk1Wh Ln3g== 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=BNrg951i67z8FX0KTg6MKw/08eadrQLDuRPJe2aC24I=; b=D9Gbln364BHoD7VuNQL8My9Oe85SlgbodcMWMZy6y4HE9KJgLSeCg7y338JJLV/qok v5Q4dc3phOCnpOS9X/KyuIp2tCb3k4rac1DCg8SUAXSnl2qiFdpCC6rVDiKp6dV+4D4i hSxnG8GZGpaaQAfh1sdesyQczrExYdqkafjdLE/t9M4x8o5FEiMBSZsRFeR9L4T3r8Sf c14SBEpjs3eoaMw00cqHo+LK5g99QZUAIT6SE7egVGhbm/6ewF42FZafm5+0T/ZeGVkz 8VtUOYN5viuCp3A9VQYgzsr4XhmMAXRVmfokl9LnzJLrabFLmzFp0wkAytb+BCB7Uh0s 7W0g== X-Gm-Message-State: AIVw111rJLHxXpglFXyhRK8ZYLcJkCF8KUQazjm39NI0pCiYea296uCI jUrLm5Spbo6Tdxzf X-Received: by 10.99.54.205 with SMTP id d196mr781927pga.79.1500347433701; Mon, 17 Jul 2017 20:10:33 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:03 -0700 Message-Id: <20170718031013.44536-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 07/17] zlog: Fix build on 64bit targets and musl 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 Signed-off-by: Khem Raj --- ...t-pthread_t-to-unsigned-long-instead-of-u.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-extended/zlog/zlog_git.bb | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch b/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch new file mode 100644 index 000000000..71a989103 --- /dev/null +++ b/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch @@ -0,0 +1,32 @@ +From b97f62fdf3b78eb5cfcb3a1b12c6fd62f735717b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 09:29:33 -0700 +Subject: [PATCH] event.c: Cast pthread_t to unsigned long instead of unsigned + int + +On 64bit machines it ends up in errors + +event.c:85:67: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); + +Signed-off-by: Khem Raj +--- + src/event.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/event.c b/src/event.c +index 8f988b5..c632c33 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -82,7 +82,7 @@ zlog_event_t *zlog_event_new(int time_cache_count) + a_event->tid = pthread_self(); + + a_event->tid_str_len = sprintf(a_event->tid_str, "%lu", (unsigned long)a_event->tid); +- a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); ++ a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%lu", (unsigned long)a_event->tid); + + //zlog_event_profile(a_event, ZC_DEBUG); + return a_event; +-- +2.13.3 + diff --git a/meta-oe/recipes-extended/zlog/zlog_git.bb b/meta-oe/recipes-extended/zlog/zlog_git.bb index 51c746fd3..86e6d30e2 100644 --- a/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/meta-oe/recipes-extended/zlog/zlog_git.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PV = "1.2.12+git${SRCPV}" SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" -SRC_URI = "git://github.com/HardySimpson/zlog" +SRC_URI = "git://github.com/HardySimpson/zlog \ + file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ + " S = "${WORKDIR}/git" From patchwork Tue Jul 18 03:10:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108045 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336091qge; Mon, 17 Jul 2017 20:11:29 -0700 (PDT) X-Received: by 10.84.179.194 with SMTP id b60mr859777plc.166.1500347489737; Mon, 17 Jul 2017 20:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347489; cv=none; d=google.com; s=arc-20160816; b=KgBYICLgx/TtoAP2bATWKEpY6+9EDY3f9hMOckx15xajlF9p5h5Ae9aWdkIzy0Dv4V 2S6XTATIbztsXrPgpvB4plBPEGEnrC94FvjkR/2WSrPyNc2qxuawDTL4C8jWc2jFCGmS OgYjq276Dx/cKe4z2NSmhKEi+MKjGBCUaSE9rYG8B3RUfPYaHEw81qcmD6os2YMyX80X p/nnl4sUYfRqD8i8CrWQp6QE5CbImdlvwAhZnQovJcunaeVo6dZq9bHPdN7Ha11/N34r FwH8X6wk1GkAWm2aBXm84Ci2J90mX6bjCpMzlqvvMF4SbnF/ZEbEyFSBWZAe4CBmIkJr YGdw== 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=0h6gEfGbxRJWUX1Ly+tKoHqSZQPLfcwjouBKjbTPqfY=; b=QCJSWwFYZPzlI1jN+0JjBy5Ws705FIiGNFUKVsIFAAIPVDoanu3YMKMj+UCrwImGyM y6a8mQcZpPJtEXU5ZdZZ6R6I0bIZIwM/Bb2hKRM9akQ7qxTvTYEEaNaxcamr6s04NJwq EK6f0CAxGSIwY8I8xyXSu8Ln8RIQwtthliLvhKA5IC3ip1U5LqSAzgrg8+xqerE5BxEP WYlVyOBF0LnKio2w08wyJPNbx5hyw9Ue8Y8L3VlUxSpf5rT+1z2OYxc69QGBSx8+Mc4+ GO4iXTSUoqS1SR9N/T4Had79faIWcUv9BM9wVygEhcqA8zmnFAcJjRf5qOK6yQgZQCE9 aQGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ByLw4x1l; 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=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 82si727686pfk.399.2017.07.17.20.11.29; Mon, 17 Jul 2017 20:11:29 -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.b=ByLw4x1l; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 05DFA7809C; Tue, 18 Jul 2017 03:10:44 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 6CD8277E88 for ; Tue, 18 Jul 2017 03:10:34 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id q85so1025670pfq.2 for ; Mon, 17 Jul 2017 20:10: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=j9PcXtK9nVRWaDGS3bsbZyOCiUQF/Bk0LRLqBE6VdfE=; b=ByLw4x1lwhnsGJksdKf+65meF/qYfTvTJZnPYa6eVkGol6xD/vVzKYSz+QiqY306nV iFQS9HO8kzcRw+Wa2zwVgm9KQZhbEXGKgPJg+o0f5YAakbgREnH7o2Xwi1XP3UPYQi0f hq1I2Dpsyroj0bFDVLmQIzaTIZYbP9XvcEQAMgaTzkO3KW7rMMZBC3BEco3S4dj0Hh5R 7Hh6k0l7D33ne2ReXQr1cVSk5FwIbaOpWjU5D2r0euwnygeoncVMn8Nn7xS25D2ebwkG NJTBTaM9ENS3wEM4tj7pO07fFmX5jAIiehOKfsAOkm9zgQBzYdIu6hsb0Ty3Xns3JSYd b8og== 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=j9PcXtK9nVRWaDGS3bsbZyOCiUQF/Bk0LRLqBE6VdfE=; b=nkbWlrVhgZS6fwf8HhKaYFhuY5hVTY3LHanN0GHg/1fHwLub0KnerPjQ0u5L/DOT/j Ux8j6nIwsmhmyVKDH6k8ovsiZ9pkkfuJd9e+znPkU9K3xkmUcd8zP1QB3uWyojsY5FVC FeCvDsFR8wShNXiqDASNb2cMCkSgM5TO6cOCmMuJSEc3bs/2VfhUw4tqnlEHcNaPViXu R/sWQnPWPo+wyR+ASYMQsoSkSPdwNRCPDQesea+06ML8j13/cr09s9r+fP4puUqykbjR bL+Ipp1jrqEeeiJnDgVIFL/rPeRSophHKMfNy/FdOgMOiNGTE+GwyGkKEr9WzF+TR0SO OSYw== X-Gm-Message-State: AIVw113SWwGHqAHPUez3MprKYMkg5jJpWqLiWKLpcbN+wmlhwJCZ1794 JV5I6nc4AGV8RRJv X-Received: by 10.84.128.14 with SMTP id 14mr839351pla.285.1500347435268; Mon, 17 Jul 2017 20:10:35 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:04 -0700 Message-Id: <20170718031013.44536-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-initramfs][PATCH 08/17] grubby: Link with libexecinfo on musl 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 Signed-off-by: Khem Raj --- ...-variable-LIBS-to-provides-libraries-from.patch | 26 ++++++++++++++++++++++ .../0002-include-paths.h-for-_PATH_MOUNTED.patch | 25 +++++++++++++++++++++ .../recipes-devtools/grubby/grubby_8.40.bb | 9 ++++++-- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch b/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch new file mode 100644 index 000000000..1b1a993a0 --- /dev/null +++ b/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch @@ -0,0 +1,26 @@ +From 22afaa21b4b258082be591e54c99e1ba6fbd7748 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 10:19:22 -0700 +Subject: [PATCH 1/2] Add another variable LIBS to provides libraries from env + +Signed-off-by: Khem Raj +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ac14404..92a8e73 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,7 @@ RPM_OPT_FLAGS ?= -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector + CFLAGS += $(RPM_OPT_FLAGS) -std=gnu99 -Wall -Werror -Wno-error=unused-function -Wno-unused-function -ggdb + LDFLAGS := + +-grubby_LIBS = -lblkid -lpopt ++grubby_LIBS = -lblkid -lpopt ${LIBS} + + all: grubby + +-- +2.13.3 + diff --git a/meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch b/meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch new file mode 100644 index 000000000..de8133a3a --- /dev/null +++ b/meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch @@ -0,0 +1,25 @@ +From 8f844ac7f44b8dc428d06cd6958c5f32d383d01c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 10:19:50 -0700 +Subject: [PATCH 2/2] include paths.h for _PATH_MOUNTED + +Signed-off-by: Khem Raj +--- + grubby.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/grubby.c b/grubby.c +index 47a1a15..59f74a9 100644 +--- a/grubby.c ++++ b/grubby.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + + #include "log.h" +-- +2.13.3 + diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb index 0e9379085..5a998248c 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb +++ b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb @@ -9,11 +9,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "popt util-linux" +DEPENDS_append_libc-musl = " libexecinfo" SRC_URI = "https://github.com/rhinstaller/${BPN}/archive/${PV}-1.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \ file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ file://run-ptest \ -" + file://0001-Add-another-variable-LIBS-to-provides-libraries-from.patch \ + file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ + " SRC_URI[md5sum] = "1005907b275d6d93368d045274537d86" SRC_URI[sha256sum] = "85f1c678484f74c8978e8643451594967defce463a86c35cb1ee56d12767a9df" @@ -24,8 +27,10 @@ RDEPENDS_${PN} += "dracut" inherit autotools-brokensep ptest -EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}'" +EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'" +LIBS_libc-musl = "-lexecinfo" +LIBS ?= "" do_install_ptest() { install -d ${D}${PTEST_PATH} cp -r ${S}/test ${S}/test.sh ${D}${PTEST_PATH} From patchwork Tue Jul 18 03:10:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108046 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336203qge; Mon, 17 Jul 2017 20:11:37 -0700 (PDT) X-Received: by 10.84.225.19 with SMTP id t19mr843012plj.238.1500347497593; Mon, 17 Jul 2017 20:11:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347497; cv=none; d=google.com; s=arc-20160816; b=efRDNVATjYpDZ1QntoFl2zl5Y5fWwWELoRLa0+jYvjfXSfmJKUnykPP7+NDyIPnL+x dJNiKB0jJ0z5ZZvzGbHSUTR3SG9c0CNDli2m8h8f4+ykHNTYvrqRR+g437PXs6iBDi5m fO943l/Q+aFbsxRhdfiDv4EmtLk2qhPu3R4HX4Rkhjpj/g1NtxuPwrCQT1J2C1M4IAix AJcFHviXMqyzV8o9ts4qqhvayybhX8e+fNmAB2ApcK945KNhISsfg41mt9hcYTieMF1b PGuhGxmPk3GkkAd2PgfVaY6OR6pGw/naq6gKODoKAJW9VnVABGfF4TNem46FLH44w98c kXag== 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=ebhkaWClSWyij1vE5EpRgh9UzoF7807hv9YMJar+oV4=; b=LNN2ePTC+BUv2iiRmpUECCtIeQrBBXBpbGdp9GQqlp1sG0OXo2rU+C9hUUVUFoosqO bYGiICsAFr9/bfTy09szdtosGX87zIzDsJ0VbNmVL423DwSuN/RhuwSf157GoUWuglym 3RwJKVfXpg8+OQ08Beb1XkyDq5c4RPaL70z0McfpIbEzG17nxzk5iLdIsi4Bhuav1UMC IAQMQy6G0A0+5bUi8XfmgYwjXV8CKTK8/pG0AYkwfeNV6Ol/a/WbfhI/jGxuy84hXTAC 2CgMamR9fQd9rvB/hclh1++71ue4EOY/9dgh2ZiFzZjIu22Q7JHUgRmnNEa54Mom22Ls M9yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=HvvlVQjb; 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=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 y101si738770plh.243.2017.07.17.20.11.37; Mon, 17 Jul 2017 20:11:37 -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.b=HvvlVQjb; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1B1517808C; Tue, 18 Jul 2017 03:10:45 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 8011D77E88 for ; Tue, 18 Jul 2017 03:10:35 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id v190so1059005pgv.1 for ; Mon, 17 Jul 2017 20:10:37 -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=YuVJSkjymcQ2UArvQ4MYPSrlePelBzsEK1KyMi8GrQg=; b=HvvlVQjby4TCqb9V/grko5AjU+iL+BMJkE/SMdL4rBFfnrxp3nkKGPb/8eFjE3D8Hs B+GeMZLw+ab1+OySd7QhWRcLwlx3oGXT2FLT7V2srSBKgndeUcGNRqWRIA6WDmCEe1oX e4WGGMKzSvbZWS+nva7ej+bkB2+eIQCtni318TnQi3gw0enF0pOQp3EIege8IBKJA2K0 jxllrtB9ukwtAh0eBNmXp1TRmFTOwhhyydne1EI7yDM7G+Q4orleZwoLRt/xFQWD2OCw XcTJNkpqRrHGPXfwYHalW5S9vmTaE+Cr4wrkK8cWk3MCqT8gWCEAOf/rnnDPMDmBVSwI L/eQ== 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=YuVJSkjymcQ2UArvQ4MYPSrlePelBzsEK1KyMi8GrQg=; b=m44Kq5ySGp3DriUcT9K1UJfv+xdZLgTl+YYJEcMwYMEGFhrvJXQ3+iOx6Nqxfoh5xg 9znp2GZ3iDo9Z1/1TDUjQIrA2p85GOzhmj/HudK/WKw9DPcb/fGSqt4//8f2WjTE0WAL qYodrGk4dzQi6HJPBlpat7sjRDouh0LgL7pX/ACT+xq3h4E2n1MFqH9NvxPJxZn0RfPR rioXqvYSy7H1HD34HIbGrMOdp4wM7a/3Cx7CjZTZQf7HkSjXStu7Z+PNuF/vOkyQrBWX ++VPJLL2jamDtAWKEVdbg8k5258m8N4qLAJgyx0eXuwB3VwPsNpmyNwy999O6HJv2x5Y vFCg== X-Gm-Message-State: AIVw110dcvYQ+P4CmH/UloxXuhZ4SdkRfqyPhcaDF2rEmW0YPWKK/wcl X1ferjkBCVt/BTKP X-Received: by 10.84.133.11 with SMTP id 11mr841626plf.77.1500347436624; Mon, 17 Jul 2017 20:10:36 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:35 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:05 -0700 Message-Id: <20170718031013.44536-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 09/17] numactl: Update to latest from github 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 There are patches to compile it on musl upstream therefore switch the SRC_URI to fetch from github Signed-off-by: Khem Raj --- .../numactl/{numactl_2.0.11.bb => numactl_git.bb} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/numactl/{numactl_2.0.11.bb => numactl_git.bb} (88%) -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/numactl/numactl_2.0.11.bb b/meta-oe/recipes-support/numactl/numactl_git.bb similarity index 88% rename from meta-oe/recipes-support/numactl/numactl_2.0.11.bb rename to meta-oe/recipes-support/numactl/numactl_git.bb index dd159a3b1..f2d9a1760 100644 --- a/meta-oe/recipes-support/numactl/numactl_2.0.11.bb +++ b/meta-oe/recipes-support/numactl/numactl_git.bb @@ -10,15 +10,18 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9" -SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \ +SRCREV = "ea3a70681c2f523fe58e1d44527f478ca76db74e" +PV = "2.0.11+git${SRCPV}" + +SRC_URI = "git://github.com/numactl/numactl \ file://fix-null-pointer.patch \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ file://0001-define-run-test-target.patch \ " -SRC_URI[md5sum] = "d3bc88b7ddb9f06d60898f4816ae9127" -SRC_URI[sha256sum] = "450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861" + +S = "${WORKDIR}/git" # ARM does not currently support NUMA COMPATIBLE_HOST = "^((?!arm).*)$" From patchwork Tue Jul 18 03:10:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108047 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336312qge; Mon, 17 Jul 2017 20:11:45 -0700 (PDT) X-Received: by 10.84.173.4 with SMTP id o4mr861634plb.180.1500347505615; Mon, 17 Jul 2017 20:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347505; cv=none; d=google.com; s=arc-20160816; b=BCdL4KOG/ct1SAmgiiLVJHw16yCHJ+AOFUcli08jnDbnDxkBRSkqI4OMfsYjvUHqhO V/CmR4Wn3OZMWQw+SFOHVA7vcqQ2gUH4OLC1RYGXuSL0Tk8/ME5SGS8pRKAWLTheYsaz S4GxCNBgkfrin0d4BaOBwg73ztqFF1L74tvfiWVputRUJOKakFJG/VInClKqMfNxXPq1 1927t2CLLNZPtG0/Ig80dz8ET1zVbDsDD3TJICKvyC1DmrowHwJnO3qCQMt+EbUyX8KM DWuLQA/XQk7DNdnRI70FKOkk87HxIas+UHGgmwiN9rgTBeysOJv8yW4Mx8yePsGOsjDG +ZqQ== 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=KjmexyPf6sau20mB6uhefXCD/kzPuEH49A7A79s9+dc=; b=IeiklYB3TcMYr69beORNdi3DI6gSTGTaVQOzVjJh6OmzKhGxQgjeg+RVaKCbZScBlo PWPZC720/nESM4vl+HdWHG4SSioJYQA/9XN6eXsSKdAV5N/9Uqm1f98Jgle863eezJHB 2V8/VApf0glAM7qjoJEGVnDu/bK1ksvFBMmdnHDlvJYZDTgU0wAOA4i5CbP5ZNpIZVKH Rg5Je4u2S3gHiniGfJUtgVTRUlv3UAURDxgcSRd4u6TSET+XNhAD7oWrDmFxXj+2OADF Q5S1xIGaxfl8Ug4aJJ/jyL+6vJpzwO7dNVhqyDbPNNsrHlIXxdiZdyUY01oPYwIauAb+ J88g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=rgrkadYd; 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=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 n123si730982pga.575.2017.07.17.20.11.45; Mon, 17 Jul 2017 20:11:45 -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.b=rgrkadYd; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2A489780B8; Tue, 18 Jul 2017 03:10:46 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@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 6A43B77FC7 for ; Tue, 18 Jul 2017 03:10:37 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id o88so1030594pfk.1 for ; Mon, 17 Jul 2017 20:10:38 -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=SvE/B1fxGmdMiOGRs+Xxuh0j5MfeKr6pWz32IJo6jwg=; b=rgrkadYd+X3o5IwDqp5k9isBahLhHXbematQaUZ65ZYRB644xZqjNWP1093sgDjyA/ hLM2Bd3kyigY0UU4tCHhV93t0sFHi7IWvUSpva1g6cDNwxIiQHKmq8OQinGVafLflUiW UNsoMs35Sfs59OSaHJLck9lF+7za+Lf29oo7g1gLmTdhYUEA1eNqyqJMpRRUZz2SXhRv mMBb4SQBQZssxpWM/EG2pdfXWnwESVTJyNk74UUr9VGR/AYqbXJtbdCkSMS2OPItYpqu h+HgYa7UBow6vNey2pNCnL+DU7Zbwrq5sovH55FxAzRwldFPgtMAopcuw/MA9MDw5sBV 14fA== 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=SvE/B1fxGmdMiOGRs+Xxuh0j5MfeKr6pWz32IJo6jwg=; b=fs9Qsyxb2Sq/vJEENYTmPXA5fAsewqAQY3VAjEVIpG8tv4EnDxe0Q2LShPxhHoYtXi BjH5dbQUldGG3bkU9gllGbpiU7P9iGGnogSMSdzwXDEUpWofEbqUFFA9GDElh4zLIrGP /gwAkC3fPk9GlOX9gin2oldOwC0uikp5V1NChrRsC/D9VMF95pg3snkbRQpoY9H07IHF pUi6YNXElF/IdbS3gWAA0Ryq9DgxJMZzmc1tPN87osfopmKFDwd4/fIyZOa45eI//j5A pZw1s3l3g+m2RbjOpz6COTtkgfa6Ie+bVFjfneozYSNBPpqcNybL9ReLCJKW3KXPN4aP Yy+A== X-Gm-Message-State: AIVw11112/GbYW1kWDGxyP+qP5rTDyR/pefhJutIW6XEpmlou47NxxRL tkXCIgLmEpavMGwy X-Received: by 10.84.216.2 with SMTP id m2mr857171pli.219.1500347438218; Mon, 17 Jul 2017 20:10:38 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:06 -0700 Message-Id: <20170718031013.44536-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 10/17] efivar: Upgrade to 0.31 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 Signed-off-by: Khem Raj --- ...some-extra-const-that-gcc-complains-about.patch | 44 --------------- ...Do-not-use-__bswap_constant_-16-32-macros.patch | 37 ++++++++++++ ...-version-new-way-symbol-versioning-breaks.patch | 66 ---------------------- .../efivar/efivar/0002-disable-static-build.patch | 33 ----------- .../fix-compile-failure-with-host-gcc-4.6.patch | 13 ++--- .../efivar/efivar/musl-strndupa.patch | 17 ++++++ .../efivar/{efivar_0.24.bb => efivar_0.31.bb} | 9 ++- 7 files changed, 63 insertions(+), 156 deletions(-) delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch create mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch create mode 100644 meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch rename meta-oe/recipes-extended/efivar/{efivar_0.24.bb => efivar_0.31.bb} (83%) -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch b/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted file mode 100644 index 4ae8cb90f..000000000 --- a/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 29a2dea16113b5a8e51de46437c6a9f7426c5867 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 6 Feb 2017 14:28:19 -0500 -Subject: [PATCH 1/2] Remove some extra "const" that gcc complains about. - -One of these days I'll get these right. - -Signed-off-by: Peter Jones ---- - src/include/efivar/efiboot-loadopt.h | 4 ++-- - src/loadopt.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/include/efivar/efiboot-loadopt.h b/src/include/efivar/efiboot-loadopt.h -index 07db5c4..efc29c6 100644 ---- a/src/include/efivar/efiboot-loadopt.h -+++ b/src/include/efivar/efiboot-loadopt.h -@@ -32,8 +32,8 @@ extern ssize_t efi_loadopt_create(uint8_t *buf, ssize_t size, - - extern efidp efi_loadopt_path(efi_load_option *opt, ssize_t limit) - __attribute__((__nonnull__ (1))); --extern const unsigned char const * efi_loadopt_desc(efi_load_option *opt, -- ssize_t limit) -+extern const unsigned char * efi_loadopt_desc(efi_load_option *opt, -+ ssize_t limit) - __attribute__((__visibility__ ("default"))) - __attribute__((__nonnull__ (1))); - extern uint32_t efi_loadopt_attrs(efi_load_option *opt) -diff --git a/src/loadopt.c b/src/loadopt.c -index 64e333f..ec50722 100644 ---- a/src/loadopt.c -+++ b/src/loadopt.c -@@ -336,7 +336,7 @@ teardown(void) - - __attribute__((__nonnull__ (1))) - __attribute__((__visibility__ ("default"))) --const unsigned char const * -+const unsigned char * - efi_loadopt_desc(efi_load_option *opt, ssize_t limit) - { - if (last_desc) { --- -2.12.2 - diff --git a/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch b/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch new file mode 100644 index 000000000..73a772186 --- /dev/null +++ b/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch @@ -0,0 +1,37 @@ +From 98b33d4193998687aa3a78c097f7bd4c393e0c85 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 00:29:42 -0700 +Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros + +not available on musl + +Signed-off-by: Khem Raj +--- + src/makeguids.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/makeguids.c b/src/makeguids.c +index da2f5f7..daf821a 100644 +--- a/src/makeguids.c ++++ b/src/makeguids.c +@@ -155,13 +155,13 @@ main(int argc, char *argv[]) + #if BYTE_ORDER == BIG_ENDIAN\n\ + #define cpu_to_be32(n) (n)\n\ + #define cpu_to_be16(n) (n)\n\ +-#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ + #else\n\ + #define cpu_to_le32(n) (n)\n\ + #define cpu_to_le16(n) (n)\n\ +-#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ + #endif\n\ + """); + +-- +2.13.3 + diff --git a/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch b/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted file mode 100644 index 737b78b01..000000000 --- a/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 31e655d2b5f66e772d9714422b7332bbaa60d2e6 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 6 Feb 2017 14:41:58 -0500 -Subject: [PATCH 2/2] New gcc version, new way symbol versioning breaks. - -Apparently I get to redo this every time there's a compiler release. -Yaaaaaay. - -Anyway, the current method is to define the two compat things from the -land before time as @libefivar.so.0 symbols and list them there in the -link map. Then we have the real one defined with another name, and set -as efi_set_variable@@LIBEFIVAR_0.24. Then to make there actually be a -efi_set_variable symbol to link against, we create it as a weak alias. - -This is all completely absurd. - -Signed-off-by: Peter Jones ---- - src/lib.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/lib.c b/src/lib.c -index 6a9b392..afa7d94 100644 ---- a/src/lib.c -+++ b/src/lib.c -@@ -49,7 +49,7 @@ _efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, - { - return ops->set_variable(guid, name, data, data_size, attributes, 0600); - } --__asm__(".symver _efi_set_variable,_efi_set_variable@"); -+__asm__(".symver _efi_set_variable,_efi_set_variable@libefivar.so.0"); - - int - __attribute__((__nonnull__ (2, 3))) -@@ -59,17 +59,24 @@ _efi_set_variable_variadic(efi_guid_t guid, const char *name, uint8_t *data, - { - return ops->set_variable(guid, name, data, data_size, attributes, 0600); - } --__asm__(".symver _efi_set_variable_variadic,efi_set_variable@"); -+__asm__(".symver _efi_set_variable_variadic,efi_set_variable@libefivar.so.0"); - - int - __attribute__((__nonnull__ (2, 3))) - __attribute__((__visibility__ ("default"))) --efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, -- size_t data_size, uint32_t attributes, mode_t mode) -+_efi_set_variable_mode(efi_guid_t guid, const char *name, uint8_t *data, -+ size_t data_size, uint32_t attributes, mode_t mode) - { - return ops->set_variable(guid, name, data, data_size, attributes, mode); - } --__asm__(".symver efi_set_variable,efi_set_variable@@LIBEFIVAR_0.24"); -+__asm__(".symver _efi_set_variable_mode,efi_set_variable@@LIBEFIVAR_0.24"); -+ -+int -+__attribute__((__nonnull__ (2, 3))) -+__attribute__((__visibility__ ("default"))) -+efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, -+ size_t data_size, uint32_t attributes, mode_t mode) -+ __attribute((weak, alias ("_efi_set_variable_mode"))); - - int - __attribute__((__nonnull__ (2, 3))) --- -2.12.2 - diff --git a/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch b/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch deleted file mode 100644 index 951b15921..000000000 --- a/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 126e0d3c1ad74cf5b0abe9e98ec444bcc3c83159 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 4 Mar 2016 14:53:55 +0100 -Subject: [PATCH 2/2] disable static build - -Signed-off-by: Koen Kooi - -Upstream-Status: Inappropriate [meta-oe specific] -Signed-off-by: Hongxu Jia - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 1829d22..c7a0ca3 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,9 +8,9 @@ include $(TOPDIR)/Make.defaults - - LIBTARGETS=libefivar.so libefiboot.so - STATICLIBTARGETS=libefivar.a libefiboot.a --BINTARGETS=efivar efivar-static -+BINTARGETS=efivar - PCTARGETS=efivar.pc efiboot.pc --TARGETS=$(LIBTARGETS) $(STATICLIBTARGETS) $(BINTARGETS) $(PCTARGETS) -+TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS) - - LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c linux.c loadopt.c - LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) --- -2.4.3 - diff --git a/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch b/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch index 1c68a2934..e3fa2e1c1 100644 --- a/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +++ b/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch @@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia gcc.specs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/gcc.specs b/gcc.specs -index 0d4bbda..3802ca6 100644 ---- a/gcc.specs -+++ b/gcc.specs +Index: git/gcc.specs +=================================================================== +--- git.orig/gcc.specs ++++ git/gcc.specs @@ -2,13 +2,13 @@ + -D_GNU_SOURCE @@ -35,11 +35,8 @@ index 0d4bbda..3802ca6 100644 + %(efivar_cpp_options) *cc1_options: --+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -flto -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} +-+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} ++ %(efivar_cpp_options) -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} *self_spec: + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} --- -2.8.1 - diff --git a/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch b/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch new file mode 100644 index 000000000..fc8f8c8b2 --- /dev/null +++ b/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch @@ -0,0 +1,17 @@ +Taken from void linux + +Index: git/src/linux.c +=================================================================== +--- git.orig/src/linux.c ++++ git/src/linux.c +@@ -40,6 +40,10 @@ + #include + #include + ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + #include "dp.h" + #include "linux.h" + #include "util.h" diff --git a/meta-oe/recipes-extended/efivar/efivar_0.24.bb b/meta-oe/recipes-extended/efivar/efivar_0.31.bb similarity index 83% rename from meta-oe/recipes-extended/efivar/efivar_0.24.bb rename to meta-oe/recipes-extended/efivar/efivar_0.31.bb index 877ca9045..10dde896e 100644 --- a/meta-oe/recipes-extended/efivar/efivar_0.24.bb +++ b/meta-oe/recipes-extended/efivar/efivar_0.31.bb @@ -12,13 +12,12 @@ inherit pkgconfig COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "963cb2e5adc145fe00717f94e382f2973f80e753" +SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://0002-disable-static-build.patch \ file://allow-multi-definitions-for-native.patch \ - file://0001-Remove-some-extra-const-that-gcc-complains-about.patch \ - file://0002-New-gcc-version-new-way-symbol-versioning-breaks.patch \ -" + file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \ + file://musl-strndupa.patch \ + " SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ file://0003-efivar-fix-for-cross-compile.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ From patchwork Tue Jul 18 03:10:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108048 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336418qge; Mon, 17 Jul 2017 20:11:54 -0700 (PDT) X-Received: by 10.84.132.76 with SMTP id 70mr838429ple.7.1500347514580; Mon, 17 Jul 2017 20:11:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347514; cv=none; d=google.com; s=arc-20160816; b=Z01xZWKJWYGc51cdGAADEE2xSELtgkNpKxTX+uFOlX/Lz0DC34/0GIjCJrouTIxOLW A7d8ktbZgyl0EoX32OFbpA/mZB3m4kToZLcQifAc0Vld/jonIS+YiwjSlUfdBTzpjD0I rRhNyOTxSwJNRKZoaPIR7/DnL41qGpDm96yvYdWDuuWWW7aZNtpM6sxLXz/1X41LmnxB 3v8BoHRWLE2T0Djm8iCMmHV22dJSw1nFG/zSu+ptEfumXZmVX1x4WagGeITOAwbdcI7U UcMnmON80pej+qpsH9Za4nO3nYh7uJEnzezKTdcNxdfXfTMUTOlby8O3+1D8SdT3usZC giUQ== 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=wY0SWwjWD0C8No7vhawXNPIoWbILtzXcREiRXrcCirg=; b=B0Jb7WgZLeKOqoFw06HOoIr5LOMlvTHoDNJbUi0PTNCXSuA+eWCt91fgodcCKDx8dl EnbsK4XrjG3VLBkmjnuIHHdkvFmnvnMqDu0Iq95aZs+7Q5SggfvoC2MlyFBW4OcKdqkY TAp9Sm2ROVxpndEYlENlap1gMS9Ybb30KK7vhgxYlplkqodhNCzlxEysV2gOiW/2x5El 2gYU/aOtqLj2OUFwugx+AIQDDZS1tF10UNusf5314qx9F2YlUSmPnTdwlqcnPZwoY+2F 5DlhS8HZ0uHb1YjjwHtTNMHaPlWUoHrUZjv0IjIIC3XYapQtufw1FR//XFEl+ej7N2Np jsEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=qsAD98Fs; 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=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 69si775418plc.138.2017.07.17.20.11.54; Mon, 17 Jul 2017 20:11:54 -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.b=qsAD98Fs; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 401C4780E4; Tue, 18 Jul 2017 03:10:47 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id D9FEE77FF5 for ; Tue, 18 Jul 2017 03:10:38 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id d193so1050558pgc.2 for ; Mon, 17 Jul 2017 20:10:40 -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=H0SUr4jv91IdlYRoVQ6IYHueSlKrMcnTebY/9rGFyE0=; b=qsAD98Fs+mATNeekfAZDnSA8JcW4BL7GmBvwsRbARhKg+rM5JrN4gmEN5mm4FluBKt Lwtwi2SabY6GMKKgahXpbZ8BzkG2qM/7LDgcFJ8MHqc3CAveq1eGHcrwm3pMJo6LgPkn BpJmXJ6Q8YDq631Zq9tG+3N6edp7IZLpB8zvA4YsFgM6TVZlkFq0WR/7KDb4H5DL/LQI d2U0fw3QThsSwkWh9OfzXmh2cbp4bqF7mxzkhfwafVQKEBKVuD2P9FmWF4nEjqZ7vGxH BggN7qkA64A0m+W3374uKbgGFHZtYxjLOX7eYFx5VV/WIyTn1FMvu8THyy5by4zjAf4Y +7gg== 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=H0SUr4jv91IdlYRoVQ6IYHueSlKrMcnTebY/9rGFyE0=; b=ncmirqka17WoorN9N99BzP7C2mGR7uBqUJD3XtiDxDAo4YOeq1n207EDJH7Jfky/ll f/Qu/TFG2kAjycTcR1Nmi9cliTBmjg/uuT4fJ2NvC2rXICyBbHLmW6SFRAbf4wZZdC/R jDanAY75Fn10cdyPFNHTNWzKYM1yBCoP3mphPz5hBigFNDKi3+0MQULNe2HGfA0ERSj0 +Ud0jMliWmx/43elodovGX/uFbT/w3L36sga09q8VZd55q58u2oazSQ/tYUdv5u80MV8 PfSSEJNIV+xBUzCjMjrLy+Vu3BnBc6/tfgNpVuuk9Tpwc8iSd3WCzPPnQUGH0YWKAs7u rcuQ== X-Gm-Message-State: AIVw111+42iSHTe8CpRXBZv7BgkpMFj7fC+B+Msnlm/LLB5Iji0C9iSa CPJJ/c/NadyAFzjf X-Received: by 10.99.165.3 with SMTP id n3mr784296pgf.233.1500347439641; Mon, 17 Jul 2017 20:10:39 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:07 -0700 Message-Id: <20170718031013.44536-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 11/17] linuxptp: Upgrade to 1.8 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 Fix build on musl along way Signed-off-by: Khem Raj --- .../0003-include-missing-time.h-for-time_t.patch | 26 ++++++++++++++++ ...ude-header-sequence-to-avoid-duplicate-de.patch | 36 ++++++++++++++++++++++ .../linuxptp/{linuxptp_1.6.bb => linuxptp_1.8.bb} | 9 ++++-- 3 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch rename meta-oe/recipes-connectivity/linuxptp/{linuxptp_1.6.bb => linuxptp_1.8.bb} (66%) -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch new file mode 100644 index 000000000..96163f654 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch @@ -0,0 +1,26 @@ +From b36cafdbcbe2193f5b669e703c608e19e23f80a3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 11:16:42 -0700 +Subject: [PATCH 3/4] include missing time.h for time_t + +Signed-off-by: Khem Raj +--- + util.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.h b/util.h +index e912f19..3c634c1 100644 +--- a/util.h ++++ b/util.h +@@ -22,7 +22,7 @@ + + #include "ddt.h" + #include "ether.h" +- ++#include + /** + * Table of human readable strings, one for each port state. + */ +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch new file mode 100644 index 000000000..e69927514 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch @@ -0,0 +1,36 @@ +From 3cd28aa771934d9165ff0d7e19932cde65de3e52 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 11:16:57 -0700 +Subject: [PATCH 4/4] Adjust include header sequence to avoid duplicate + definitions on musl + +Signed-off-by: Khem Raj +--- + raw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/raw.c b/raw.c +index f51c829..494ea7f 100644 +--- a/raw.c ++++ b/raw.c +@@ -18,8 +18,6 @@ + */ + #include + #include +-#include +-#include + #include + #include + #include +@@ -32,6 +30,8 @@ + #include + #include + ++#include ++#include + #include + #include + #include +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb similarity index 66% rename from meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb rename to meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb index 2e28644f0..c7b8b2933 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb @@ -4,10 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ file://build-Allow-CC-and-prefix-to-be-overriden.patch \ - file://no-incdefs-using-host-headers.patch" + file://no-incdefs-using-host-headers.patch \ + file://0003-include-missing-time.h-for-time_t.patch \ + file://0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch \ + " -SRC_URI[md5sum] = "6aa15d83f5a35f1fd076ba9adc4e7285" -SRC_URI[sha256sum] = "e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c" +SRC_URI[md5sum] = "5688cdfe57932273e1dbf35b3b97b9a0" +SRC_URI[sha256sum] = "fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" From patchwork Tue Jul 18 03:10:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108049 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336535qge; Mon, 17 Jul 2017 20:12:02 -0700 (PDT) X-Received: by 10.84.238.1 with SMTP id u1mr821979plk.187.1500347522888; Mon, 17 Jul 2017 20:12:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347522; cv=none; d=google.com; s=arc-20160816; b=rBH5/TDRBP7jvtc926GlfDZR3CER64GxMlFwt6m9/mFGZTCoXvX8ph/jhxs4lx59q1 Gu1z5NFnORBJdgAEseHYYjhzHxtuZ3WeNh3Zsxi9Wvt1xOlyHzQVmBON6uaCRvIGV31g 2bANGIXxybg1Iy1Po0JCT1IW5Wy74QLeBl85Dav38th/43dVXnF5x4P1FszZO7QDczdP VyGX0BqbPUzHLKGmf20UCxxZiMBTbE8OBDZMfZpSaSQr3KfT4gzUBA9oyasupUw0zt9q JN5cOo+VBFAmMJnseWCevOtwYht0jOSuX9zwiOphLtnXhL3wMnFaVa+JBKUFdsmDhPW4 mt6w== 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=5+stCQwzVzBaA6nwG4XGkxEHegS2smu+yHLEAHIw9nw=; b=MVxCu0z8c9c2jF5NQpAA8QdcO0j6Pfg6GgWaA1RJ3MCrQqWUnLH+F4wBNxKmnwHDqk NuGG7vyUI/f2NJnRBCmRiHAxjwX6KDMN8i+c7F6IaYJlXPXR0DHXsc7WBC83slvwjjqc Ia4vUQyoLhkB/TuaM43Ag+qp44SAgcElG/NCGMN49ZOtuxodJntlAVvo/ubWS519mvlh CPGIkf21kb72Fno6NMwhxbJl1j/md1BSCmkbqY1SUnkxSd0dGrioEO1JDmyonwFZ/bAI rRMS6fKFUNXpnJBWjGYUk0DQCQw/r1oU8jkrLOKwYQ0MZvOOzIXZsDf+zYNtel8J5hen 1F7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ACfJG0v2; 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=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 q17si736846pge.420.2017.07.17.20.12.02; Mon, 17 Jul 2017 20:12:02 -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.b=ACfJG0v2; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 90C377814B; Tue, 18 Jul 2017 03:10:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id F22FA77FF9 for ; Tue, 18 Jul 2017 03:10:39 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id q85so1025885pfq.2 for ; Mon, 17 Jul 2017 20:10:41 -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=9P+QarLBiwQgK28XhRFvK52lgfe5PVbnTod0cP/eOq8=; b=ACfJG0v2+PlwKcDvMSB5lz8PbBb2qiwc04Ocg7P1Y/AYf6lTCmbGsce3UNG+zUwlcE 8ifs9BWCpUFH9MN5tgeykvyj9Qg/BNx/t71ylI3UDMSgxfZyLCK6UUwhUr8Z22Wtfdyc 6e4b5dQg6Y29zyIQOhNU9m7373EPujvqmo3ZdAGL8NEIT2e8IalCip7SuD02Qb2ttlbF lJ2RgMHgKct+v6FnrT2BGTc/S9OpHzohClzmEUeEurI98pVsXUJvCoP4AnYLRPeXjQEb a5VrwdXGttsgMc/kNsX9AuO9aGmLQM7eecS5xyBQmGpV2LvdFJoS/txdoeBGrqRbYjbM 9V6g== 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=9P+QarLBiwQgK28XhRFvK52lgfe5PVbnTod0cP/eOq8=; b=jzmrRuCiiAkMTnVcNT6bCLzZRpYeqJ+Sp+bLAZ7xbl5SVHCbQsaK6pvQl02CIMA9ip Y5SYr7Z+Oqt4YcozldCBKG+4tBBWvhMoX45y1mbiJeYd7IFa8Lhm5SEhPjwP4gWO1cUH Ram98xpc2OLoVqQ9NMlt/0Dzh2+v3B+RHvDhOVZBFj6qhG9cV/rFa6Xgbozow96qyE20 Cpw21Dvza8M/T643+I697Xu4+LJeWZZg3pVpZVdIQx/zbn9CE/lNy0unJDI08EC/lyKU 2mpTrl8aTamR2dXSgy+oNZUc2DjmXFenrJeoB63Qq0sXnMYdAV/WsBrQ2ouypV6HvcgU bftw== X-Gm-Message-State: AIVw113XWZU//za/gsfYLUhAX8VV4NKyx/vyc0ZpjFTLI6VDAxvnu1J3 t2iyxuxdX/Y2ddKe X-Received: by 10.99.150.2 with SMTP id c2mr791053pge.166.1500347441042; Mon, 17 Jul 2017 20:10:41 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:40 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:08 -0700 Message-Id: <20170718031013.44536-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 12/17] sessreg: Fix build on musl 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 musl does not define _WTMPX_FILE or _UTMPX_FILE use versions without 'X' Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb index 2e25b7d91..3885d613d 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb +++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb @@ -6,3 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" SRC_URI[md5sum] = "e238c89dabc566e1835e1ecb61b605b9" SRC_URI[sha256sum] = "551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c" + +CFLAGS_append_libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " + From patchwork Tue Jul 18 03:10:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108050 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336632qge; Mon, 17 Jul 2017 20:12:10 -0700 (PDT) X-Received: by 10.99.160.80 with SMTP id u16mr827869pgn.26.1500347530480; Mon, 17 Jul 2017 20:12:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347530; cv=none; d=google.com; s=arc-20160816; b=MNY4sghNjjQ16Te8p0MmIn1urBxtb9xtahCXJ2M5PW56CqH9e8gjTXas1/OK2X8erQ Nm3uNvwnASj+B8zfD/E7ca2dHhdeYuKrnu4Y3O4p/+m/dBbXuML5uFQLZGEwe+oagGWs lEta5bSSsEY7mUDceTMTdidZOwdCTST89Jg2ifiJ6527dbY66ATQQ7EXH045XlmMlruT ccJNhEVuJciUtOSfAWo/TVNQAiW4TOCYqOnNH2Fetm2dx236ARc6rA1TdgCd29fRAE5V H25k9BrohwqQurT/4aUxR4qnIp0rOU8xgHedueXmSxnKWy+LxIspVJg5Cv80utvqmjW2 l/pw== 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=w2NfIVlyjsiBTRFlBqu89xobHQay+NAMd7uuAqDQsUQ=; b=ZkpA91Aeu8+JnIsLjMTRyXNgJi0NI++ipSSlPxtchrD5aFmitKCy68lhSmrYl44b5h wXq+5gIK8I/OhH7T0WPQ9gYeeuNtoT8GCt2ROviesKzNyreGApx6hB/KYVVZcQ93t+R1 hcicKRxHoQ7ys6yulcSgUrtOHZcJz3XHglFAOxJY/rQTxquxQjx9faOQXqd2L4RVPRyL 1qij1JTGJphfsdoEuCuNZvEWv70b+DlOWbCexWgmlLFHgDCbR/pncPIocG2cK7oRdoRn 7uklcdbaUIyCHmmBCscWTFD4lf3z/iPQEKaf9l/pO2q3/GpuaFkzXobLUkIP6xOr3fpK 7k6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=moysx7we; 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=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 v76si727503pfk.471.2017.07.17.20.12.10; Mon, 17 Jul 2017 20:12:10 -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.b=moysx7we; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A55D7780F9; Tue, 18 Jul 2017 03:10:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@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 5420478072 for ; Tue, 18 Jul 2017 03:10:41 +0000 (UTC) Received: by mail-pg0-f47.google.com with SMTP id u5so4582615pgq.3 for ; Mon, 17 Jul 2017 20:10:42 -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=eLOGSaepGFT43n48dchFA1gL3lPNCwpfzqWME62hnTs=; b=moysx7wes4lwquuuCkqYMPGoZBNwZcnRocB6jBlDGIqenzsVIsicCtxh7KW8zLw6l6 A4HBOppFkffUriBxtTuATLGk6gY9wmLj0/hrXTgGOUidOgzLWIPp7mVHaXRE5gipqc9+ p/KgZRpgUPhex7/rSTqN1N+7ukrx9dqiquDMd0aYWxAChBOJ5TgCa+g8l5BOSMKDWopA U50PD58M1Vk6/EgZfWtP1alceS05MWb1e6rUnjq7qQwJHIkWGqqlKSglNy4zXmEyTNUb zn8+mbhlGEPdEh9UabrQtEgfxswIWZfona7jOek12wmSov0SNnuPUn1ibUFFq3EeagES Uu4A== 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=eLOGSaepGFT43n48dchFA1gL3lPNCwpfzqWME62hnTs=; b=QwapFgIl3KTbXH3CzBbg42LIN8fXubr5Ycjk/ECuVr31AApZsLwvKU5gso3s0CyjQe OA77gdP/goihWLq+RHcKCJlDv6gNsgqaKGmca/F3z3pm+c1+brBTdyPcroq/p4SW4YjO QEcNbeS80F0dPhc+boxZ9WvnxIySeJ+ZE7QJbvzNQ0xW/tDD1/slsTGKHC1B8KLGdE8B zaoRGbfRjjOSu8fpRkPlWfwnfkeJIiBfem4k8Q1iC9sQrsiseJJLY64BRPm4/UGuB3am TAPeOSJSMmXWV1hsV47BCcCwfxcbGMrXHezf8mNquewkMZ9dW/zQ3iWTYl5TLwaV6Q5u SBPw== X-Gm-Message-State: AIVw111pM83m38KxIej315kj0Yzrncvploror7YQgO3iIMhbBgYLgbsX /RyjRGkrFZ3NjNvw X-Received: by 10.99.66.1 with SMTP id p1mr803742pga.120.1500347442384; Mon, 17 Jul 2017 20:10:42 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:41 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:09 -0700 Message-Id: <20170718031013.44536-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 13/17] phonet-utils: Fix build with musl 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 Signed-off-by: Khem Raj --- .../0001-Include-limits.h-for-PATH_MAX.patch | 25 ++++++++++++++++++++++ .../phonet-utils/phonet-utils_git.bb | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch new file mode 100644 index 000000000..8bb7e5a18 --- /dev/null +++ b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch @@ -0,0 +1,25 @@ +From f7ad9a4471cee2324f216a0d82ba8097ec746c56 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 11:48:12 -0700 +Subject: [PATCH] Include limits.h for PATH_MAX + +Signed-off-by: Khem Raj +--- + src/pnstat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pnstat.c b/src/pnstat.c +index 661a5bc..76068e6 100644 +--- a/src/pnstat.c ++++ b/src/pnstat.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + struct fd + { +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb index 558996391..3c599950f 100644 --- a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb +++ b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb @@ -2,7 +2,9 @@ SUMMARY = "This small package provides a few command line tools for Linux Phonet HOMEPAGE = "" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://gitorious.org/meego-cellular/phonet-utils.git;branch=master" +SRC_URI = "git://gitorious.org/meego-cellular/phonet-utils.git;branch=master \ + file://0001-Include-limits.h-for-PATH_MAX.patch \ + " PR = "r2" S = "${WORKDIR}/git" SRCREV = "4acfa720fd37d178a048fc2be17180137d4a70ea" From patchwork Tue Jul 18 03:10:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108051 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336757qge; Mon, 17 Jul 2017 20:12:18 -0700 (PDT) X-Received: by 10.84.176.100 with SMTP id u91mr846483plb.182.1500347538469; Mon, 17 Jul 2017 20:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347538; cv=none; d=google.com; s=arc-20160816; b=h9u/g3MHBO0aRU4p87ru/HrhUZwWa+K/TE7B1Jmt1lLg+l/nLZFNSrq9L4VmaW0erq +S567eynnFG0egny5Jdrbh7FU1ZjsZUsnfvoh5MPiMgrzKqP/3UsS2D7FpSTaLjxa2yd JwWdztim5tKE9FUTQJIdN7uNj4/jBgCcjHaRA1zUjg8QiQyMmKvEHv+4QaXhb8UjgNyp Qw6X6bEE6vKM8OAHWYJXP37n0qYGXuxLYN9wX7vDESncrrFXzNz1L4Fvb/hiUtsl4jh5 PI1Pb99TWQh0f1mByvxX1a8a1lsIdDjvu7giJyM5K1HQ8H2d6jrlYI/uaOC63rMDqDJ0 5ipw== 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=NrrSeAW1sm0kJb2xuC4fibvN+HXSjcDkJ90k2Zq9has=; b=kRyJBxN6y60sFthXxBSN2tNWrfa/0QqqSGtnSBW0yLoD0F7uNgvg6R3J8pSStzPu7N tqLsEC3nqPo4MRdmIJM6XYZ44/A/Y/KAKWvfNfqMydVLwQ7X0A2TZmk5Em3zbC49e+mo /2texthhjtnXWVU1Zuez1UQHVxrjmuJ8RW064qaiFMhLB/cKU7VvpRpT/wZGXYu7Y0m2 Nm4cCD5fRzEfobpRAaZggkYydns29eM0al9imIIPzi9CJRlfnb9uIVY85JEXPQuu+Bbb /l9a0gpDfl8RJCVorPXabuCkJm1EyvDZV0gtKitwWuwk3asrxokXHf+F7UKJCnCAEMsH iSfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=YNp3gBE8; 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=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 1si745376pgw.226.2017.07.17.20.12.18; Mon, 17 Jul 2017 20:12:18 -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.b=YNp3gBE8; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B839478187; Tue, 18 Jul 2017 03:10:50 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 636F878075 for ; Tue, 18 Jul 2017 03:10:42 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id z1so1060074pgs.0 for ; Mon, 17 Jul 2017 20:10:44 -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=wJwLV3JJRITdVgWXacnPfiphMJeaWy0zEF8uFIak3sg=; b=YNp3gBE8ZVNUjyc4rWEgpuPWfRcM3EYOUke40Afo90xgorreSu+cabGxX6RbVrKRb+ eqjG0i0uwnA58VghTdoONebE6NHFqOEiirRKUAucxQwF3A/BJmnVBmoC4LQwpDMcaG8Y 61xpaky0dVuSvMHFnjfsd6fXwQpYcGzpLWEHQPqxphqj6FFCbXlt6UiTKcDSPD26dFkh j5Awjjb0FMirGnjhrODvBMchWvJKRJDX8E0dmvFRXUAXjxCvoqiRXdAes3wH63J6SesF xhlfj2XcE7iT9NIn9gQi0t8WjoJVJw5joCkRhsx4c1THt+JDWrpwfAapCCeQMQsvCOKj XD4w== 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=wJwLV3JJRITdVgWXacnPfiphMJeaWy0zEF8uFIak3sg=; b=OmyAQpiI2lSvlD28YQFKB3sM8pVkqs4/GUFsmWWY8gKlAMFCeFKIGnzUY3XHlqye2v WmkV1o9xLmXXjEQo6T/sCseM6v45oiKfDl7Pk111FVvd3+XGg3OwGDSDGVzvLcnzOG39 lIC2dniRtkD6KatX5kmiZ0YuYQwiYPaSO0cbvqMveYUkwKuZZSowqInEHgTRq4f81Pbs vH+JZ2LjO8x4UKnduz9e/8wyuL3/3WIChyzadIUwHKR3OKCel0s3EyYiZ8gDqXgl/WXb FWnzfkGI8STAon09dJAwQYeDksjTW2wQFQrj8YQI7ula+5/mFvwhtejJpOKQI1pu7igS qELA== X-Gm-Message-State: AIVw112J3Np5XrobYMDlbWZXqjniJaENuvrsS9CQhuYIxU0pa/OzlftT chpZRdLSZftBrYUs X-Received: by 10.98.28.71 with SMTP id c68mr827379pfc.116.1500347443736; Mon, 17 Jul 2017 20:10:43 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:10 -0700 Message-Id: <20170718031013.44536-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 14/17] nicstat: Fix build on musl/x86_64 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 Signed-off-by: Khem Raj --- ...tat.c-Do-not-define-uint64_t-and-uint32_t.patch | 37 ++++++++++++++++++++++ meta-oe/recipes-extended/nicstat/nicstat_1.95.bb | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch new file mode 100644 index 000000000..a208f97eb --- /dev/null +++ b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch @@ -0,0 +1,37 @@ +From 52590fbf735cef3fec85a042458aa89a02c52b57 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 11:33:12 -0700 +Subject: [PATCH] nicstat.c: Do not define uint64_t and uint32_t + +Use the defines from platform + +Signed-off-by: Khem Raj + +--- + nicstat.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/nicstat.c b/nicstat.c +index 83ad557..2a6e0c1 100644 +--- a/nicstat.c ++++ b/nicstat.c +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -88,8 +89,6 @@ + #define PROC_NET_BUFSIZ (128 * 1024) + #define PROC_UPTIME "/proc/uptime" + /* Needs to be fixed if not built under ILP32 */ +-typedef unsigned long long uint64_t; +-typedef unsigned int uint32_t; + extern char *optarg; + extern int optind, opterr, optopt; + #endif /* OS_LINUX */ +-- +2.13.3 + diff --git a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb index 5126a31cd..3875f0f60 100644 --- a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb +++ b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb @@ -5,7 +5,9 @@ HOMEPAGE = "http://nicstat.sourceforge.net" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0" -SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz" +SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz \ + file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \ + " SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d" SRC_URI[sha256sum] = "c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367" From patchwork Tue Jul 18 03:10:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108053 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336994qge; Mon, 17 Jul 2017 20:12:34 -0700 (PDT) X-Received: by 10.98.57.156 with SMTP id u28mr802197pfj.111.1500347554692; Mon, 17 Jul 2017 20:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347554; cv=none; d=google.com; s=arc-20160816; b=OzXkZRerQyWEZudJ06qW+Pt1G7VaoaXyRNeU8n1/C962/O1BHP+2qNtK0iHBZzix9s nsGjaUYB2NW7F5fQ9O4biUORGLcq1SZUfNoq6X6BY+h0PHg821KgKQ53hSh1oBZfpE5R lCuyKOLHIVxkH3ZPfOCp8w6l/fxgBo9adZ+eHt4wR+NDIVOvzdV3l0wKHKIsJYjm6Qio 4GVrGJsEUzJFSVE6KWlEAzanqWQhmGg7shoRhbxDW4CvKaQlVBohDpoirnI3H+/WjxPB tXCAg70kHNvXp2XUGln+0e6zl/7nZiGHgOFAjSdV4MyMeC63/6eccOAbPKTFWhUNMtY/ IfZA== 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=5REz+o2SAdVb5FDI2nECw7yrHr+Dz0BV4e3bmffBaJY=; b=LLahGHQgshm0Ebc6R7D0Txt+77JexuOYVpD2z7mnYiwd5EzidLK+wLbvdt8V0bCQfh wDYFwU2h5i0u+U6z7OdhkqgVyW3bZq3N4du6AqZoECH5mIPUkJs6HZlG9u+amUXsPdZs 7JJoWELV0exEX/ryx5Wp+ewk6ASBi0AyTyjdGlQ90OX0KvIE9LBH//HH2/2a7o65z+QG QXUHDDhQwnKpjcahTQxE73EzVS2u7ASDflkClsohnJM5vhB2jwtlFcp4A/ba+HKsLvtz iShL2Fv3P9uJxXVAgdiHUUUGWPPV12vuDhJA1UvspMXRZ1lb2q6DMFIt/5fA0lpgvnUQ BtSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=BRCucT1Q; 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=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 l1si790573pln.222.2017.07.17.20.12.34; Mon, 17 Jul 2017 20:12:34 -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.b=BRCucT1Q; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E41B0780DE; Tue, 18 Jul 2017 03:10:52 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f42.google.com (mail-pg0-f42.google.com [74.125.83.42]) by mail.openembedded.org (Postfix) with ESMTP id 3F4E37805C for ; Tue, 18 Jul 2017 03:10:45 +0000 (UTC) Received: by mail-pg0-f42.google.com with SMTP id v190so4687616pgv.2 for ; Mon, 17 Jul 2017 20:10:47 -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=QqFuWXchOVNEWzxlsCstUjH0t50PE66FInbBVYEceyE=; b=BRCucT1QUCLqN68DoHSC0SRBF7SfsHr1l51q1y40egUcqyu3SFyhno92Uzvy2OYj+F lDs50U0EXMWcVTInnYIWVdnzKkSl6bKnH1J1vkpZVQvvVQMRg3ylcuu/LpEhnnXEZhdG Jv3rgNPpFmkNTK/8sn+jwRuJWhu3TfAAcN6vBhTQ3RG3EGIN3+3h4Id4CsIclPuYWiAG D0nr2ccVKehtcT0+9cRH3gLvcbIWcyoRdJDXI3dhgv87YyJcZqyxa0Ya5Ovi90QECHCc S9+zn+6FP6KYFUPSFj9dZoiwR8Y5y1SM1MZgxElOB3vrILfRffh6rEsvAY3np1XWet1S PFPA== 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=QqFuWXchOVNEWzxlsCstUjH0t50PE66FInbBVYEceyE=; b=uFX3dnzFn76e0lpv5WnVFVHZFGJ0vR6m6wnc879dGVA3C838CoyFsthJulwiNnw+9h wQutYW4HYZpMpMNetLL3TryObMC3c0IdT0+H09QldIB9RMnSHCnYa0DNRPEKNf/hbzh7 7Hnvy3krE2H7A1WYI5A6XB/troCi6BpmFT3W2r61uJVsUmeN4gKOn1tWpqF7MPrrOSFn lqbg4loIUQ4CbIqZrZFnyYyLR24w6DzCOmXeoA0W4ohfB4HpFE3XHHpMP3nyfmzT0ht4 PxJx9Id14rGMawalGx3eLmHibLL0WMGFD2uji23E/DYogCkvfOav1BmGhwuSmEvKobFr NPVA== X-Gm-Message-State: AIVw111A537XWinaV05gc1P04K16uaDJnh2kbZ9ZMfSZ7WmjeDqbq0eg lZIcb4VD2X8CImYa X-Received: by 10.84.217.144 with SMTP id p16mr845857pli.276.1500347445459; Mon, 17 Jul 2017 20:10:45 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:44 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:11 -0700 Message-Id: <20170718031013.44536-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 15/17] open-vm-tools: Fix build with musl 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 Use SPDX format for LICENSES Signed-off-by: Khem Raj --- ...mptions-about-glibc-being-only-libc-imple.patch | 45 ++ ...ude-poll.h-instead-of-obsolete-sys-poll.h.patch | 24 + .../0003-Rename-poll.h-to-vm_poll.h.patch | 756 +++++++++++++++++++++ ...ompatible-pointer-types-and-Wno-error-add.patch | 31 + ...05-Use-configure-test-for-struct-timespec.patch | 45 ++ ...ix-definition-of-ALLPERMS-and-ACCESSPERMS.patch | 58 ++ ...re-to-test-for-feature-instead-of-platfor.patch | 144 ++++ .../0008-use-posix-strerror_r-unless-gnu.patch | 30 + ...support-for-building-with-system-libtirpc.patch | 342 ++++++++++ .../open-vm-tools/0010-gnu-ucontext.patch | 65 ++ ...Use-configure-test-for-sys-stat.h-include.patch | 25 + .../open-vm-tools/open-vm-tools_10.1.5.bb | 25 +- 12 files changed, 1584 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch new file mode 100644 index 000000000..9773b4a94 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch @@ -0,0 +1,45 @@ +From a0983d84185f04c4e40778fe951fde4439894882 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Jul 2017 07:37:03 -0700 +Subject: [PATCH 01/11] Remove assumptions about glibc being only libc + implementation on linux + +Signed-off-by: Khem Raj +--- + open-vm-tools/lib/file/fileIOPosix.c | 2 +- + open-vm-tools/lib/include/vm_basic_defs.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +Index: open-vm-tools/lib/file/fileIOPosix.c +=================================================================== +--- open-vm-tools.orig/lib/file/fileIOPosix.c ++++ open-vm-tools/lib/file/fileIOPosix.c +@@ -205,7 +205,7 @@ static AlignedPool alignedPool; + * are not available in any header file. + */ + +-#if defined(__linux__) && !defined(__ANDROID__) ++#if defined(__linux__) && defined(__GLIBC__) + #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) + /* + * We want preadv/pwritev. But due to FOB=64, the symbols are -64. +Index: open-vm-tools/lib/include/vm_basic_defs.h +=================================================================== +--- open-vm-tools.orig/lib/include/vm_basic_defs.h ++++ open-vm-tools/lib/include/vm_basic_defs.h +@@ -571,6 +571,7 @@ typedef int pid_t; + #if defined __linux__ && !defined __KERNEL__ && !defined MODULE && \ + !defined VMM && !defined FROBOS && !defined __ANDROID__ + #include ++#if __GLIBC__ + #if __GLIBC_PREREQ(2, 1) && !defined GLIBC_VERSION_21 + #define GLIBC_VERSION_21 + #endif +@@ -590,6 +591,7 @@ typedef int pid_t; + #define GLIBC_VERSION_212 + #endif + #endif ++#endif + + /* + * Convenience definitions of unicode characters. diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch new file mode 100644 index 000000000..d26bf2dd3 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch @@ -0,0 +1,24 @@ +From d44c7c9de7380ad7b284231bd5b5c99b5c19758d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Jul 2017 07:37:59 -0700 +Subject: [PATCH 02/11] include poll.h instead of obsolete sys/poll.h + +Signed-off-by: Khem Raj +--- + open-vm-tools/lib/asyncsocket/asyncSocketInt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: open-vm-tools/lib/asyncsocket/asyncSocketInt.h +=================================================================== +--- open-vm-tools.orig/lib/asyncsocket/asyncSocketInt.h ++++ open-vm-tools/lib/asyncsocket/asyncSocketInt.h +@@ -71,8 +71,8 @@ + #else + #include + #include ++#include + #include +-#include + #include + #include + #include diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch new file mode 100644 index 000000000..8641778d0 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch @@ -0,0 +1,756 @@ +From 687fca20b3417ac885b6961e6fe1126d4a3fe7a4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 17 Nov 2015 10:57:31 +0000 +Subject: [PATCH 03/11] Rename poll.h to vm_poll.h + +musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this +we rename poll.h to vm_poll.h. + +Signed-off-by: Natanael Copa +--- + open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- + open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- + open-vm-tools/lib/include/asyncsocket.h | 2 +- + open-vm-tools/lib/include/pollImpl.h | 2 +- + open-vm-tools/lib/include/{poll.h => vm_poll.h} | 0 + open-vm-tools/lib/rpcIn/rpcin.c | 2 +- + open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c | 2 +- + 7 files changed, 6 insertions(+), 6 deletions(-) + rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (100%) + +Index: open-vm-tools/lib/asyncsocket/asyncsocket.c +=================================================================== +--- open-vm-tools.orig/lib/asyncsocket/asyncsocket.c ++++ open-vm-tools/lib/asyncsocket/asyncsocket.c +@@ -52,7 +52,7 @@ + #include "vmware.h" + #include "asyncsocket.h" + #include "asyncSocketInt.h" +-#include "poll.h" ++#include "vm_poll.h" + #include "log.h" + #include "err.h" + #include "hostinfo.h" +Index: open-vm-tools/lib/hgfsServer/hgfsServer.c +=================================================================== +--- open-vm-tools.orig/lib/hgfsServer/hgfsServer.c ++++ open-vm-tools/lib/hgfsServer/hgfsServer.c +@@ -48,7 +48,7 @@ + #include "hgfsServerOplock.h" + #include "hgfsDirNotify.h" + #include "userlock.h" +-#include "poll.h" ++#include "vm_poll.h" + #include "mutexRankLib.h" + #include "vm_basic_asm.h" + #include "unicodeOperations.h" +Index: open-vm-tools/lib/include/asyncsocket.h +=================================================================== +--- open-vm-tools.orig/lib/include/asyncsocket.h ++++ open-vm-tools/lib/include/asyncsocket.h +@@ -129,7 +129,7 @@ typedef struct AsyncSocket AsyncSocket; + * Or the client can specify its favorite poll class and locking behavior. + * Use of IVmdbPoll is only supported for regular sockets and for Attach. + */ +-#include "poll.h" ++#include "vm_poll.h" + struct IVmdbPoll; + typedef struct AsyncSocketPollParams { + int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ +Index: open-vm-tools/lib/include/poll.h +=================================================================== +--- open-vm-tools.orig/lib/include/poll.h ++++ /dev/null +@@ -1,324 +0,0 @@ +-/********************************************************* +- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved. +- * +- * This program is free software; you can redistribute it and/or modify it +- * under the terms of the GNU Lesser General Public License as published +- * by the Free Software Foundation version 2.1 and no later version. +- * +- * This program is distributed in the hope that it will be useful, but +- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +- * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public +- * License for more details. +- * +- * You should have received a copy of the GNU Lesser General Public License +- * along with this program; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +- * +- *********************************************************/ +- +-/********************************************************* +- * The contents of this file are subject to the terms of the Common +- * Development and Distribution License (the "License") version 1.0 +- * and no later version. You may not use this file except in +- * compliance with the License. +- * +- * You can obtain a copy of the License at +- * http://www.opensource.org/licenses/cddl1.php +- * +- * See the License for the specific language governing permissions +- * and limitations under the License. +- * +- *********************************************************/ +- +- +-#ifndef _POLL_H_ +-#define _POLL_H_ +- +-#define INCLUDE_ALLOW_USERLEVEL +-#define INCLUDE_ALLOW_VMCORE +-#include "includeCheck.h" +- +-#include "vm_basic_types.h" +-#include "vm_basic_defs.h" +-#include "vmware.h" +-#include "userlock.h" +- +-#ifdef _WIN32 +-#define HZ 100 +-#elif defined linux +-#include +-#elif __APPLE__ +-#include +-/* +- * Old SDKs don't define TARGET_OS_IPHONE at all. +- * New ones define it to 0 on Mac OS X, 1 on iOS. +- */ +-#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 +-#include +-#endif +-#include +-#define HZ 100 +-#endif +-#ifdef __ANDROID__ +-/* +- * of android should be included, but its name is same +- * with this file. So its content is put here to avoid conflict. +- */ +-#include +-#define HZ 100 +-typedef unsigned int nfds_t; +-int poll(struct pollfd *, nfds_t, long); +-#endif +- +- +-/* +- * Poll event types: each type has a different reason for firing, +- * or condition that must be met before firing. +- */ +- +-typedef enum { +- /* +- * Actual Poll queue types against which you can register callbacks. +- */ +- POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ +- POLL_VTIME = 0, +- POLL_REALTIME, +- POLL_DEVICE, +- POLL_MAIN_LOOP, +- POLL_NUM_QUEUES +-} PollEventType; +- +- +-/* +- * Classes of events +- * +- * These are the predefined classes. More can be declared +- * with Poll_AllocClass(). +- */ +- +-typedef enum PollClass { +- POLL_CLASS_MAIN, +- POLL_CLASS_PAUSE, +- POLL_CLASS_IPC, +- POLL_CLASS_CPT, +- POLL_CLASS_MKS, +- POLL_FIXED_CLASSES, +- POLL_MAX_CLASSES = 320 /* Size enum to maximum */ +-} PollClass; +- +- +-/* +- * Each callback is registered in a set of classes +- */ +- +-typedef struct PollClassSet { +- /* Type is uintptr_t to give best 32/64-bit code. */ +-#define _POLL_ELEMSIZE (sizeof (uintptr_t) * 8) +- uintptr_t bits[CEILING(POLL_MAX_CLASSES, _POLL_ELEMSIZE)]; +-} PollClassSet; +- +-/* An empty PollClassSet. */ +-static INLINE PollClassSet +-PollClassSet_Empty(void) +-{ +- PollClassSet set = { { 0 } }; +- return set; +-} +- +-/* A PollClassSet with the single member. */ +-static INLINE PollClassSet +-PollClassSet_Singleton(PollClass c) +-{ +- PollClassSet s = PollClassSet_Empty(); +- +- ASSERT_ON_COMPILE(sizeof s.bits[0] * 8 == _POLL_ELEMSIZE); /* Size correct */ +- ASSERT_ON_COMPILE((_POLL_ELEMSIZE & (_POLL_ELEMSIZE - 1)) == 0); /* power of 2 */ +- ASSERT_ON_COMPILE(POLL_MAX_CLASSES <= ARRAYSIZE(s.bits) * _POLL_ELEMSIZE); +- ASSERT(c < POLL_MAX_CLASSES); +- +- s.bits[c / _POLL_ELEMSIZE] = CONST3264U(1) << (c % _POLL_ELEMSIZE); +- return s; +-} +- +-/* Combine two PollClassSets. */ +-static INLINE PollClassSet +-PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) +-{ +- PollClassSet u; +- unsigned i; +- +- for (i = 0; i < ARRAYSIZE(u.bits); i++) { +- u.bits[i] = lhs.bits[i] | rhs.bits[i]; +- } +- return u; +-} +- +-/* Add single class to PollClassSet. */ +-static INLINE PollClassSet +-PollClassSet_Include(PollClassSet set, PollClass c) +-{ +- return PollClassSet_Union(set, PollClassSet_Singleton(c)); +-} +- +- +-#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) +-#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ +- PollClassSet_Singleton(POLL_CLASS_PAUSE)) +-#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ +- PollClassSet_Singleton(POLL_CLASS_CPT)) +-#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ +- PollClassSet_Singleton(POLL_CLASS_IPC)) +-#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ +-#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) +-/* +- * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. +- */ +-#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) +- +-/* +- * Poll class-set taxonomy: +- * POLL_CS_MAIN +- * - Unless you NEED another class, use POLL_CS_MAIN. +- * POLL_CS_PAUSE +- * - For callbacks that must occur even if the guest is paused. +- * Most VMDB or Foundry commands are in this category. +- * POLL_CS_CPT +- * - Only for callbacks which can trigger intermediate Checkpoint +- * transitions. +- * The ONLY such callback is Migrate. +- * POLL_CS_IPC +- * - Only for callbacks which can contain Msg_(Post|Hint|Question) +- * responses, and for signal handlers (why)? +- * Vigor, VMDB, and Foundry can contain Msg_* responses. +- * POLL_CS_MKS +- * - Callback runs in MKS thread. +- * POLL_CS_ALWAYS +- * - Only for events that must be processed immediately. +- * The ONLY such callback is OvhdMemVmxSizeCheck. +- */ +- +- +-/* +- * Poll_Callback flags +- */ +- +-#define POLL_FLAG_PERIODIC 0x01 // keep after firing +-#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory +-#define POLL_FLAG_READ 0x04 // device is ready for reading +-#define POLL_FLAG_WRITE 0x08 // device is ready for writing +-#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket +-#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking +-#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events +-#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. +-#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl +-#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop +- +- +-/* +- * Advisory minimum time period. +- * Users that want the fastest running real-time poll +- * should use TICKS_TO_USECS(1). +- */ +- +-#define TICKS_TO_USECS(_x) ((_x) * (1000000 / HZ)) +-#define USECS_TO_TICKS(_x) ((_x) / (1000000 / HZ)) +- +- +-typedef void (*PollerFunction)(void *clientData); +-typedef void (*PollerFireWrapper)(PollerFunction func, +- void *funcData, +- void *wrapperData); +-typedef Bool (*PollerErrorFn)(const char *errorStr); +- +-/* +- * Initialisers: +- * +- * For the sake of convenience, we declare the initialisers +- * for custom implmentations here, even though the actual +- * implementations are distinct from the core poll code. +- */ +- +-typedef struct PollOptions { +- Bool locked; // Use internal MXUser for locking +- Bool allowFullQueue; // Don't assert when device event queue is full. +- VThreadID windowsMsgThread; // thread that processes Windows messages +- PollerFireWrapper fireWrapperFn; // optional; may be useful for stats +- void *fireWrapperData; // optional +- PollerErrorFn errorFn; // optional; called upon unrecoverable error +-} PollOptions; +- +- +-void Poll_InitDefault(void); +-void Poll_InitDefaultEx(const PollOptions *opts); +-void Poll_InitGtk(void); // On top of glib for Linux +-void Poll_InitCF(void); // On top of CoreFoundation for OSX +- +- +-/* +- * Functions +- */ +-int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); +-void Poll_Loop(Bool loop, Bool *exit, PollClass c); +-void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); +-Bool Poll_LockingEnabled(void); +-void Poll_Exit(void); +- +- +-/* +- * Poll_Callback adds a callback regardless of whether an identical one exists. +- * +- * Likewise, Poll_CallbackRemove removes exactly one callback. +- */ +- +-VMwareStatus Poll_Callback(PollClassSet classSet, +- int flags, +- PollerFunction f, +- void *clientData, +- PollEventType type, +- PollDevHandle info, // fd/microsec delay +- MXUserRecLock *lck); +-Bool Poll_CallbackRemove(PollClassSet classSet, +- int flags, +- PollerFunction f, +- void *clientData, +- PollEventType type); +-Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, +- int flags, +- PollerFunction f, +- PollEventType type, +- void **clientData); +- +-void Poll_NotifyChange(PollClassSet classSet); +- +-/* +- * Wrappers for Poll_Callback and Poll_CallbackRemove that present +- * simpler subsets of those interfaces. +- */ +- +-VMwareStatus Poll_CB_Device(PollerFunction f, +- void *clientData, +- PollDevHandle device, +- Bool periodic); +- +-Bool Poll_CB_DeviceRemove(PollerFunction f, +- void *clientData, +- Bool periodic); +- +- +-VMwareStatus Poll_CB_RTime(PollerFunction f, +- void *clientData, +- int delay, // microseconds +- Bool periodic, +- MXUserRecLock *lock); +- +-Bool Poll_CB_RTimeRemove(PollerFunction f, +- void *clientData, +- Bool periodic); +- +- +-#ifdef _WIN32 +-void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); +-Bool Poll_FireWndCallback(void *lparam); +-#endif +- +-#endif // _POLL_H_ +Index: open-vm-tools/lib/include/pollImpl.h +=================================================================== +--- open-vm-tools.orig/lib/include/pollImpl.h ++++ open-vm-tools/lib/include/pollImpl.h +@@ -44,7 +44,7 @@ + #define INCLUDE_ALLOW_USERLEVEL + #include "includeCheck.h" + +-#include "poll.h" ++#include "vm_poll.h" + + /* + * PollImpl: +Index: open-vm-tools/lib/include/vm_poll.h +=================================================================== +--- /dev/null ++++ open-vm-tools/lib/include/vm_poll.h +@@ -0,0 +1,324 @@ ++/********************************************************* ++ * Copyright (C) 1998-2016 VMware, Inc. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation version 2.1 and no later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public ++ * License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ *********************************************************/ ++ ++/********************************************************* ++ * The contents of this file are subject to the terms of the Common ++ * Development and Distribution License (the "License") version 1.0 ++ * and no later version. You may not use this file except in ++ * compliance with the License. ++ * ++ * You can obtain a copy of the License at ++ * http://www.opensource.org/licenses/cddl1.php ++ * ++ * See the License for the specific language governing permissions ++ * and limitations under the License. ++ * ++ *********************************************************/ ++ ++ ++#ifndef _POLL_H_ ++#define _POLL_H_ ++ ++#define INCLUDE_ALLOW_USERLEVEL ++#define INCLUDE_ALLOW_VMCORE ++#include "includeCheck.h" ++ ++#include "vm_basic_types.h" ++#include "vm_basic_defs.h" ++#include "vmware.h" ++#include "userlock.h" ++ ++#ifdef _WIN32 ++#define HZ 100 ++#elif defined linux ++#include ++#elif __APPLE__ ++#include ++/* ++ * Old SDKs don't define TARGET_OS_IPHONE at all. ++ * New ones define it to 0 on Mac OS X, 1 on iOS. ++ */ ++#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 ++#include ++#endif ++#include ++#define HZ 100 ++#endif ++#ifdef __ANDROID__ ++/* ++ * of android should be included, but its name is same ++ * with this file. So its content is put here to avoid conflict. ++ */ ++#include ++#define HZ 100 ++typedef unsigned int nfds_t; ++int poll(struct pollfd *, nfds_t, long); ++#endif ++ ++ ++/* ++ * Poll event types: each type has a different reason for firing, ++ * or condition that must be met before firing. ++ */ ++ ++typedef enum { ++ /* ++ * Actual Poll queue types against which you can register callbacks. ++ */ ++ POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ ++ POLL_VTIME = 0, ++ POLL_REALTIME, ++ POLL_DEVICE, ++ POLL_MAIN_LOOP, ++ POLL_NUM_QUEUES ++} PollEventType; ++ ++ ++/* ++ * Classes of events ++ * ++ * These are the predefined classes. More can be declared ++ * with Poll_AllocClass(). ++ */ ++ ++typedef enum PollClass { ++ POLL_CLASS_MAIN, ++ POLL_CLASS_PAUSE, ++ POLL_CLASS_IPC, ++ POLL_CLASS_CPT, ++ POLL_CLASS_MKS, ++ POLL_FIXED_CLASSES, ++ POLL_MAX_CLASSES = 320 /* Size enum to maximum */ ++} PollClass; ++ ++ ++/* ++ * Each callback is registered in a set of classes ++ */ ++ ++typedef struct PollClassSet { ++ /* Type is uintptr_t to give best 32/64-bit code. */ ++#define _POLL_ELEMSIZE (sizeof (uintptr_t) * 8) ++ uintptr_t bits[CEILING(POLL_MAX_CLASSES, _POLL_ELEMSIZE)]; ++} PollClassSet; ++ ++/* An empty PollClassSet. */ ++static INLINE PollClassSet ++PollClassSet_Empty(void) ++{ ++ PollClassSet set = { { 0 } }; ++ return set; ++} ++ ++/* A PollClassSet with the single member. */ ++static INLINE PollClassSet ++PollClassSet_Singleton(PollClass c) ++{ ++ PollClassSet s = PollClassSet_Empty(); ++ ++ ASSERT_ON_COMPILE(sizeof s.bits[0] * 8 == _POLL_ELEMSIZE); /* Size correct */ ++ ASSERT_ON_COMPILE((_POLL_ELEMSIZE & (_POLL_ELEMSIZE - 1)) == 0); /* power of 2 */ ++ ASSERT_ON_COMPILE(POLL_MAX_CLASSES <= ARRAYSIZE(s.bits) * _POLL_ELEMSIZE); ++ ASSERT(c < POLL_MAX_CLASSES); ++ ++ s.bits[c / _POLL_ELEMSIZE] = CONST3264U(1) << (c % _POLL_ELEMSIZE); ++ return s; ++} ++ ++/* Combine two PollClassSets. */ ++static INLINE PollClassSet ++PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) ++{ ++ PollClassSet u; ++ unsigned i; ++ ++ for (i = 0; i < ARRAYSIZE(u.bits); i++) { ++ u.bits[i] = lhs.bits[i] | rhs.bits[i]; ++ } ++ return u; ++} ++ ++/* Add single class to PollClassSet. */ ++static INLINE PollClassSet ++PollClassSet_Include(PollClassSet set, PollClass c) ++{ ++ return PollClassSet_Union(set, PollClassSet_Singleton(c)); ++} ++ ++ ++#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) ++#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ ++ PollClassSet_Singleton(POLL_CLASS_PAUSE)) ++#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ ++ PollClassSet_Singleton(POLL_CLASS_CPT)) ++#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ ++ PollClassSet_Singleton(POLL_CLASS_IPC)) ++#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ ++#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) ++/* ++ * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. ++ */ ++#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) ++ ++/* ++ * Poll class-set taxonomy: ++ * POLL_CS_MAIN ++ * - Unless you NEED another class, use POLL_CS_MAIN. ++ * POLL_CS_PAUSE ++ * - For callbacks that must occur even if the guest is paused. ++ * Most VMDB or Foundry commands are in this category. ++ * POLL_CS_CPT ++ * - Only for callbacks which can trigger intermediate Checkpoint ++ * transitions. ++ * The ONLY such callback is Migrate. ++ * POLL_CS_IPC ++ * - Only for callbacks which can contain Msg_(Post|Hint|Question) ++ * responses, and for signal handlers (why)? ++ * Vigor, VMDB, and Foundry can contain Msg_* responses. ++ * POLL_CS_MKS ++ * - Callback runs in MKS thread. ++ * POLL_CS_ALWAYS ++ * - Only for events that must be processed immediately. ++ * The ONLY such callback is OvhdMemVmxSizeCheck. ++ */ ++ ++ ++/* ++ * Poll_Callback flags ++ */ ++ ++#define POLL_FLAG_PERIODIC 0x01 // keep after firing ++#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory ++#define POLL_FLAG_READ 0x04 // device is ready for reading ++#define POLL_FLAG_WRITE 0x08 // device is ready for writing ++#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket ++#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking ++#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events ++#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. ++#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl ++#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop ++ ++ ++/* ++ * Advisory minimum time period. ++ * Users that want the fastest running real-time poll ++ * should use TICKS_TO_USECS(1). ++ */ ++ ++#define TICKS_TO_USECS(_x) ((_x) * (1000000 / HZ)) ++#define USECS_TO_TICKS(_x) ((_x) / (1000000 / HZ)) ++ ++ ++typedef void (*PollerFunction)(void *clientData); ++typedef void (*PollerFireWrapper)(PollerFunction func, ++ void *funcData, ++ void *wrapperData); ++typedef Bool (*PollerErrorFn)(const char *errorStr); ++ ++/* ++ * Initialisers: ++ * ++ * For the sake of convenience, we declare the initialisers ++ * for custom implmentations here, even though the actual ++ * implementations are distinct from the core poll code. ++ */ ++ ++typedef struct PollOptions { ++ Bool locked; // Use internal MXUser for locking ++ Bool allowFullQueue; // Don't assert when device event queue is full. ++ VThreadID windowsMsgThread; // thread that processes Windows messages ++ PollerFireWrapper fireWrapperFn; // optional; may be useful for stats ++ void *fireWrapperData; // optional ++ PollerErrorFn errorFn; // optional; called upon unrecoverable error ++} PollOptions; ++ ++ ++void Poll_InitDefault(void); ++void Poll_InitDefaultEx(const PollOptions *opts); ++void Poll_InitGtk(void); // On top of glib for Linux ++void Poll_InitCF(void); // On top of CoreFoundation for OSX ++ ++ ++/* ++ * Functions ++ */ ++int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); ++void Poll_Loop(Bool loop, Bool *exit, PollClass c); ++void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); ++Bool Poll_LockingEnabled(void); ++void Poll_Exit(void); ++ ++ ++/* ++ * Poll_Callback adds a callback regardless of whether an identical one exists. ++ * ++ * Likewise, Poll_CallbackRemove removes exactly one callback. ++ */ ++ ++VMwareStatus Poll_Callback(PollClassSet classSet, ++ int flags, ++ PollerFunction f, ++ void *clientData, ++ PollEventType type, ++ PollDevHandle info, // fd/microsec delay ++ MXUserRecLock *lck); ++Bool Poll_CallbackRemove(PollClassSet classSet, ++ int flags, ++ PollerFunction f, ++ void *clientData, ++ PollEventType type); ++Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, ++ int flags, ++ PollerFunction f, ++ PollEventType type, ++ void **clientData); ++ ++void Poll_NotifyChange(PollClassSet classSet); ++ ++/* ++ * Wrappers for Poll_Callback and Poll_CallbackRemove that present ++ * simpler subsets of those interfaces. ++ */ ++ ++VMwareStatus Poll_CB_Device(PollerFunction f, ++ void *clientData, ++ PollDevHandle device, ++ Bool periodic); ++ ++Bool Poll_CB_DeviceRemove(PollerFunction f, ++ void *clientData, ++ Bool periodic); ++ ++ ++VMwareStatus Poll_CB_RTime(PollerFunction f, ++ void *clientData, ++ int delay, // microseconds ++ Bool periodic, ++ MXUserRecLock *lock); ++ ++Bool Poll_CB_RTimeRemove(PollerFunction f, ++ void *clientData, ++ Bool periodic); ++ ++ ++#ifdef _WIN32 ++void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); ++Bool Poll_FireWndCallback(void *lparam); ++#endif ++ ++#endif // _POLL_H_ +Index: open-vm-tools/lib/rpcIn/rpcin.c +=================================================================== +--- open-vm-tools.orig/lib/rpcIn/rpcin.c ++++ open-vm-tools/lib/rpcIn/rpcin.c +@@ -57,7 +57,7 @@ + + #if defined(VMTOOLS_USE_VSOCKET) + # include +-# include "poll.h" ++# include "vm_poll.h" + # include "asyncsocket.h" + # include "vmci_defs.h" + #include "dataMap.h" +Index: open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c +=================================================================== +--- open-vm-tools.orig/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c ++++ open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c +@@ -48,7 +48,7 @@ + #include "rpcout.h" + #include "rabbitmqProxyConst.h" + #include "vm_basic_types.h" +-#include "poll.h" ++#include "vm_poll.h" + #ifdef OPEN_VM_TOOLS + #include "vmci_sockets.h" + #include "sslDirect.h" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch new file mode 100644 index 000000000..010516761 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch @@ -0,0 +1,31 @@ +From cdb0b3c898c6b6b6c8259d9ddb8b00163ac5e419 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Jul 2017 09:43:18 -0700 +Subject: [PATCH 04/11] Add -Wno-incompatible-pointer-types and + -Wno-error=address + +Signed-off-by: Khem Raj +--- + open-vm-tools/lib/dynxdr/Makefile.am | 2 +- + open-vm-tools/lib/file/Makefile.am | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +Index: open-vm-tools/lib/dynxdr/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/dynxdr/Makefile.am ++++ open-vm-tools/lib/dynxdr/Makefile.am +@@ -20,4 +20,4 @@ noinst_LTLIBRARIES = libDynxdr.la + libDynxdr_la_SOURCES = + libDynxdr_la_SOURCES += dynxdr.c + libDynxdr_la_SOURCES += xdrutil.c +- ++libDynxdr_la_CPPFLAGS = -Wno-incompatible-pointer-types +Index: open-vm-tools/lib/file/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/file/Makefile.am ++++ open-vm-tools/lib/file/Makefile.am +@@ -27,3 +27,4 @@ libFile_la_SOURCES += fileLockPrimitive. + libFile_la_SOURCES += fileLockPosix.c + libFile_la_SOURCES += fileTempPosix.c + libFile_la_SOURCES += fileTemp.c ++libFile_la_CPPFLAGS = -Wno-error=address diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch new file mode 100644 index 000000000..f02d00f84 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch @@ -0,0 +1,45 @@ +From bf1eafb07297711baf9320b1edcca8a3376f117d Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Wed, 18 Nov 2015 09:03:00 +0000 +Subject: [PATCH 05/11] Use configure test for struct timespec + +Use the configure script to test for struct time spec instead of trying +to keep track of what platforms has it. + +Signed-off-by: Natanael Copa +--- + open-vm-tools/configure.ac | 1 + + open-vm-tools/lib/include/hgfsUtil.h | 8 +------- + 2 files changed, 2 insertions(+), 7 deletions(-) + +Index: open-vm-tools/configure.ac +=================================================================== +--- open-vm-tools.orig/configure.ac ++++ open-vm-tools/configure.ac +@@ -1127,6 +1127,7 @@ AC_TYPE_OFF_T + AC_TYPE_PID_T + AC_TYPE_SIZE_T + AC_CHECK_MEMBERS([struct stat.st_rdev]) ++AC_CHECK_MEMBERS([struct timespec.tv_sec],[],[],[[#include ]]) + AC_HEADER_TIME + AC_STRUCT_TM + AC_C_VOLATILE +Index: open-vm-tools/lib/include/hgfsUtil.h +=================================================================== +--- open-vm-tools.orig/lib/include/hgfsUtil.h ++++ open-vm-tools/lib/include/hgfsUtil.h +@@ -53,13 +53,7 @@ + # include + # endif + # include "vm_basic_types.h" +-# if !defined _STRUCT_TIMESPEC && \ +- !defined _TIMESPEC_DECLARED && \ +- !defined __timespec_defined && \ +- !defined sun && \ +- !defined __FreeBSD__ && \ +- !__APPLE__ && \ +- !defined _WIN32 ++# if !defined HAVE_STRUCT_TIMESPEC_TV_SEC + struct timespec { + time_t tv_sec; + long tv_nsec; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch new file mode 100644 index 000000000..d1f4eff9b --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch @@ -0,0 +1,58 @@ +From 31ae6f42458f90d4994a4ad8e2b7673691612c36 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Wed, 18 Nov 2015 09:10:14 +0000 +Subject: [PATCH 06/11] Fix definition of ALLPERMS and ACCESSPERMS + +The ALLPERMS and ACCESSPERMS defines are not specified in POSIX so +assume it is not there instead of testing for specific implementations. + +This is needed for musl libc. + +Signed-off-by: Natanael Copa +--- + open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- + open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- + 2 files changed, 6 insertions(+), 5 deletions(-) + +Index: open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +=================================================================== +--- open-vm-tools.orig/lib/hgfsServer/hgfsServerLinux.c ++++ open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +@@ -107,11 +107,13 @@ typedef struct DirectoryEntry { + #endif + + /* +- * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not defined in the +- * Solaris version of . ++ * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not specified in ++ * POSIX. + */ +-#ifdef sun ++#ifndef ACCESSPERMS + # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) ++#endif ++#ifndef ALLPERMS + # define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) + #endif + +Index: open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c +=================================================================== +--- open-vm-tools.orig/services/plugins/dndcp/dnd/dndLinux.c ++++ open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c +@@ -51,7 +51,7 @@ + + #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) + #define DND_STAGINGDIR_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) +-#ifdef sun ++#ifndef ACCESSPERMS + #define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) + #endif + #ifdef __ANDROID__ +@@ -60,7 +60,6 @@ + */ + #define NO_SETMNTENT + #define NO_ENDMNTENT +-#define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) + #endif + + diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch new file mode 100644 index 000000000..5adf9b0f9 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -0,0 +1,144 @@ +From 6cc1c22cc30320f56da552a76bd956db8f255b6a Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Wed, 18 Nov 2015 10:05:07 +0000 +Subject: [PATCH 07/11] Use configure to test for feature instead of platform + +Test for various functions instead of trying to keep track of what +platform and what version of the given platform has support for what. + +This should make it easier to port to currently unknown platforms and +will solve the issue if a platform add support for a missing feature in +the future. + +The features we test for are: +- getifaddrs +- getauxval +- issetugid +- __secure_getenv + +This is needed for musl libc. + +Signed-off-by: Natanael Copa +--- + open-vm-tools/configure.ac | 4 ++++ + open-vm-tools/lib/misc/idLinux.c | 30 ++++++++++++++---------------- + open-vm-tools/lib/nicInfo/nicInfoPosix.c | 8 ++++++-- + 3 files changed, 24 insertions(+), 18 deletions(-) + +Index: open-vm-tools/configure.ac +=================================================================== +--- open-vm-tools.orig/configure.ac ++++ open-vm-tools/configure.ac +@@ -798,6 +798,7 @@ AC_CHECK_FUNCS( + + AC_CHECK_FUNCS([ecvt]) + AC_CHECK_FUNCS([fcvt]) ++AC_CHECK_FUNCS([getifaddrs getauxval issetugid __secure_getenv]) + + AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) + +@@ -1063,10 +1064,13 @@ AC_PATH_PROG( + ### + + AC_CHECK_HEADERS([crypt.h]) ++AC_CHECK_HEADERS([ifaddrs.h]) + AC_CHECK_HEADERS([inttypes.h]) + AC_CHECK_HEADERS([stdint.h]) + AC_CHECK_HEADERS([stdlib.h]) + AC_CHECK_HEADERS([wchar.h]) ++AC_CHECK_HEADERS([net/if.h]) ++AC_CHECK_HEADERS([sys/auxv.h]) + AC_CHECK_HEADERS([sys/inttypes.h]) + AC_CHECK_HEADERS([sys/io.h]) + AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD +Index: open-vm-tools/lib/misc/idLinux.c +=================================================================== +--- open-vm-tools.orig/lib/misc/idLinux.c ++++ open-vm-tools/lib/misc/idLinux.c +@@ -27,12 +27,9 @@ + #include + #include + #include +-#ifdef __linux__ +-#if defined(__GLIBC__) && \ +- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) ++#ifdef HAVE_SYS_AUXV_H + #include + #endif +-#endif + #ifdef __APPLE__ + #include + #include +@@ -997,31 +994,32 @@ Id_EndSuperUser(uid_t uid) // IN: + static Bool + IdIsSetUGid(void) + { +-#if defined(__ANDROID__) +- /* Android does not have a secure_getenv, so be conservative. */ +- return TRUE; +-#else + /* + * We use __secure_getenv, which returns NULL if the binary is +- * setuid or setgid. Alternatives include, ++ * setuid or setgid, when issetugid or getauxval(AT_SECURE) is not ++ * available. Alternatives include, + * +- * a) getauxval(AT_SECURE); not available until glibc 2.16. +- * b) __libc_enable_secure; may not be exported. ++ * a) issetugid(); not (yet?) available in glibc. ++ * b) getauxval(AT_SECURE); not available until glibc 2.16. ++ * c) __libc_enable_secure; may not be exported. + * +- * Use (a) when we are based on glibc 2.16, or newer. ++ * Use (b) when we are based on glibc 2.16, or newer. + */ + +-#if defined(__GLIBC__) && \ +- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) ++#if HAVE_ISSETUGID ++ return issetugid(); ++#elif HAVE_GETAUXVAL + return getauxval(AT_SECURE) != 0; +-#else ++#elif HAVE___SECURE_GETENV + static const char envName[] = "VMW_SETUGID_TEST"; + + if (setenv(envName, "1", TRUE) == -1) { + return TRUE; /* Conservative */ + } + return __secure_getenv(envName) == NULL; +-#endif ++#else ++ /* Android does not have a secure_getenv, so be conservative. */ ++ return TRUE; + #endif + } + #endif +Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c +=================================================================== +--- open-vm-tools.orig/lib/nicInfo/nicInfoPosix.c ++++ open-vm-tools/lib/nicInfo/nicInfoPosix.c +@@ -34,9 +34,13 @@ + #include + #include + #include +-#if defined(__FreeBSD__) || defined(__APPLE__) ++#if HAVE_SYS_SYSCTL_H + # include ++#endif ++#if HAVE_IFADDRS_H + # include ++#endif ++#if HAVE_NET_IF_H + # include + #endif + #ifndef NO_DNET +@@ -348,7 +352,7 @@ GuestInfoGetNicInfo(NicInfoV3 *nicInfo) + * + ****************************************************************************** + */ +-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(USERWORLD) ++#if defined(NO_DNET) && defined(HAVE_GETIFADDRS) + + char * + GuestInfoGetPrimaryIP(void) diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch new file mode 100644 index 000000000..3d1291c9f --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch @@ -0,0 +1,30 @@ +From d4d1e7146ca2698089f6bd532f2fb8b9c1134ca7 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Mon, 2 Jan 2017 14:39:27 +0000 +Subject: [PATCH 08/11] use posix strerror_r unless gnu + +--- + open-vm-tools/lib/err/errPosix.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +Index: open-vm-tools/lib/err/errPosix.c +=================================================================== +--- open-vm-tools.orig/lib/err/errPosix.c ++++ open-vm-tools/lib/err/errPosix.c +@@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, + { + char *p; + +-#if defined(linux) && !defined(N_PLAT_NLM) && !defined(__ANDROID__) ++#if defined(__GLIBC__) + p = strerror_r(errorNumber, buf, bufSize); + #else +- p = strerror(errorNumber); +-#endif ++ if (strerror_r(errorNumber, buf, bufSize) != 0) ++ snprintf(buf, bufSize, "unknown error %i", errorNumber); ++ p = buf; ++#endif /* defined __GLIBC__ */ + ASSERT(p != NULL); + return p; + } diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch new file mode 100644 index 000000000..2bee5ac82 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch @@ -0,0 +1,342 @@ +From 5ae6c662fefa621f4600559e299a7d97c2254e69 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Sun, 16 Jul 2017 10:20:10 -0700 +Subject: [PATCH 1/3] Add support for building with system libtirpc + +Signed-off-by: Natanael Copa +Signed-off-by: Khem Raj + +--- + open-vm-tools/configure.ac | 14 ++++++++++++++ + open-vm-tools/lib/dynxdr/Makefile.am | 8 ++++++-- + open-vm-tools/lib/err/errPosix.c | 1 + + open-vm-tools/lib/guestRpc/Makefile.am | 6 ++++++ + open-vm-tools/lib/misc/Makefile.am | 1 + + open-vm-tools/lib/netUtil/Makefile.am | 4 ++++ + open-vm-tools/lib/nicInfo/Makefile.am | 2 ++ + open-vm-tools/lib/rpcChannel/Makefile.am | 4 ++++ + open-vm-tools/lib/slashProc/Makefile.am | 4 ++++ + open-vm-tools/lib/string/bsd_output_shared.c | 2 +- + open-vm-tools/libguestlib/Makefile.am | 2 ++ + open-vm-tools/rpctool/Makefile.am | 3 +++ + open-vm-tools/rpctool/rpctool.c | 2 ++ + open-vm-tools/services/plugins/dndcp/Makefile.am | 2 ++ + open-vm-tools/services/plugins/guestInfo/Makefile.am | 1 + + open-vm-tools/services/plugins/resolutionSet/Makefile.am | 2 ++ + open-vm-tools/services/plugins/vix/Makefile.am | 2 ++ + open-vm-tools/services/plugins/vmbackup/Makefile.am | 2 ++ + open-vm-tools/toolbox/Makefile.am | 2 ++ + 19 files changed, 61 insertions(+), 3 deletions(-) + +Index: open-vm-tools/configure.ac +=================================================================== +--- open-vm-tools.orig/configure.ac ++++ open-vm-tools/configure.ac +@@ -405,6 +405,20 @@ AC_VMW_CHECK_LIB([fuse], + AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])]) + + # ++# Check for libtirpc ++# ++AC_VMW_CHECK_LIB([libtirpc], ++ [LIBTIRPC], ++ [libtirpc], ++ [], ++ [], ++ [rpc/xdr.h], ++ [xdr_void], ++ [have_libtirpc=yes], ++ [have_libtitirpc=no; ++ AC_MSG_WARN([libtirpc is missing.])]) ++ ++# + # Check for PAM. + # + AC_ARG_WITH([pam], +Index: open-vm-tools/lib/dynxdr/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/dynxdr/Makefile.am ++++ open-vm-tools/lib/dynxdr/Makefile.am +@@ -17,7 +17,11 @@ + + noinst_LTLIBRARIES = libDynxdr.la + +-libDynxdr_la_SOURCES = ++libDynxdr_la_SOURCES = + libDynxdr_la_SOURCES += dynxdr.c + libDynxdr_la_SOURCES += xdrutil.c +-libDynxdr_la_CPPFLAGS = -Wno-incompatible-pointer-types ++libDynxdr_la_CPPFLAGS = @LIBTIRPC_CPPFLAGS@ -Wno-incompatible-pointer-types ++ ++libDynxdr_la_LIBADD = ++libDynxdr_la_LIBADD += @LIBTIRPC_LIBS@ ++ +Index: open-vm-tools/lib/err/errPosix.c +=================================================================== +--- open-vm-tools.orig/lib/err/errPosix.c ++++ open-vm-tools/lib/err/errPosix.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "vmware.h" + #include "errInt.h" +Index: open-vm-tools/lib/guestRpc/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/guestRpc/Makefile.am ++++ open-vm-tools/lib/guestRpc/Makefile.am +@@ -20,6 +20,12 @@ noinst_LTLIBRARIES = libGuestRpc.la + libGuestRpc_la_SOURCES = + libGuestRpc_la_SOURCES += nicinfo_xdr.c + ++libGuestRpc_la_CPPFLAGS = ++libGuestRpc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ ++ ++libGuestRpc_la_LIBADD = ++libGuestRpc_la_LIBADD += @LIBTIRPC_LIBS@ ++ + # XXX: Autoreconf complains about this and recommends using AM_CFLAGS instead. + # Problem is, $(CFLAGS) is appended to the compiler command line after AM_CFLAGS + # and after libGuestRpc_la_CFLAGS, so "-Wall -Werror" will override this flag. +Index: open-vm-tools/lib/misc/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/misc/Makefile.am ++++ open-vm-tools/lib/misc/Makefile.am +@@ -52,4 +52,5 @@ libMisc_la_SOURCES += utilMem.c + libMisc_la_SOURCES += vmstdio.c + libMisc_la_SOURCES += strutil.c + libMisc_la_SOURCES += vthreadBase.c ++libMisc_la_CPPFLAGS = -Wno-error=int-conversion + +Index: open-vm-tools/lib/netUtil/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/netUtil/Makefile.am ++++ open-vm-tools/lib/netUtil/Makefile.am +@@ -20,3 +20,7 @@ noinst_LTLIBRARIES = libNetUtil.la + libNetUtil_la_SOURCES = + libNetUtil_la_SOURCES += netUtilLinux.c + ++libNetUtil_la_CPPFLAGS = ++libNetUtil_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ ++ ++libNetUtil_la_LIBADD = @LIBTIRPC_LIBS@ +Index: open-vm-tools/lib/nicInfo/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/nicInfo/Makefile.am ++++ open-vm-tools/lib/nicInfo/Makefile.am +@@ -25,12 +25,14 @@ libNicInfo_la_SOURCES += nicInfoPosix.c + + libNicInfo_la_CPPFLAGS = + libNicInfo_la_CPPFLAGS += @GLIB2_CPPFLAGS@ ++libNicInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + + AM_CFLAGS = $(DNET_CPPFLAGS) + if USE_SLASH_PROC + AM_CFLAGS += -DUSE_SLASH_PROC + endif + libNicInfo_la_LIBADD = ++libNicInfo_la_LIBADD += @LIBTIRPC_LIBS@ + if HAVE_DNET + libNicInfo_la_LIBADD += @DNET_LIBS@ + endif +Index: open-vm-tools/lib/rpcChannel/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/rpcChannel/Makefile.am ++++ open-vm-tools/lib/rpcChannel/Makefile.am +@@ -27,3 +27,7 @@ endif + + libRpcChannel_la_CPPFLAGS = + libRpcChannel_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@ ++libRpcChannel_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ ++ ++libRpcChannel_la_LIBADD = ++libRpcChannel_la_LIBADD += @LIBTIRPC_LIBS@ +Index: open-vm-tools/lib/slashProc/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/slashProc/Makefile.am ++++ open-vm-tools/lib/slashProc/Makefile.am +@@ -22,6 +22,10 @@ libSlashProc_la_SOURCES += net.c + + libSlashProc_la_CPPFLAGS = + libSlashProc_la_CPPFLAGS += @GLIB2_CPPFLAGS@ ++libSlashProc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ ++ ++libSlashProc_la_LIBADD = ++libSlashProc_la_LIBADD += @LIBTIRPC_LIBS@ + + AM_CFLAGS = $(DNET_CPPFLAGS) + +Index: open-vm-tools/lib/string/bsd_output_shared.c +=================================================================== +--- open-vm-tools.orig/lib/string/bsd_output_shared.c ++++ open-vm-tools/lib/string/bsd_output_shared.c +@@ -38,7 +38,7 @@ + //#include + + #if !defined(STR_NO_WIN32_LIBS) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) +- ++#define _GNU_SOURCE + #include + #include + #ifndef _WIN32 +Index: open-vm-tools/libguestlib/Makefile.am +=================================================================== +--- open-vm-tools.orig/libguestlib/Makefile.am ++++ open-vm-tools/libguestlib/Makefile.am +@@ -22,6 +22,7 @@ AM_CFLAGS += -I$(top_srcdir)/include + + libguestlib_la_LIBADD = + libguestlib_la_LIBADD += @VMTOOLS_LIBS@ ++libguestlib_la_LIBADD += @LIBTIRPC_LIBS@ + + libguestlib_la_SOURCES = + libguestlib_la_SOURCES += guestlibV3_xdr.c +@@ -56,6 +57,7 @@ CFLAGS += -Wno-unused + libguestlib_la_CPPFLAGS = + libguestlib_la_CPPFLAGS += -DVMTOOLS_USE_GLIB + libguestlib_la_CPPFLAGS += @GLIB2_CPPFLAGS@ ++libguestlib_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + + EXTRA_DIST = vmguestlib.pc.in + +Index: open-vm-tools/rpctool/Makefile.am +=================================================================== +--- open-vm-tools.orig/rpctool/Makefile.am ++++ open-vm-tools/rpctool/Makefile.am +@@ -17,10 +17,13 @@ + + bin_PROGRAMS = vmware-rpctool + ++vmware_rpctool_CFLAGS= @LIBTIRPC_LIBS@ ++ + vmware_rpctool_SOURCES = + vmware_rpctool_SOURCES += rpctool.c + + vmware_rpctool_LDADD = ++vmware_rpctool_LDADD += @LIBTIRPC_LIBS@ + vmware_rpctool_LDADD += ../lib/rpcOut/libRpcOut.la + vmware_rpctool_LDADD += ../lib/message/libMessage.la + vmware_rpctool_LDADD += ../lib/backdoor/libBackdoor.la +Index: open-vm-tools/rpctool/rpctool.c +=================================================================== +--- open-vm-tools.orig/rpctool/rpctool.c ++++ open-vm-tools/rpctool/rpctool.c +@@ -23,6 +23,8 @@ + */ + + #ifndef _WIN32 ++#define _GNU_SOURCE ++#include + #include "sigPosixRegs.h" + #include + #include +Index: open-vm-tools/services/plugins/dndcp/Makefile.am +=================================================================== +--- open-vm-tools.orig/services/plugins/dndcp/Makefile.am ++++ open-vm-tools/services/plugins/dndcp/Makefile.am +@@ -23,6 +23,7 @@ plugin_LTLIBRARIES = libdndcp.la + libdndcp_la_CPPFLAGS = + libdndcp_la_CPPFLAGS += @GTK_CPPFLAGS@ + libdndcp_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ ++libdndcp_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd + libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dndGuest + libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx +@@ -44,6 +45,7 @@ libdndcp_la_LIBADD += @GTK_LIBS@ + libdndcp_la_LIBADD += @GTKMM_LIBS@ + libdndcp_la_LIBADD += @VMTOOLS_LIBS@ + libdndcp_la_LIBADD += @HGFS_LIBS@ ++libdndcp_la_LIBADD += @LIBTIRPC_LIBS@ + libdndcp_la_LIBADD += $(top_builddir)/lib/hgfsUri/hgfsUriPosix.lo + + libdndcp_la_SOURCES = +Index: open-vm-tools/services/plugins/guestInfo/Makefile.am +=================================================================== +--- open-vm-tools.orig/services/plugins/guestInfo/Makefile.am ++++ open-vm-tools/services/plugins/guestInfo/Makefile.am +@@ -22,6 +22,7 @@ plugin_LTLIBRARIES = libguestInfo.la + + libguestInfo_la_CPPFLAGS = + libguestInfo_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ ++libguestInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + + libguestInfo_la_LDFLAGS = + libguestInfo_la_LDFLAGS += @PLUGIN_LDFLAGS@ +Index: open-vm-tools/services/plugins/resolutionSet/Makefile.am +=================================================================== +--- open-vm-tools.orig/services/plugins/resolutionSet/Makefile.am ++++ open-vm-tools/services/plugins/resolutionSet/Makefile.am +@@ -21,6 +21,7 @@ plugin_LTLIBRARIES = libresolutionSet.la + libresolutionSet_la_CPPFLAGS = + libresolutionSet_la_CPPFLAGS += @GTK_CPPFLAGS@ + libresolutionSet_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ ++libresolutionSet_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + libresolutionSet_la_CPPFLAGS += -DRESOLUTION_X11 + + libresolutionSet_la_LDFLAGS = +@@ -30,6 +31,7 @@ libresolutionSet_la_LIBADD = + libresolutionSet_la_LIBADD += @COMMON_XLIBS@ + libresolutionSet_la_LIBADD += @GTK_LIBS@ + libresolutionSet_la_LIBADD += @VMTOOLS_LIBS@ ++libresolutionSet_la_LIBADD += @LIBTIRPC_LIBS@ + + libresolutionSet_la_SOURCES = + libresolutionSet_la_SOURCES += libvmwarectrl.c +Index: open-vm-tools/services/plugins/vix/Makefile.am +=================================================================== +--- open-vm-tools.orig/services/plugins/vix/Makefile.am ++++ open-vm-tools/services/plugins/vix/Makefile.am +@@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvix.la + + libvix_la_CPPFLAGS = + libvix_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ ++libvix_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + libvix_la_CPPFLAGS += -I$(top_srcdir)/vgauth/public + + libvix_la_LDFLAGS = +@@ -29,6 +30,7 @@ libvix_la_LIBADD = + libvix_la_LIBADD += @VIX_LIBADD@ + libvix_la_LIBADD += @VMTOOLS_LIBS@ + libvix_la_LIBADD += @HGFS_LIBS@ ++libvix_la_LIBADD += @LIBTIRPC_LIBS@ + libvix_la_LIBADD += $(top_builddir)/lib/auth/libAuth.la + libvix_la_LIBADD += $(top_builddir)/lib/foundryMsg/libFoundryMsg.la + libvix_la_LIBADD += $(top_builddir)/lib/impersonate/libImpersonate.la +Index: open-vm-tools/services/plugins/vmbackup/Makefile.am +=================================================================== +--- open-vm-tools.orig/services/plugins/vmbackup/Makefile.am ++++ open-vm-tools/services/plugins/vmbackup/Makefile.am +@@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvmbackup.la + + libvmbackup_la_CPPFLAGS = + libvmbackup_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ ++libvmbackup_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + + libvmbackup_la_LDFLAGS = + libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAGS@ +@@ -27,6 +28,7 @@ libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAG + libvmbackup_la_LIBADD = + libvmbackup_la_LIBADD += @GOBJECT_LIBS@ + libvmbackup_la_LIBADD += @VMTOOLS_LIBS@ ++libvmbackup_la_LIBADD += @LIBTIRPC_LIBS@ + + libvmbackup_la_SOURCES = + libvmbackup_la_SOURCES += nullProvider.c +Index: open-vm-tools/toolbox/Makefile.am +=================================================================== +--- open-vm-tools.orig/toolbox/Makefile.am ++++ open-vm-tools/toolbox/Makefile.am +@@ -20,9 +20,11 @@ bin_PROGRAMS = vmware-toolbox-cmd + vmware_toolbox_cmd_LDADD = + vmware_toolbox_cmd_LDADD += ../libguestlib/libguestlib.la + vmware_toolbox_cmd_LDADD += @VMTOOLS_LIBS@ ++vmware_toolbox_cmd_LDADD += @LIBTIRPC_LIBS@ + + vmware_toolbox_cmd_CPPFLAGS = + vmware_toolbox_cmd_CPPFLAGS += @VMTOOLS_CPPFLAGS@ ++vmware_toolbox_cmd_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ + + vmware_toolbox_cmd_SOURCES = + vmware_toolbox_cmd_SOURCES += toolbox-cmd.c diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch new file mode 100644 index 000000000..c9beac1fc --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch @@ -0,0 +1,65 @@ +From 27442e2dd287d393d7b3f8bf164a887affef84df Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Wed, 18 Nov 2015 10:27:51 +0000 +Subject: [PATCH 10/11] gnu-ucontext + +--- + open-vm-tools/lib/include/sigPosixRegs.h | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +Index: open-vm-tools/lib/include/sigPosixRegs.h +=================================================================== +--- open-vm-tools.orig/lib/include/sigPosixRegs.h ++++ open-vm-tools/lib/include/sigPosixRegs.h +@@ -33,7 +33,7 @@ + #include "includeCheck.h" + + +-#if __linux__ // We need the REG_foo offsets in the gregset_t; ++#if defined(__GLIBC__) // We need the REG_foo offsets in the gregset_t; + # define _GNU_SOURCE // _GNU_SOURCE maps to __USE_GNU + + /* And, the REG_foo definitions conflict with our own in x86.h */ +@@ -73,7 +73,7 @@ + #include + #endif + +-#if __linux__ ++#if defined(__GLIBC__) + # if defined(__x86_64__) + # undef REG_RAX + # undef REG_RBX +@@ -199,7 +199,7 @@ + #define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.mc_esp) + #define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.mc_eip) + #endif +-#elif defined (sun) ++#elif !defined (__GLIBC__) + #ifdef __x86_64__ + #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_RAX]) + #define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_RBX]) +@@ -219,15 +219,15 @@ + #define SC_R14(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_R14]) + #define SC_R15(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_R15]) + #else +-#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EAX]) +-#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EBX]) +-#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ECX]) +-#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EDX]) +-#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EDI]) +-#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESI]) +-#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EBP]) +-#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESP]) +-#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EIP]) ++#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EAX]) ++#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EBX]) ++#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_ECX]) ++#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EDX]) ++#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EDI]) ++#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_ESI]) ++#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EBP]) ++#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_ESP]) ++#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EIP]) + #endif + #elif defined(ANDROID_X86) + #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.eax) diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch new file mode 100644 index 000000000..78722390e --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch @@ -0,0 +1,25 @@ +From 95c6184d9ff70a47c41768850923a96de9e544aa Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Wed, 18 Nov 2015 10:41:01 +0000 +Subject: [PATCH 11/11] Use configure test for sys/stat.h include + +This is needed for musl libc. + +Signed-off-by: Natanael Copa +--- + open-vm-tools/services/plugins/vix/vixTools.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: open-vm-tools/services/plugins/vix/vixTools.c +=================================================================== +--- open-vm-tools.orig/services/plugins/vix/vixTools.c ++++ open-vm-tools/services/plugins/vix/vixTools.c +@@ -66,7 +66,7 @@ + #include + #endif + +-#if defined(sun) || defined(__FreeBSD__) || defined(__APPLE__) ++#ifdef HAVE_SYS_STAT_H + #include + #endif + diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb index 65fbfc9e9..569aef79b 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb @@ -13,26 +13,39 @@ SUMMARY = "Tools to enhance VMWare guest integration and performance" HOMEPAGE = "https://github.com/vmware/open-vm-tools" SECTION = "vmware-tools" -LICENSE = "LGPLv2.1 & GPLv2 & BSD & CDDLv1" +LICENSE = "LGPL-2.0 & GPL-2.0 & BSD & CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b66ba4cb4fc017682c95efc300410e79" LICENSE_modules/freebsd/vmblock = "BSD" -LICENSE_modules/freebsd/vmmemctl = "GPLv2" -LICENSE_modules/freebsd/vmxnet = "GPLv2" -LICENSE_modules/linux = "GPLv2" -LICENSE_modules/solaris = "CDDLv1" +LICENSE_modules/freebsd/vmmemctl = "GPL-2.0" +LICENSE_modules/freebsd/vmxnet = "GPL-2.0" +LICENSE_modules/linux = "GPL-2.0" +LICENSE_modules/solaris = "CDDL-1.0" SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://tools.conf \ file://vmtoolsd.service \ file://0001-configure.ac-don-t-use-dnet-config.patch \ file://0002-add-include-sys-sysmacros.h.patch \ + file://0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch \ + file://0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch \ + file://0003-Rename-poll.h-to-vm_poll.h.patch \ + file://0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch \ + file://0005-Use-configure-test-for-struct-timespec.patch \ + file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \ + file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \ + file://0008-use-posix-strerror_r-unless-gnu.patch \ + file://0011-Use-configure-test-for-sys-stat.h-include.patch \ + " +SRC_URI_append_libc-musl = "\ + file://0009-Add-support-for-building-with-system-libtirpc.patch \ + file://0010-gnu-ucontext.patch \ " - SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" S = "${WORKDIR}/git/open-vm-tools" DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps" +DEPENDS_append_libc-musl = " libtirpc" # open-vm-tools is supported only on x86. COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' From patchwork Tue Jul 18 03:10:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108052 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336882qge; Mon, 17 Jul 2017 20:12:26 -0700 (PDT) X-Received: by 10.84.209.237 with SMTP id y100mr860411plh.6.1500347546524; Mon, 17 Jul 2017 20:12:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347546; cv=none; d=google.com; s=arc-20160816; b=pHY+sI3TCNhrSO1Kn3OmTlD0oOT5vK1lg1o7xEWWJ0Bf2JiTCusOeZy/v798NLBRta 1Dk9XGXr6vEV/0uWDNYRTdfEvaPGjEj9FZAzlfrZvTvuDTkYWEyb6Xqj3m7MnL742pLM D3p+7Xe3N9b4hWkvqqZ/fjbMlDw1mbcd4LXzhxUgrrVIiPdeH2JTbHmQ9f5VNwo4Hk4N lH3dsj+0aBOtQXvq2FxrrS1DFbV/gfQyHbTQQ02JfsgJ92q0PbezY+IVP+uSKwSbW2Ob zTrx9dMfKl0U+e/zpqe4QyyPFQxD9FNv3Ci8m1ag1ZMRgA10u8t2ayR1n238O/qUfe9v 2ZzQ== 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=7NBvgixVJ1TW3aYyu1AvYbhMxA/JRLtzTAcmnov/ebU=; b=x7EojydXmyRBM2ELIE61xHdXPgLG6Buqjm2YGnS8OSr6Ein0C4cn9JSLOkmc3QJtpw EVOjfqbRAETxrO2M8VIcMq+BWPlXRJQO4np3mnfx7dDKl6GQugCkWxpSsU3Gfq3pAoF1 ox0x4fLF26KaWXih7PFjjANXlMlxHuEmQOXeCynOOYmzkn4EhRRyuF/uNoY2hTBxk8K1 x6v5Uv1LRwaM6ZFUlJFkCu7L5WuwPpXhgLYQJs5KhhFQX16/sa8RuTgg3hceevRSMWap GQXPXVAuY5WIiiyLZPBUZGQaJoAwmn2/OoeKsw6IUW4dOtlqw3pqGOKTF7vcZRQQAyFv CADQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=YF3PeKzu; 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=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 g1si754717pgc.11.2017.07.17.20.12.26; Mon, 17 Jul 2017 20:12:26 -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.b=YF3PeKzu; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CAE4B78195; Tue, 18 Jul 2017 03:10:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f176.google.com (mail-pf0-f176.google.com [209.85.192.176]) by mail.openembedded.org (Postfix) with ESMTP id 04E717805C for ; Tue, 18 Jul 2017 03:10:45 +0000 (UTC) Received: by mail-pf0-f176.google.com with SMTP id e26so4364570pfd.0 for ; Mon, 17 Jul 2017 20:10:47 -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=mDLjWwIfdVpcg0j2bHr5I8O1kAdvIdjycQvHkqMikqs=; b=YF3PeKzuePD96Ht3BRh0E50Eg9MeGnk4K7CezvZR5L13fOon1q3HLYSRbHNNegWTuL ODAHs71NczoTECmPZEtCbPF+0GJcIIUF6/mVa6BtwDQKsjz37OwUyU0EdW/5JIHyN3Ef f4pfpsLX34S6vy4MGYVjxuIq7Q1cnYmsUZ0dlvJB/Jq75vAhBQNZJ18QUv2ztUjmeSe/ iZPZCmuOhOr0MDRwX6N4kg6nY2kLT8FP0gLbTnXviffTcnlk6KCw2nbuYVsjeZrGn5rd evbwHn1AVgaZ7Q+X8xUrcxYYV8rV8eqAglpUnAcuNXPw+T40j5A2GDu44mQwwXly2JlA 4NkA== 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=mDLjWwIfdVpcg0j2bHr5I8O1kAdvIdjycQvHkqMikqs=; b=KHwyfUrRuxggsG0+L8TCLmRh5yCkHjzgPMrOVPGzvb/BblEO6fZFxx/yaUqpaVUVHU JNEm/DHY9irrpP0hcJWoAk7USXeqFQPd2LbY9y7Mpxy3I+2n7nBwGVOq6VNu48ZJPXhG 6drVCM5w1Ag97BzJetD0Qni20KyzfZIoBXdhefVsmXl9Y3uBNk3icYqCrYj6qI+F3KA6 YZ/X8BISD3io0Yg4HToHqrlNUvts6VGOnQ6+8ui41NPb4rbdp22PpIvx8coV7w0LfiIK MYcS6lnElKIuATqln6SpicQASGZ/UikS6NYAEdYzv7R124TsGIOTMu8PHKbZePcck7b9 6beQ== X-Gm-Message-State: AIVw110jke+V808jsG1C7C4eh8/T5RO+u68PZgRJ5e1HZdY/zRsJ1uhG mCkCe78dNRglDyiS X-Received: by 10.101.90.135 with SMTP id c7mr790991pgt.168.1500347446746; Mon, 17 Jul 2017 20:10:46 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:45 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:12 -0700 Message-Id: <20170718031013.44536-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 16/17] lm_sensors: Fix build on musl 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 Signed-off-by: Khem Raj --- ...-limit-sys-io.h-header-include-to-just-gl.patch | 88 ++++++++++++++++++++++ .../recipes-support/lm_sensors/lmsensors_3.4.0.bb | 6 ++ 2 files changed, 94 insertions(+) create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch b/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch new file mode 100644 index 000000000..fb3878dc3 --- /dev/null +++ b/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch @@ -0,0 +1,88 @@ +From 727524453f115ddc05109e9bbb3d0e60a7db9185 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Jul 2017 15:05:50 -0700 +Subject: [PATCH] prog: Do not limit sys/io.h header include to just glibc + +musl provides it too. + +Signed-off-by: Khem Raj +--- + prog/dump/isadump.c | 6 ------ + prog/dump/isaset.c | 6 ------ + prog/dump/superio.c | 5 ----- + prog/dump/util.c | 5 ----- + 4 files changed, 22 deletions(-) + +diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c +index e0e6f00..8794537 100644 +--- a/prog/dump/isadump.c ++++ b/prog/dump/isadump.c +@@ -36,13 +36,7 @@ + #include "util.h" + #include "superio.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c +index e743755..85a4f64 100644 +--- a/prog/dump/isaset.c ++++ b/prog/dump/isaset.c +@@ -32,13 +32,7 @@ + #include + #include "util.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +diff --git a/prog/dump/superio.c b/prog/dump/superio.c +index 64ef27b..906fe55 100644 +--- a/prog/dump/superio.c ++++ b/prog/dump/superio.c +@@ -20,12 +20,7 @@ + */ + + #include +- +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + #include "superio.h" + +diff --git a/prog/dump/util.c b/prog/dump/util.c +index 874c1b9..197fa64 100644 +--- a/prog/dump/util.c ++++ b/prog/dump/util.c +@@ -11,12 +11,7 @@ + #include + #include "util.h" + +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + /* Return 1 if we should continue, 0 if we should abort */ + int user_ack(int def) +-- +2.13.3 + diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb index dbc05a898..454a69f40 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb +++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb @@ -11,6 +11,7 @@ SRC_URI = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz \ file://fancontrol.init \ file://sensord.init \ file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \ + file://0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch \ " SRC_URI[md5sum] = "1e9f117cbfa11be1955adc96df71eadb" SRC_URI[sha256sum] = "e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e" @@ -37,6 +38,11 @@ EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ CC="${CC}" AR="${AR}"' do_compile() { + sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile + # Respect LDFLAGS + sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile + sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ + ${S}/lib/Module.mk oe_runmake user PROG_EXTRA="sensors sensord" } From patchwork Tue Jul 18 03:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108054 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5340444qge; Mon, 17 Jul 2017 20:16:45 -0700 (PDT) X-Received: by 10.98.43.80 with SMTP id r77mr835147pfr.92.1500347565476; Mon, 17 Jul 2017 20:12:45 -0700 (PDT) X-Received: by 10.98.43.80 with SMTP id r77mr835102pfr.92.1500347564635; Mon, 17 Jul 2017 20:12:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347564; cv=none; d=google.com; s=arc-20160816; b=L3pIq8zsIQonVgZ3/v1rIQn10NyjUEfimLeno05fQaoSoxhdge0LWa0mxPkiJw6sPB 11F/O8+qOSlAT+ICJHun7zt6T8XC40TQRAHWRUYGs/JdA6pG0b9H8BlqwcoeWJ43LFo5 biq2sukN4GvRKX91md4+fdLzquARM0nR0ybNlEge/SLNBobRaEpnini+eepXydkQHSqd Ix6RYqseTlNw3Lyyx47xSZzl3wJ8BZrZO9de8ktQSVqTF5JjsKQRFSHt8xTMYJIckYsL ROcHh61qXFdJNS8AK4lBlHWOHXnR1cT71pu1SGQcQdHirl2SBzTddw4v5MDwqRPGqE2w 6yTQ== 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=pMrVVKpvIyoxtmVjbiAzJDGS5/tygplIeeKR6xuNkOc=; b=RrnOAK70QH2JbVoDG9NTMrLr4ID92Ckdv5PwUIeI0EEBTEexhUJ2UhILdUZCaNyOIq PxCMY2QV+RQhvQeOwS47OEdEg2Uqeof2REEZFgh7I7mUwwQRSsYn0/CldZurCSfylqS2 xMsF7KxRZwkzJ7U4FD4Xd6Sk21bvqJUSCgfynZd3bFtauGrtOSdK5XbzXmavb2fIcM8M xqktVsN+GyXwlGDaC7uo+rQcEzbXWOprliaO43IZIVKFJYC1z6ryd2Gm0+Di+CKloblo wOakIBN5LIuuhl4BpWihpAPg6+iJiZhRh5YF+0Yp3N0ua0byyIhDJaM8gOeXGjV0AGqe UT0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=qboxhTtC; 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=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 u27si744674pfg.100.2017.07.17.20.12.44; Mon, 17 Jul 2017 20:12:44 -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.b=qboxhTtC; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1165B781C9; Tue, 18 Jul 2017 03:10:54 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id 066BF7808D for ; Tue, 18 Jul 2017 03:10:47 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id q85so1026161pfq.2 for ; Mon, 17 Jul 2017 20:10:48 -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=o41Unc1g7ve7vJe5xPuV1iuujzTFdjvHEuBkwUMmxQc=; b=qboxhTtC7bKJHRmopn1oyaTpbjl9QjxcuBEVuCQrkeTCiSymlK7F74hNy1tTcKkbnz Uo50EfNrv4VX81DtKgPBqvlhs4msU30FddvOtsueZIbhn1Ls9khATrg28Lqw8MbZpxJd 5rgwawgsG0Wv8/RTqo6nYsRRDJXlWpvIA6qBkk1vDbKwLirQU1RM9yQrs1DgX+Bw+OwA JvEkq7N8ueHLDxDlUZIlZy4e7dQfd6dIDGRJcvsAtUDWvD8g8k5Qzb4z7JXvcVgcEAiT 4V8hY4s6RCPYTvKTtHIYWb3tcxtXkwedlldeh+h9DDdRp7xkIR61/xq8lciX6sdtz0Eh 0ViQ== 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=o41Unc1g7ve7vJe5xPuV1iuujzTFdjvHEuBkwUMmxQc=; b=ohuAbfr2I+zm8feeJSd9150wtfuzIYaOLPGei+HcOy3hNg97LpIkPbhNLsYamJ+tMY 3I3UIIwuodOZLwbHLv/EWG6a538f7ypPr54MX0I1Q9LzPiM5dhs7i4u4xGX6ZwUysoXJ a1NpJIRD+BBVZTXlD9behg6qFTtWlMVPsBhqju5va5N50KhnjeeipKjR41AY1riiRrDV /YfMNXa8tJ8YnXsOW6KONhEaUe5HuA1bCzQa6Bj6a4q7nKbycxUVImZK5PQrDgkch6ry qH+/U2ei/MR7zPDRIYMGWD/cR72mUN8QaAdTFGGZIGOsb82xZsFdZ65V4/9OMdb4q0qG 9y/g== X-Gm-Message-State: AIVw113FKaCHN10NnAMkv716n+9XBLL8u20ZxZxvE4v9ABGSGN43Qatx 3kWh/n7SuZq2JrDf X-Received: by 10.84.197.3 with SMTP id m3mr834552pld.47.1500347448227; Mon, 17 Jul 2017 20:10:48 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:13 -0700 Message-Id: <20170718031013.44536-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 17/17] gperftools: Upgrade to 2.6.1 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 Fix build with musl Signed-off-by: Khem Raj --- .../0001-Fix-build-failure-for-ppc.patch | 28 ---------- .../gperftools/0001-fix-build-with-musl-libc.patch | 61 ++++++++++++++++++++++ ...001-include-fcntl.h-for-loff_t-definition.patch | 28 ++++++++++ .../{gperftools_2.5.bb => gperftools_2.6.1.bb} | 13 ++--- 4 files changed, 96 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch rename meta-oe/recipes-support/gperftools/{gperftools_2.5.bb => gperftools_2.6.1.bb} (67%) -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted file mode 100644 index 27f855d1e..000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch +++ /dev/null @@ -1,28 +0,0 @@ -Subject: Fix build failure for ppc - -Upstream-Status: Pending - -Fix the following build failure. - - error: 'siginfo_t' does not name a type - -Signed-off-by: Chen Qi ---- - src/stacktrace_powerpc-linux-inl.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h -index 5d16fa1..a9bf775 100644 ---- a/src/stacktrace_powerpc-linux-inl.h -+++ b/src/stacktrace_powerpc-linux-inl.h -@@ -44,6 +44,7 @@ - - #include // for uintptr_t - #include // for NULL -+#include // for siginfo_t - #include - #include - --- -2.8.3 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file mode 100644 index 000000000..78621c7fe --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch @@ -0,0 +1,61 @@ +From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Jul 2017 15:51:28 -0700 +Subject: [PATCH] fix build with musl libc + +Patch from https://github.com/gperftools/gperftools/pull/765/ + +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + src/malloc_hook_mmap_linux.h | 8 ++++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b42fea3..70b49a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,7 @@ AC_HEADER_STDC + AC_CHECK_TYPES([__int64]) # defined in some windows platforms + AC_CHECK_TYPES([struct mallinfo],,, [#include ]) + AC_CHECK_TYPES([Elf32_Versym],,, [#include ]) # for vdso_support.h ++AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory allocator + AC_CHECK_FUNCS(sbrk) # for tcmalloc to get memory + AC_CHECK_FUNCS(geteuid) # for turning off services when run as root + AC_CHECK_FUNCS(fork) # for the pthread_atfork setup +diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h +index 79ac4e3..d444635 100755 +--- a/src/malloc_hook_mmap_linux.h ++++ b/src/malloc_hook_mmap_linux.h +@@ -46,6 +46,10 @@ + #include + #include "base/linux_syscall_support.h" + ++#ifndef __GLIBC__ ++typedef off64_t __off64_t; ++#endif ++ + // The x86-32 case and the x86-64 case differ: + // 32b has a mmap2() syscall, 64b does not. + // 64b and 32b have different calling conventions for mmap(). +@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, + return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) + + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { +@@ -206,7 +210,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, + return result; + } + +-#ifndef __UCLIBC__ ++#if HAVE___SBRK + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + +-- +2.13.3 + diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file mode 100644 index 000000000..667008a5b --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch @@ -0,0 +1,28 @@ +From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Jul 2017 19:28:17 -0700 +Subject: [PATCH] include fcntl.h for loff_t definition + +Fixes +linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared + +Signed-off-by: Khem Raj +--- + src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h +index 85347a2..70431ca 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h +@@ -162,6 +162,7 @@ extern "C" { + #include + #include + #include ++#include + + #ifdef __mips__ + /* Include definitions of the ABI currently in use. */ +-- +2.13.3 + diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb similarity index 67% rename from meta-oe/recipes-support/gperftools/gperftools_2.5.bb rename to meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb index 43780a5ee..946463805 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb @@ -2,19 +2,20 @@ SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" HOMEPAGE = "http://code.google.com/p/gperftools/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" -DEPENDS = "libunwind" +DEPENDS += "libunwind" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/gperftools/gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f50/gperftools-2.5.tar.gz \ +SRCREV = "bf840dec0495e17f5c8403e68e10b9d6bf05c559" +SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-Fix-build-failure-for-ppc.patch \ file://0001-Use-ucontext_t-instead-of-struct-ucontext.patch \ + file://0001-fix-build-with-musl-libc.patch \ + file://0001-include-fcntl.h-for-loff_t-definition.patch \ " -SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50" -SRC_URI[sha256sum] = "6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173" - inherit autotools +S = "${WORKDIR}/git" + # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 # Segmentation fault (core dumped)