From patchwork Fri Jul 14 05:39:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 107717 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp452921qge; Thu, 13 Jul 2017 22:40:44 -0700 (PDT) X-Received: by 10.99.141.76 with SMTP id z73mr13156638pgd.40.1500010843946; Thu, 13 Jul 2017 22:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010843; cv=none; d=google.com; s=arc-20160816; b=sL0WmwEe79I4ASXRvrVphb8dLJK/smhHGaR11/TqjL9JPm8KVwKCGNmrVH4YDeIt6r /qalWGDw+7r6nMtX2d7K30aeO9ghu4mjmaiSaZAAsDWMI1mdhr8fROif8fLqPRXQTcll xxFaZAebF5WChbxbBTCn30CmMZIhjIqEFhwUhM/VGgKFHefoq9dHsZil51aWNTtalsyO v0xRa5FCFPm8182z8lDBguok1RUNv4jOmUGJgL1t+L3DQEc2EPjAUf3luMn33Hkh7TEP LeK2LOT0QwCGW52yVWZ0Oc1MN+Vj0slzrTPE0V/MKcXqdEzldKTnHcEhLJNgqMFR43Lt OnLw== 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=0rHHpmBn/Ll2VkcqNUGH4ZtjKrCQ0TfxmFBoNwJ0N3U=; b=murO85zAmVYNXsK5B2s+dKHM4U4xTFdc13X6Gz1Hq4F5E2j60wDmPYWiDt7hfiNCRa rLm44aSZcGJQ/MWKa2+hmVqcECdJ5U6mM63wu7St/cLBSP81x89v+Klkd3bnv24GIvdH XW8m2H+Lp6WtEf7tWHY5XsSPR93ECm8U0PjfkvC6J6NY7jOR71ZjtF4v1/MdO1/K4Ure fNBYnUVdwMiSwxKhNBqWcgFY/9m6DH0/h2MsK++G6pggGOXx6QQ3sMee7Ir20SqMSyrk LA7nRVaEe3vyNdram278w/H/UAvjsxofjCSa0Iqu8fNaFkaxaBGINf0HZHOHFuihXco8 aVZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=pc7HBmet; 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 i136si5672211pfe.141.2017.07.13.22.40.43; Thu, 13 Jul 2017 22:40:43 -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=pc7HBmet; 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 16F8977BF4; Fri, 14 Jul 2017 05:40:28 +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 CF98677BF4 for ; Fri, 14 Jul 2017 05:40:24 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id d193so9391849pgc.2 for ; Thu, 13 Jul 2017 22:40:26 -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=zKCstCNPQfXk4QD4gP2l5n9pGnSZRyU9CadeAMl9v6A=; b=pc7HBmetDnX2Ouu0RJajg556UC2Sycte7BqNDBD76nocoyNji+2NQ11H9R8xeCFl23 iuYR4hW/D8ljWbUZi2BQHv4V5sWxa6djNw4qwVAG5tZoEzu2Y0M78Ga9tcDMV72FnDAL 1dl5OamTV1rEHfw7IBRa3kgjmpQSt79J/JbP5SzTmLf5J1uEwIh4OUv9TY45imYeaZZk vFbe4wzT4ultdnu5sAf8AgMVQYq8fkS3gmxrAS/EwTt1dzvoK3hoDqOEmteyimzGBuzK ihfeHEWNfOe7Z2i4cpqT5EMkYWj/VSEm725faDGzO9fE+sTB/lFdYLeAJjL/1Aka4Cum mm8Q== 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=zKCstCNPQfXk4QD4gP2l5n9pGnSZRyU9CadeAMl9v6A=; b=WCK9YCTsn9ZZblD3m1ggSr4jrnjBZ4BKE8tiF1335iAkA8+p+uaDunD8BKayoi51Kd s4trN1wqDFFZ3UQYPajAqONL2cSpAGekjDV9uVoXEcI1kGxziPwrkljKpRJu0pSs6eER uoj8KPPavYSHyoZXBz4NAd0Q6r2d4xfG+ATx27qBQPVD7mwxjxZKe/A3LDY2KRSwobge vX/EfFH/NH914OnTQW6lWeGJMOomo+vrF21chcD3CRLbAWpHc1sKYPat8jhtT+agozN+ VX1ouL3lVHin9HjGTv+q7S5GcYK2XGfk6Sit7UOzjSzW5p0g9wIQK7a1/LJJevW55+sF R1eg== X-Gm-Message-State: AIVw111OXSR1rryC7/LntPRMGb3OweiAp+4E7Rf+ZUFFacq82D4FrwsE 3TXNPtNiXQLwE/NQ X-Received: by 10.99.67.68 with SMTP id q65mr12655856pga.260.1500010825448; Thu, 13 Jul 2017 22:40:25 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:24 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:39:56 -0700 Message-Id: <20170714054013.34458-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 Subject: [oe] [meta-initramfs][PATCH 01/18] klibc: Fix build issue when default ISA is not thumb 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 We were passing empty string '' to make as option when ISA was not thumb this breaks build for machines/distros which do not use ARM_INSTRUCTION_SET = thumb Signed-off-by: Khem Raj --- meta-initramfs/recipes-devtools/klibc/klibc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index c4c3e00b8..cd3f39808 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -42,7 +42,7 @@ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ " export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" -KLIBCTHUMB = "${@['', 'CONFIG_KLIBC_THUMB=y'][(d.getVar('ARM_INSTRUCTION_SET') == 'thumb')]}" +KLIBCTHUMB = "${@['CONFIG_KLIBC_THUMB=n', 'CONFIG_KLIBC_THUMB=y'][(d.getVar('ARM_INSTRUCTION_SET') == 'thumb')]}" do_configure () { ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux From patchwork Fri Jul 14 05:39: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: 107718 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp453537qge; Thu, 13 Jul 2017 22:41:26 -0700 (PDT) X-Received: by 10.84.214.143 with SMTP id j15mr14006000pli.40.1500010886225; Thu, 13 Jul 2017 22:41:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010886; cv=none; d=google.com; s=arc-20160816; b=X4ounlRtCxUy/tpwD1bYu7sqQFWEu3xiWptqSaVV64wbtAYDzgZZRp1ZkvL9plecZg gN7V7azwpigO7UjsSSK47F82qq9fiHP/FEzPpnfsxYE5VKgAFYGExoTDw07E+doU8rzV tprU7b+fuY4mA3T5kvrOuHPMXA+k9E6+4M+kf1kS+fLq+YssF9odi4JamANcxseXSKz9 kZeKsq1mRKOesPniu2c6EaiPYKAcQQ8WG3Gi3ByZorMA0GcmuddzdKMkKSqDSwvCLdM5 ueqYEmXrWZaVCJedeqbtXWi3SDIbi7A+9m7zlQnzTS4pgJ+WpRgvfnwj9Qulj2vxA56a XdbQ== 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=vsNorMK+ByHzU2lc4N1FCFHO4orWtqqIGLhey5tOW0o=; b=YURw92WMOLa+qrFT2jVxzGorJ5TyykUMy3adi9DwB6HNLTGZWv9F1rtm4WjzKPPO/y x3dQ7BGvmr4OIBaxJbGuTO42K35nkH6uHTStgyuOyF0cr3g+vh5JyXtRl4J6LVZUHT6S LKwli+PyPgKvAXWKMhKtOlmR2iNMpG5XH7Z/CvoQMoMVVUQmP4i78zr1FXcvhPhXwKrt 9j+HpD0B84YVKzP0+H7Xm2Ku5eONWzm47t8uD+uCdta1B9rv/Q2d90rWfhRip4/c3VMP DZJddWcymDU2XC+vXB3HQjsk1n2YKH0tpphRHpMhn7o/RP+KyUWpB8BP+3KA+a0C+ioR 2yoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ZIFvUTp1; 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 m4si5819043pgs.108.2017.07.13.22.41.25; Thu, 13 Jul 2017 22:41: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=ZIFvUTp1; 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 D02F2781F4; Fri, 14 Jul 2017 05:41:22 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 2549777BF4 for ; Fri, 14 Jul 2017 05:40:25 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id e199so9719375pfh.0 for ; Thu, 13 Jul 2017 22:40: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=T61AK3APPEHccbVG6HcjRwA6bFVs/kGLOzqxyMaBCvA=; b=ZIFvUTp1ZoUQoIyGwsQTHzCl9MXWYTblLBBZBrBc8tRu+29D47YFXHKkKWUjEnRogI ocIk6BKRCReXTBNczSHd/uQgytHcWjVcQE70tpCsrs2ZNVcndcmU1DNs47o1qKoDt8/L Jh0W/IM1xFwaKr30a6GUyoYjaYs1FbPBtqNeLoc5sBbMoAx5M4C94V6Qwuz1KjullByv h7vCMt2c5x9Iidn2qI1El8BcIJFreF5kqs8YXQrnoRa1AhduyNwNls5QUZYnUHos9AEs dp+z0Fh41RS1BD4qi6eQLAgf4ZGyVXRVX/IKyYFji+QFIWagktrTKx4+LQE4ZvxfsFqb cQJg== 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=T61AK3APPEHccbVG6HcjRwA6bFVs/kGLOzqxyMaBCvA=; b=X3jIXx53ZyDavdhRNuXleQYD4lHrfocFTYSDbrkq8pqnnDCzBWlNPdxx3sk1Eu4lGt GRur7f24tZ7V9AYkFAHyedtixnV+dn6Q9v5Xmgvn1Aaz/xM4p4qodgyE8VDBjIyCALaa ch/jhFA4GicjpAn4MfYY9+t3qVIDWFveBRK/YaZDk3HbH/wLQH+LlCquP67AQK9AW6f5 BIsAqftqMwD/7uotkmi7gg7wXpmfcfnVP1jpt2942kNagq/cc6VmpLxzU9vd4qS50vSO UJAcYHpufIdz5WRpx3/ghX07qbjKZMWWXmj5xnljXqEL+cVOD/lRWHmDAvklsZNkixo0 BlDA== X-Gm-Message-State: AIVw11061sSqZ9lMoVe6RZcfOx7O6rQ04mmka11AD4h8/hpSpd/h3Qbe Yuzkd6S8Ztc2/Obj X-Received: by 10.84.216.28 with SMTP id m28mr13967562pli.275.1500010826983; Thu, 13 Jul 2017 22:40:26 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:26 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:39:57 -0700 Message-Id: <20170714054013.34458-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 02/18] libteam: Upgrade to 1.27 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 --- ...nclude-sys-select.h-for-fd_set-definition.patch | 28 +++++++++++++++ ...0002-teamd-Re-adjust-include-header-order.patch | 40 ++++++++++++++++++++++ .../libteam/{libteam_1.26.bb => libteam_1.27.bb} | 7 ++-- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch create mode 100644 meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch rename meta-oe/recipes-support/libteam/{libteam_1.26.bb => libteam_1.27.bb} (75%) -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch new file mode 100644 index 000000000..a4a17ed85 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch @@ -0,0 +1,28 @@ +From 0ab69dc18a2057ff5bf41abcdf2b983b72d5a903 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 15:34:49 -0700 +Subject: [PATCH 1/2] include sys/select.h for fd_set definition + +Fixes +teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? + +Signed-off-by: Khem Raj +--- + utils/teamnl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/teamnl.c b/utils/teamnl.c +index e8de7e2..25129e8 100644 +--- a/utils/teamnl.c ++++ b/utils/teamnl.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.13.2 + diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch new file mode 100644 index 000000000..beabf63ca --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch @@ -0,0 +1,40 @@ +From a5b945cb3c62a18dcd7047f62707c09076c4e48b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 15:35:51 -0700 +Subject: [PATCH 2/2] teamd: Re-adjust include header order + +So it gets the library definition before kernel definition + +usr/include/ne +tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' + struct ethhdr { + ^~~~~~ + +Signed-off-by: Khem Raj +--- + teamd/teamd_runner_lacp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c +index 9c77fae..8800854 100644 +--- a/teamd/teamd_runner_lacp.c ++++ b/teamd/teamd_runner_lacp.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -30,7 +31,6 @@ + #include + #include + #include +-#include + + #include "teamd.h" + #include "teamd_config.h" +-- +2.13.2 + diff --git a/meta-oe/recipes-support/libteam/libteam_1.26.bb b/meta-oe/recipes-support/libteam/libteam_1.27.bb similarity index 75% rename from meta-oe/recipes-support/libteam/libteam_1.26.bb rename to meta-oe/recipes-support/libteam/libteam_1.27.bb index 2cb9e8f3f..32227009e 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.26.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.27.bb @@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnl libdaemon jansson" -SRC_URI = "git://github.com/jpirko/libteam" -SRCREV = "8c1cea00a21950089058e4e33ea1f7bf4deaddeb" +SRC_URI = "git://github.com/jpirko/libteam \ + file://0001-include-sys-select.h-for-fd_set-definition.patch \ + file://0002-teamd-Re-adjust-include-header-order.patch \ + " +SRCREV = "91a928a56a501daac5ce8b3c16bd9943661f1d16" SRC_URI[md5sum] = "565114d70c41bff6093d8e57be284e8a" SRC_URI[sha256sum] = "d65286379141db141bea33424ec0507bb0f827a0bf03d9c65004bb593e3d5545" From patchwork Fri Jul 14 05:39: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: 107719 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp453640qge; Thu, 13 Jul 2017 22:41:33 -0700 (PDT) X-Received: by 10.84.169.36 with SMTP id g33mr14500956plb.52.1500010893719; Thu, 13 Jul 2017 22:41:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010893; cv=none; d=google.com; s=arc-20160816; b=uYpZJVMg1bdpQn9SaqZs3wSba2vSMnwZ4m8QvppraMfmhCYgJ8hvrCVuliHmDCmgg9 jcpjyStVMzsFFALDDFAuwE1457yRA3PKTr+M1uDRM3LPFsOm/pbmVd8HfLHl2ZIk7MVy +TTKaaso9Q0wjMNyByRSZFQUh6pu0B7hX9otySfNSpbun2oBptQME8573E+OE5Zqt8+H 9lqr2ioQmkrMIPgMzIynMFtDttu3+CBcWP6e1hKYpuoWBpZk8XmzRUina+jj7FkHxUsf C2KhbOWv7H2RQM+tmzP4lNSGXq8dAY5wq0TA3XPk7QH6fw8JraByjVJWl8Gh3B04eBKM rjfg== 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=n4BZ4mapitzraVjeUUCiZEGjzzVwbth/2ta7cMBEtaI=; b=T55ucjJuFP4GMI5DQyBem4sKuBZgdhUtvqAkBkwnyhLRhFwmBa7w+ZrPnUnJgCVn5U NotJI/HqxfKguDDd40P6U1L+RlW3WvLVfY3k0F6/TSqMn+ThThbnAkbAovhyQCl7GORz yEtuTW7iArcOg9VVtDH+CDWSpKSqVtKVS8Q9HeB2+7FmAF3JKsHfnyYZwfNX+xFlabET RfQGD8bsH2fxnw4qWVHFvDgx+pQ4zIrJ58BVHz/nueyHkHTkYX+3eFodHNj4acBv7lBs sOy6bS45CgPQTHp9eVU0R7H2beuv9Gy1gW+426WWmTDZqSJtkfE77KLCmpML6WbGWCAW a3Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Y4pOEZKs; 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 l15si5686821pfi.299.2017.07.13.22.41.33; Thu, 13 Jul 2017 22:41:33 -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=Y4pOEZKs; 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 1548778202; Fri, 14 Jul 2017 05:41:24 +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 8D18B77BF4 for ; Fri, 14 Jul 2017 05:40:27 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id d193so9392012pgc.2 for ; Thu, 13 Jul 2017 22:40:29 -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=qXa7mW9TLJca3Qqc07CVqpEaRigLZ1MIp5DKjC0zTNg=; b=Y4pOEZKsFzSBbNGydGlujWnd6SzjmQvfdFz4eHxfxNURmynM0oMuLB5JWHHH03Ow1v 1WGLcbXowe6AX4i+MOFAoDUFIdcOtXbfLkyAJk8s5ZGxRlnTDLJZGImp3Vh6uOKKQdpt GGnJQjjW5ZA46DQEK1+uePiNrBkVP9GjnvevVkZxfEG8NlNHWz3MlG1/ekxx9RY9dfOp /+qe4bmpk0KtiuqP2Ctn6geqVdQmPbZcPCj62Xt94nSWAn0ItvJiz8c+RNwE0taBhJCd ZXh9QXFxWxpTVmcX+YxqjexuqEW+0Xql9rvCiu8c55ll/90NQbQU97Uyj90bPTFkqRr8 +ZGw== 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=qXa7mW9TLJca3Qqc07CVqpEaRigLZ1MIp5DKjC0zTNg=; b=tCba/bb47LwSzkecrkxhiZ8b3eVgqHoI/iSkBcKnhuOWViAu5FQ8ySVlaZKTnzBnya O3yR1mi2p2+GU+Fiu4LfMk5bAnosDLMXIYH7Y2aWmsuFT1sfkBPPTBr55ur6YCQ3MCeD fNPtKDy90DwsEPB4uwSbM7JCsaTJQ8rsEUD7unIyhVB3EhKkNY9+O5pPoBDhISIsU4y+ 9pL1tchIJROpTG4g1Z7Ntnm83MzCKBg3OQGiDucYS+qJjTqwDdXsLbk49HLQ+G+j/xCK K2IC9bVJwxmqCp1XJvExceo/8Vb0NuCHkDEnsOI81AeGNmoFVWk6pjPpOKcJUKjh5Tjf 2KEw== X-Gm-Message-State: AIVw111QlJkZcbUW7WB/weEY2rZoE/gh5XlbglAj6I+jgM4YYAIzOwN/ dofziFwIMv1CJPHK X-Received: by 10.84.216.92 with SMTP id f28mr14166067plj.199.1500010828482; Thu, 13 Jul 2017 22:40:28 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:39:58 -0700 Message-Id: <20170714054013.34458-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 03/18] sox: 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 --- ...error-line-and-live-without-file-type-det.patch | 28 ++++++++++++++++++++++ .../recipes-multimedia/sox/sox_14.4.0.bb | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch new file mode 100644 index 000000000..605863a22 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch @@ -0,0 +1,28 @@ +From c2aed28e3e14329ad0a8c4371fdcce9934013f21 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 16:36:06 -0700 +Subject: [PATCH] remove the #error line and live without file-type detection + with pipes + +this fallback is executed with musl + +Signed-off-by: Khem Raj +--- + src/formats.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/formats.c b/src/formats.c +index 7e231ca..b13f0d5 100644 +--- a/src/formats.c ++++ b/src/formats.c +@@ -416,7 +416,6 @@ static void UNUSED rewind_pipe(FILE * fp) + /* To fix this #error, either simply remove the #error line and live without + * file-type detection with pipes, or add support for your compiler in the + * lines above. Test with cat monkey.au | ./sox --info - */ +- #error FIX NEEDED HERE + #define NO_REWIND_PIPE + (void)fp; + #endif +-- +2.13.2 + diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb index ada958b13..e115f1c18 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb @@ -27,7 +27,9 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" -SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ + file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ + " SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3" From patchwork Fri Jul 14 05:39: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: 107720 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp453734qge; Thu, 13 Jul 2017 22:41:42 -0700 (PDT) X-Received: by 10.99.9.69 with SMTP id 66mr13141221pgj.178.1500010901798; Thu, 13 Jul 2017 22:41:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010901; cv=none; d=google.com; s=arc-20160816; b=OTDBR3eQqY5ZBBLuG9Yz3py6qsgg11Fb4M9jaMzlCw/7GXJVx2DNqY4sqrnGbcKuyE yjM8BTqxBD9wNubVXNLMRBmmrkb/dtl8Iil90hG311RKtwy4UiQeq7Bfn7JMIM/kPns0 /c5e1OctSUWwJo2xH3Lyj52hRcDZT9Ltnh1hBrI8KiwZLbUvJ4YbaS0YHnW+O9dHxl7I 18tA54LWsdj4PMfEjJgP6PQUY4uZ/0mRCMfRXClgymzSm6d8F9qLPcNQCgf6NZlA5tZe 9+2Ki2gi68GWaavhjnAvW/O5+Rpyfg7VYoUv5JcO0B2ANtY+oonbP3KaH1plJgTOYsqn HV7w== 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=7z8G/TyorxHnAZbG65Yv5PoVlZpJKr7V9nGAAUx90NE=; b=go3qq82iVsLswdecXgLbN1WtPBCdycgvGVKA4hmee+3xDOn0oJV7FoyXY0zY9tGm+x GZDRxp+vQ3GISSosQbWpt/DnU+VjXiLUHvDOFuIq1WPr1XQy+P/ljIH2vEtZO7NGhXZy SwTUPCyKTUaoGVOw7uc1qrJAS6u8kl1e6O9TYBebGiurDpz5YosZVoK6keWXxZAd/NH4 66Ya8FYovwIcGUscd1FPcwc6vNDXJ4ZdAo+K6DdweAycfopVqCILRJihKW3ARGdM9tU9 ohUI8BkKGgjXhyCpZSCY12Gd6yqVy6jLhIrrgMpqNBX/RfBg03mo+ppiSpVRD1QMLkWs 6mkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=udLyYJLH; 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 a9si6021153pli.135.2017.07.13.22.41.41; Thu, 13 Jul 2017 22:41:41 -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=udLyYJLH; 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 2555E78209; Fri, 14 Jul 2017 05:41:25 +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 42A8F780C3 for ; Fri, 14 Jul 2017 05:40:28 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id q85so9706343pfq.2 for ; Thu, 13 Jul 2017 22:40: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=NCrCkRlbGSuZhaXxnlTeY2A34DMCi6dTtMyiUzd1tn8=; b=udLyYJLHlCsIf2g+rYDOaywvXDV0GvO9oaSMB6MiNsB2lDSJFh2VLvFPPGZ3EmDDsR QneVb+8IkvYq/3kQJKmvqXF2n+CKa3TZmrQCOmLfUF3gU8vAMvc/hhtYX5E96VUWjMqg Exj+GmN9m7d5Ud4cmfgV1/q0FkAyBGf1Cpsntp/HNxcypVhVIlHXC4WdEGtI4CIiTc10 iPVNDCGSyrYjdPZNLlabyWY8bOG0BGbl6VubdF/WFUtHL2z7uT0En6nM69mw4r7ebDzQ Gzdr4JT3Afk6KLgqbzj+F9ed1/2xLFQY9qHd1Vf0RYtEddTaDGfACDtftnk/27bEw61h rCFw== 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=NCrCkRlbGSuZhaXxnlTeY2A34DMCi6dTtMyiUzd1tn8=; b=Z/92FUiNU8NIgjfgFR837ZZjzHbsLYpFqiBvRc1x5s6PN5uahcLOzxvyffZk5NJf+j 6/S4fDVkOVU7cqdpcz5JE11T2IiMtx/NDTTVAEBIFSfYF4zEoYm0yuW253R+ipuMpLIc uOEGrn3gCXeq3SdO2gX9HdiIhgoEBZJkzktlclxFoYKh5/xpX3OY6B1yc5SXiUXlIJXD HznR27Rc7A4UqHuMcCZyiJNYw//kGTqFwf0Pn/cE6qgJ2rBrDBjiaiHOED5Q39MeR1lR bfwSpcRvB8ACfoDxkdfCuhm9dyZcZmCqgwQv2s4dRWbseSH4QrgbhMFBRpIEhH6dvXSS CR2Q== X-Gm-Message-State: AIVw113fmpK4geJxhICkxKjzNyUkDuJjyDdr0/9L2ppFiyZnySwWtUF3 0JfObVEP8uQLS+uD X-Received: by 10.84.217.134 with SMTP id p6mr14253368pli.196.1500010830057; Thu, 13 Jul 2017 22:40:30 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:39:59 -0700 Message-Id: <20170714054013.34458-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 04/18] webrtc-audio-processing: 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 --- .../webrtc-audio-processing/webrtc-audio-processing_0.3.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb index eb9a30466..2b0f7c684 100644 --- a/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb +++ b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb @@ -2,6 +2,8 @@ DESCRIPTION = "Audio processing bits of the WebRTC reference implementation" HOMEPAGE = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/" SECTION = "audio" +DEPENDS_append_libc-musl = " libexecinfo" + LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=da08a38a32a340c5d91e13ee86a118f2 \ file://webrtc/common.h;beginline=1;endline=9;md5=41f7322d91deabaf0acbbd0b8d0bc548 \ @@ -22,4 +24,5 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${ SRC_URI[md5sum] = "336ae032f608e65808ac577cde0ab72c" SRC_URI[sha256sum] = "756e291d4f557d88cd50c4fe3b8454ec238362d22cedb3e6173240d90f0a80fa" +LDFLAGS_append_libc-musl = " -lexecinfo" inherit autotools From patchwork Fri Jul 14 05:40: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: 107721 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp453849qge; Thu, 13 Jul 2017 22:41:50 -0700 (PDT) X-Received: by 10.98.55.132 with SMTP id e126mr3230451pfa.241.1500010910528; Thu, 13 Jul 2017 22:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010910; cv=none; d=google.com; s=arc-20160816; b=OK5dfRlNMSAX7yBDoiS1v27zk8lKoQ4Oy6b7/m86//dT8ADlflqFu2zinZTu7bX9bm wxWn/qSlOfxWIr4KtHuWVRY+Nu3bSAT2U4XMq9JvZCR93RAxBPxvwl1Hu4Rh59QN9Qsv bGSa2HZFRte4U1KQGM7JSX0DGjicKmBybnlzRFwcT8J/3gRbZ7tu0EfJKxEFgbDZ90Uz h3X57LZ3GW15iO3WfV7KYDSlw0Itjij0KGneyWsdgmw5my6H3f+PQGVYCRYJ8OC3Rr79 ti3oj0z70iMt3eREZPg20T0nAUbnTh63vJlNlzzs5rpLsuFFIQ1KFgoU1FvfJ0/6UoPm 8oGQ== 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=NV+7/Xnr6bQ1d9vphZP11VSWJq7Myzvq0YaaR8ytgys=; b=lAoD/YxP/vLmIt/5FYSVpZ8NuDFx1SQehSTVheZVoEVZJ/nPj2Jaqqspy5LqdTaXEg a26HsSeTqIa51T8jb/mBeby/BmTOQzHLGNp8R/vssbXMgt5Ywy5hDtqBqYa++lu4wd5j mP/HWozREiHg0jvbUTrY0+MS9uWzEQCczXTkpsNoteSjGyqNvIf2mQOUYqSP3XtqK6cD 296ye5MQOC9IMAT4qbxAJLLOtiWSl7kg6XJWaLW/6R0HkIKNr9NxmDTajsc4nfW1IGNF +d4jd9cETWzpfkHlHAydyswQMLmACZ/yDgK9LdxcKGPCmqVHf4IVOEiSMC1vXxvi9uVr qhag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=PMTZ33IO; 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 w31si287777pla.322.2017.07.13.22.41.50; Thu, 13 Jul 2017 22:41:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=PMTZ33IO; 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 627FB78212; Fri, 14 Jul 2017 05:41:26 +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 64140780C3 for ; Fri, 14 Jul 2017 05:40:30 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id z6so9725570pfk.3 for ; Thu, 13 Jul 2017 22:40:32 -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=eHCL0ljA/zRlV/5iV5Ph9U2ZQ6mSM/M3d0M0fs4O78I=; b=PMTZ33IOSPsMKgJDFUCOGli02nLFiiu5GsUy4/ATAytcDfeoMK9/BXIphli0pXiYLH sEc3snOEfGt7SoxQRhQ3l41j8Sy7yo/7rjWHMYm3u1XtgzFuNhVSDMEA4vntlybD9eYI 8SQv+GpbHFnB9rXPeww4AI7SzFuopXYFscKLtXkaew96JbExd3lvSsglrSJPCQv3RQ9z wp7V6xztrP2uh4oB+CYJwEPLbpn22yNBYMAAfIMKXuZT+uK1JnyqbM0Nvuy6ZxaYOF3Z 1b3SDBwygrHFZEfdl7BNyfKeaTvUnsAL7EDzc6NkESh/qyOq6n/o+o8IEiYRVSEfDjCS vOgw== 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=eHCL0ljA/zRlV/5iV5Ph9U2ZQ6mSM/M3d0M0fs4O78I=; b=jto1XsPjlQriL+0rvTra4aFEpU/NT01S28n6oeg66Funk3IM1x25bQUknIm+Nn3vqF N2aChHh4Hjak7jIUDxkxaxbrklXvwES9FGiXt7+hQ8GFLS415uwVhtlG5UVfZ0+MHVq3 GCkU42K5Cl2OUUgZCulIvsd+5RsEa0uHDZnG+1L2czdTdxsvpNB0pgf7BpKhewuadUV0 OVXpBr1V8+2RxWCA1tDsOd6jBq6YqrH/SGDueeHHUYGWNhDPPTLo5QCmFDugvYe3SP2w jIjLckN3+uwtg0S+hXZUTrTEIsudGyVtVLXtdiLZXQmbzCMeieNn3aJ460vxcoYbeypa ohQA== X-Gm-Message-State: AIVw112ZeuyIm2xdQSp8aVPkMWRHoH6yDIRpKS+CAMPdkJvRayxOQUfn unDL4r9WxHp3extu X-Received: by 10.84.218.136 with SMTP id r8mr14541163pli.205.1500010831693; Thu, 13 Jul 2017 22:40:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:00 -0700 Message-Id: <20170714054013.34458-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 05/18] cdparanoia: 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 --- .../cdparanoia/cdparanoia_10.2.bb | 1 + ...-utils-Use-c99-compiler-independent-types.patch | 49 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb b/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb index 30d71ff2c..27fa0e585 100644 --- a/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb +++ b/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb @@ -15,6 +15,7 @@ SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${PV}.sr file://out-of-tree-build.patch \ file://0001-check-for-null-buffer-before-trying-a-byteswap.patch \ file://0002-Fix-printf-format-errors.patch \ + file://0001-utils-Use-c99-compiler-independent-types.patch \ " SRC_URI[md5sum] = "b304bbe8ab63373924a744eac9ebc652" SRC_URI[sha256sum] = "005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df" diff --git a/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch b/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch new file mode 100644 index 000000000..7699017f7 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch @@ -0,0 +1,49 @@ +From 89071cbc8d3ab9a15503f397580b7590338e5e91 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 17:23:45 -0700 +Subject: [PATCH] utils: Use c99 compiler independent types + +Make it portable across different platforms + +Signed-off-by: Khem Raj +--- + utils.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/utils.h b/utils.h +index 10dce58..73bba92 100644 +--- a/utils.h ++++ b/utils.h +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + extern long buffering_write(int outf, char *buffer, long num); + extern int buffering_close(int fd); +@@ -18,15 +19,15 @@ static inline int bigendianp(void){ + } + + static inline int32_t swap32(int32_t x){ +- return((((u_int32_t)x & 0x000000ffU) << 24) | +- (((u_int32_t)x & 0x0000ff00U) << 8) | +- (((u_int32_t)x & 0x00ff0000U) >> 8) | +- (((u_int32_t)x & 0xff000000U) >> 24)); ++ return((((uint32_t)x & 0x000000ffU) << 24) | ++ (((uint32_t)x & 0x0000ff00U) << 8) | ++ (((uint32_t)x & 0x00ff0000U) >> 8) | ++ (((uint32_t)x & 0xff000000U) >> 24)); + } + + static inline int16_t swap16(int16_t x){ +- return((((u_int16_t)x & 0x00ffU) << 8) | +- (((u_int16_t)x & 0xff00U) >> 8)); ++ return((((uint16_t)x & 0x00ffU) << 8) | ++ (((uint16_t)x & 0xff00U) >> 8)); + } + + #if BYTE_ORDER == LITTLE_ENDIAN +-- +2.13.2 + From patchwork Fri Jul 14 05:40: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: 107722 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp453985qge; Thu, 13 Jul 2017 22:41:59 -0700 (PDT) X-Received: by 10.99.186.13 with SMTP id k13mr13410590pgf.0.1500010919463; Thu, 13 Jul 2017 22:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010919; cv=none; d=google.com; s=arc-20160816; b=bcStz3clEszx6QtclIo2VDEEcn1ustTmze0lHzGZ0Q5SMKtaM1zkHfONzsFxwALb4t 2EE+EpHqg+C8Q7wQcjNiP7BiXlN1rjjJA+R7B6H/7MU4EHQ26F+zWaGKWuv00xsa09V2 9oZzFwhlc4E+zTZpDX0n+xvwPJf+DlpL//CLVoNVm3YF8SZ7PCLePqqqZcIrXIyTmMcG IGSdkLi0ZTzX4n2EdL8WH37Its96h4vfxpSqznQaOOHKQsS2RbnDjNEknVgH/a4S4F6z jCfZIhOz9P+6ErX1PIS4LEFAebsOV0j5g1+C3p4esw6ZP3rAjNusqz1zH+vJnn51tQFr vDDQ== 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=qBl8yt98xflwOBUHMj6UBaUQXbTosx4wHq0hEAVXQWQ=; b=WEucQ+ALZ9Glv3gdahvSV6qSCjS2/gRdNPYLCWScUoteWf87AhAcDMHlaBPcgJ3Vsk C6fxx2qgEIE2DzDGawKMLOcILekZZQxjIXVZMJS6PXNmtwPyu5clEFI1X78UQYnl16/i QyV6H+s5UJDhwGy7vxiu7CU8u4KEh4gE39VKFiWr24OOLJlyDb+WVfKBY8tYOy8fh6Wo bAYehyblo2nJB1IJWH3o01bD2Sp3+crpdNjbGn8WTzUb2EOpWgctrJLElipx1tg6Aikv 4h7d+RYtRc42P3SQDKmMhnibY9ytO9CtovbESu3hdFTP+xvXloyAvXyEbOp34Ipw7Znk uUvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=krc1PNGB; 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 i62si1739537pli.74.2017.07.13.22.41.59; Thu, 13 Jul 2017 22:41:59 -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=krc1PNGB; 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 F11867821A; Fri, 14 Jul 2017 05:41:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by mail.openembedded.org (Postfix) with ESMTP id 21669780C3 for ; Fri, 14 Jul 2017 05:40:31 +0000 (UTC) Received: by mail-pg0-f46.google.com with SMTP id t186so40550522pgb.1 for ; Thu, 13 Jul 2017 22:40: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=3c4HluRjVYKvNp88+WNtyDcjGB6Kq22wCwgjVUzHxOI=; b=krc1PNGBwcyP1wLSV0AZEWTOj9ez0OE6LpMUGTKaWkr+bSYUQlH1RxwrRa79ZNkCi3 I8Tjd/BOeDvxdfwZzwHQ+tKx0EWjnboOdg0BOAvgna/bM8HHUXW9gn4eU5uMmiB/ZW9x K2tMhnfprRiBUUvM12+M2VHacLiNOwb0oezh6luIX7VcAS2bxJuoOxH/esi9Zp3TqG/d RzHh1jndFOlpXVnLTJ1ItAnONIEGKKI67Fad8XWP5GsH8EbxzjRBBVcE7MoegApuvGec BU6Jbw9QUpNe9BosZIgH12sv1MaPCC5cZF7Zj7CZ7k27mvhUs55qXKtgMNRoMMcUg/lj 6/FQ== 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=3c4HluRjVYKvNp88+WNtyDcjGB6Kq22wCwgjVUzHxOI=; b=SwHWLhIMvvSXRZCe5pZXeEmIsUAH/PkcM6ZTeFRPkuj5fqY6SMWEafyTPq2u3bN2CP ELaNrqptLug4XMmNJvAjnGIHqSvRzBo2D3Rsh2bU4xCdE8YYusnyImfAgWFsqcc267PV 8xvaoft8K7rJZ1rNqwug28ide6AAurJqoV9GFzO3j5u85ocMcqTuUX/SSQPn+VMC8o8L bns+moyA7v7oVvNhySNZL03jqqtdDGtAfOdGHkmvbfxFHXu1dFngvvyYVzQvIfLLccTV fP6+dc4mkiEvx6bL/+/rXmLwMXw8wsB/dDjbYx3N4Ez9MG4WpeJCWMpoIaf9fjPPvVal hCew== X-Gm-Message-State: AIVw1129Kzt111jt0Ug8lM+tMvwtMADm/MPmK8bp7i+LKlXwmutV7iAX GKbrnv/VZuh5tITv X-Received: by 10.98.102.85 with SMTP id a82mr3466354pfc.82.1500010832980; Thu, 13 Jul 2017 22:40:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:01 -0700 Message-Id: <20170714054013.34458-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-efl][PATCH 06/18] lightmediascanner: Define comparison_fn_t if undefined 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 --- ...ine-comparison_fn_t-for-non-glibc-systems.patch | 33 ++++++++++++++++++++++ .../lightmediascanner/lightmediascanner_0.5.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch b/meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch new file mode 100644 index 000000000..15d4b3f0e --- /dev/null +++ b/meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch @@ -0,0 +1,33 @@ +From 5bc5b8c5dad3edec6736fd7e7ce61250c4ce3725 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 17:13:19 -0700 +Subject: [PATCH] Define comparison_fn_t for non-glibc systems + +lightmediascanner.c:324:12: error: 'comparison_fn_t' undeclared (first use in this function) + (comparison_fn_t)_plugin_sort); + ^~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- + src/lib/lightmediascanner.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lib/lightmediascanner.c b/src/lib/lightmediascanner.c +index 344b247..b866883 100644 +--- a/src/lib/lightmediascanner.c ++++ b/src/lib/lightmediascanner.c +@@ -37,6 +37,11 @@ + #define DEFAULT_SLAVE_TIMEOUT 1000 + #define DEFAULT_COMMIT_INTERVAL 100 + ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + #ifdef HAVE_MAGIC_H + static magic_t _magic_handle; + +-- +2.13.2 + diff --git a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb index d8c6dbb73..f2158760f 100644 --- a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb +++ b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb @@ -12,6 +12,7 @@ PV = "0.5.1+git${SRCPV}" SRCREV = "adfddb3486276a5ed2f5008c9e43a811e1271cc9" SRC_URI = "git://github.com/profusion/lightmediascanner.git \ file://id3-plugin-support-out-of-tree-build.patch \ + file://0001-Define-comparison_fn_t-for-non-glibc-systems.patch \ " S = "${WORKDIR}/git" From patchwork Fri Jul 14 05:40: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: 107723 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454123qge; Thu, 13 Jul 2017 22:42:09 -0700 (PDT) X-Received: by 10.98.67.82 with SMTP id q79mr3417801pfa.121.1500010928965; Thu, 13 Jul 2017 22:42:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010928; cv=none; d=google.com; s=arc-20160816; b=x5/LdZhYtDjDHdQVIDJA43ll47/j/nX9bH/WwsygqRbeEQgEtJM4NKGltb1mzSmCd3 DdYHQhwutZjEHx0CpHfqv83Wtejv+jutt1N93RxRKQJTt1BoOKmfrRP56Q8ImV2KEcs9 tEnMY1EIkuiDJRPESdY40al9L87ta1DIDCVRsk78oTz7ZjKSKr/KMDVFXMU7SbbsRnKU fnvSAyYidjl+Oi0zO9Z6z3PAExDm3P323zUnNtLyKOqO/3CqbDF1Glip6qEareXG5I+E 5lgOhr1/2Kud9k5YBr2Mo7rEFf1uMP3cX76hcfGg3vqvGr2r7Tewdyzxhm/q6MvNULGH RexA== 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=O6bR+wDvQuPxSUhAg2nKnyVmvCtMo1QtkgD92lJWRVo=; b=XU0cvs8zhwxsIGqfVo+KsWQYh5XrozyrrcAy588D8kNhIbMVWiPnLsU6e4kuNE7+/w gicziojdd4Ir0iJPjADtqSDlF5lLrvkB32KbbOcqW8/jKs52yiu5rtqxgHIiwcA3+HM9 Ni5Fn21iOwuuP2tPkh0shVPEA4+XZ8J5onpgUOoJyrJonCGZNtaWsbSGsn35jo+fMYNP IGGNfu0k4oUKBo+dvIAjeDXxEESdkhJEnVlapsynsTgBC34bpxxjbQ+p8aGAQ+MUCMrL wI/3LbFhi6071xGKnafJMQsHKD+CUdfHR7nCNhm0kPFL7PUnZ4n154YNbLHZJ4fyCN39 jF0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ZyfvbUNK; 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 p65si5744424pfl.366.2017.07.13.22.42.08; Thu, 13 Jul 2017 22:42:08 -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=ZyfvbUNK; 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 86BD8781CD; Fri, 14 Jul 2017 05:41:37 +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 8EE4D780C3 for ; Fri, 14 Jul 2017 05:40:33 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id z6so9725678pfk.3 for ; Thu, 13 Jul 2017 22:40: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=SlBMeSzEqXv7uvMenMahnCpD9nnRlX5cjdLf4nsL9OE=; b=ZyfvbUNKd6RIz10sbO+XT6M368jNp/r3YOabt20deTF4oowNZYToWqzX4t/om/Sj90 +7/CqqNfCYzSAWVkv1cofVtg5B5PM/D6eJ10NmRe9RbZ387FHgwo3+Mci+Q+00kvSgHX gsbvtbHgvBnszj4LSDtc+NqHK7M0wrKt6FJFhEuuVJb3/mKzB8DacdIrz9pJiaSIrK1l 9Ob88xQta/qanhfkZ6Mjm5OyCuR6vNzXn83O7yr7bSMtSTwDuoJDFUhWfhXnSc4qed6g CzN6gZUs+p9IGhrzrpujDq68RaiOwyqIdf9WPQW82HYFJpT05YFL0moIdLZmN6OaSMmn 5nIA== 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=SlBMeSzEqXv7uvMenMahnCpD9nnRlX5cjdLf4nsL9OE=; b=oQ4V4RWfhCg8e22KFr7KgaXHh0l+hg12yL6OqjSYkbsySPV0OUhCVvQIQZgdmlpybp 85RovU/fVZ03E9M1do1LAxr+Ig8OmMTJCLp0iy5Opf4hcT2B9Szr7hBO+oj+4xYFL+Ym S3u1WDcwzvEaANwXAhhnTXHwG3ThBcpOhPqfcr6qRFYqxcgH2Bc5BuNGLJOdLJwffcpa 9z9mxYw3k8fx7JUCfkTDcuUng68ktiHjvX9vZlSAWhEYAxRzktp7sm/vuvNo/Ke00W0U akt8VVRT1G4u0Mjw+cYRsOg5nmmY+50thDPwcJXsTW/Fv9Fuvd88WDHh9hnWys3xdxvK +T2g== X-Gm-Message-State: AIVw112O5ni9ey6ZXJ5KywmECuHUsb7vx4t0qqcHr55YPYYi9Pf+02hC gBbtLftGgEKRZuHx X-Received: by 10.99.36.198 with SMTP id k189mr12962133pgk.230.1500010834296; Thu, 13 Jul 2017 22:40:34 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:02 -0700 Message-Id: <20170714054013.34458-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 07/18] lmbench: 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 --- ...usl-define-guard-before-redefining-sockle.patch | 29 +++++++++ ...t-CFLAGS-LDFLAGS-to-append-values-passed-.patch | 76 ++++++++++++++++++++++ .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 8 ++- 3 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch new file mode 100644 index 000000000..20791bf23 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch @@ -0,0 +1,29 @@ +From 31d58ed7e6552781f415501e96d7cc74f83b910d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 18:08:51 -0700 +Subject: [PATCH 1/2] Check for musl define guard before redefining socklen_t + +musl uses __DEFINED_socklen_t so check for that as well +along with HAVE_socklen_t + +Signed-off-by: Khem Raj +--- + src/bench.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bench.h b/src/bench.h +index 597d068..2ebdf5a 100644 +--- a/src/bench.h ++++ b/src/bench.h +@@ -77,7 +77,7 @@ typedef long long int64; + #endif /* HAVE_int64_t */ + #endif /* HAVE_int64 */ + +-#ifndef HAVE_socklen_t ++#if !defined(HAVE_socklen_t) && !defined(__DEFINED_socklen_t) + typedef int socklen_t; + #endif + +-- +2.13.2 + diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch new file mode 100644 index 000000000..d5c8f5f2f --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch @@ -0,0 +1,76 @@ +From 76f3a9abc2ff96155425ef97d8c5520cfbc8fe6a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 18:09:46 -0700 +Subject: [PATCH 2/2] build: Adjust CFLAGS/LDFLAGS to append values passed from + env + +For musl we have to pass additional arguments via cflags and ldflags +to link in librirpc, make room for those changes to take effect + +Signed-off-by: Khem Raj +--- + scripts/build | 2 +- + src/Makefile | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/scripts/build b/scripts/build +index 34a1371..3786741 100755 +--- a/scripts/build ++++ b/scripts/build +@@ -18,7 +18,7 @@ done + + trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15 + +-LDLIBS=-lm ++LDLIBS+=-lm + + # check for HP-UX's ANSI compiler + echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c +diff --git a/src/Makefile b/src/Makefile +index d9efd54..96467d7 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -112,8 +112,8 @@ LIBOBJS= $O/lib_tcp.o $O/lib_udp.o $O/lib_unix.o $O/lib_timing.o \ + $O/lib_sched.o + + lmbench: $(UTILS) +- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all +- -@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt ++ @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all ++ -@env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt + + results: lmbench + @env OS="${OS}" ../scripts/config-run +@@ -137,7 +137,7 @@ os: lmbench + @env OS="${OS}" BENCHMARK_HARDWARE=NO BENCHMARK_OS=YES ../scripts/results + + install: lmbench +- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build install-target ++ @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build install-target + + install-target: + if [ ! -d $(BASE) ]; then mkdir $(BASE); fi +@@ -155,16 +155,16 @@ all: $(EXES) $O/lmbench + opt: $(OPT_EXES) + asm: $(ASMS) + $(ASMS): +- $(CC) -S $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ `basename $@ .s`.c ++ $(CC) -S $(CFLAGS) $(CPPFLAGS) -o $@ `basename $@ .s`.c $(LDFLAGS) + + Wall: +- @env CFLAGS="-g -O -Wall" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt ++ @env CFLAGS+="-g -O -Wall" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt + + debug: +- @env CFLAGS="-g -O -DDEBUG" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt ++ @env CFLAGS+="-g -O -DDEBUG" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt + + assembler: +- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build asm ++ @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build asm + + + tag: +-- +2.13.2 + diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 43ac1d038..03b3721ca 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -7,6 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ inherit autotools-brokensep +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDLIBS_append_libc-musl = " -ltirpc " + PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ @@ -20,12 +24,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://fix-lmbench-memory-check-failure.patch \ file://0001-avoid-gcc-optimize-away-the-loops.patch \ file://0001-lat_http.c-Add-printf-format.patch \ + file://0001-Check-for-musl-define-guard-before-redefining-sockle.patch \ + file://0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \ + LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}" LD="${LD}" OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" BASE="${prefix}" MANDIR="${mandir}"' do_configure() { From patchwork Fri Jul 14 05:40: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: 107724 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454213qge; Thu, 13 Jul 2017 22:42:16 -0700 (PDT) X-Received: by 10.98.215.73 with SMTP id v9mr3438223pfl.103.1500010936516; Thu, 13 Jul 2017 22:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010936; cv=none; d=google.com; s=arc-20160816; b=oBFHGqdotCV2UKHCs+cMJ5eIn5POxh4BE78oUYFI6FHXROWPvzQEqrlVTp9+Uj1zdq fHGyJYD8JTJoT9VhHG1Z8m6LV+QfggwqQ+Iqyb+yLcqZnroN3JHVKdyvRUzWanj7gPBs Mw5+vcBQOVKfD9LIP0n4hl2HSc691VIq5khBfNg+VJaEWH+Z/95EGeLG3SVlEhDG51Bj PLtmRXowJFFXVAuviLRUBd5KJIPQlsCLgw3bcOagyc2v1yaHPeRgaMJi9GNTBm+h3zAJ 5l6tFUC4KweVT1BFOCK5Xog2vS7C2bNFWtlK/WWd1oFrMTuaAkPhf+Py9430O1rNygdt MBgQ== 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=VLrSSZ9aIk9jm18J4miif9PXUrQYl6ELdYP/OxPy5Gg=; b=pkLA0404b+wteWUNJS1H/JR8nhPNzeSI4MQfbh8mXMJHgB1Ubj75tnYJD4W/5TP4d7 N2LPpqd3gWKe3l+j4CPBYsVMBNIkpyceskXqeLehoDSL2iEW3+Zsr1LIyAjS41eOSz9j SoC5pJRA6rXCqZMI0QcVzOgWX1Z0+F4f45E7emlrEi8dzSboX5RSdwfdLQCBCUcaoNP9 rJKQiFHLQrT+dbCfFF0FxF3VDTQ43V3PLwzgdxvAsN54bI8Ldfw5lq0BnFHDrkOQT5l0 9yODuFdg/U+AC345kILmDDi4v/YCums79WbtCmT+3ydSnug79Ey8mMUKAdEx6atxW2IZ xl5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=njw7sN4y; 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 a61si6304896pla.145.2017.07.13.22.42.16; Thu, 13 Jul 2017 22:42:16 -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=njw7sN4y; 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 983F978227; Fri, 14 Jul 2017 05:41:38 +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 3E00E78170 for ; Fri, 14 Jul 2017 05:40:34 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id z6so9725722pfk.3 for ; Thu, 13 Jul 2017 22:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bRBTFBXD9j5NxfcEAReytLcguUI+hcAX1onKxrpHkpU=; b=njw7sN4yS3A36p1rc5BTaOG9trXK+IQmvRd3LNDwL4UTC2UgQlhub6V3ekuIloVxkG j1whPfTYnHqSpw5tD8Q3aTtdTLGNgATROxoag9jDmBMK+uc9uPO3S3MsUZ8/oBKLzGPH rp5AyXZiwcXhJFORXTAKaWh93FtXOdALxTw/DdCUQGM1Hk9WXnLyGCA4UXtRe2DEo4bL xZZ4V5cTsAMhuzJbHFF/YKoLvDnYM/R+OZSDHO0OC/FJFTnxwTeqUTbEtYBYCJnu8jN7 2JBz0WSZvZeiFizgSFe/eXnRkGGcku2xeIejJhkt4NCb72vGlxWzI3OLo3W/9Q11JnXa hzww== 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=bRBTFBXD9j5NxfcEAReytLcguUI+hcAX1onKxrpHkpU=; b=uQOaEZWfH7XuNxNgYdFriT2Kucjz0UJfnzgDcLn2HSg3/M6kzVkfoFH4NoxZEc59Ge C4G3nJ1kipAxnoqLUhVodni5ls6LMTU0jxbVZEp/8gRaThA9i8I/DBkAnPrZVU8SUx3e LutgC5ehg944yb5YxF2Zj1/UulFwVh9X7IQdx6XoP+IXxxpUpk/T6AZsT1LAKhv4YRN1 7zK/MgawAe71HN30zifo7Ddd81sMNbtgvEAmpGGeFSLsyWeHJEVroK0TOKJRxsSZ03i0 7Q/eq18Lvc/4QLC+xWPAbetfPDJiYxifMKZ9rz5uzI1HO7M8oFj4S+1fokzv0W1RtIAz D8vg== X-Gm-Message-State: AIVw112eGSz4GFS23ty5vq9kGAljgiW9WQRrB4trOPoKWzldFXT4rHgI BiL8es5dmLgTkinZ X-Received: by 10.101.88.130 with SMTP id d2mr13224998pgu.265.1500010835543; Thu, 13 Jul 2017 22:40:35 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:03 -0700 Message-Id: <20170714054013.34458-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-xfce][PATCH 08/18] xfce4-netload-plugin: Do not include sys/sysctl.h 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 Its unused, moreover it helps it compile with musl Signed-off-by: Khem Raj --- ...ude-sys-sysctl.h-its-unused-on-linux-port.patch | 25 ++++++++++++++++++++++ .../netload/xfce4-netload-plugin_1.3.1.bb | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch new file mode 100644 index 000000000..e35418192 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch @@ -0,0 +1,25 @@ +From 7fcc7352ec11644ac8be4e9ec1584a5be3333684 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 18:18:30 -0700 +Subject: [PATCH] Do not include sys/sysctl.h its unused on linux port + +Signed-off-by: Khem Raj +--- + panel-plugin/os.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panel-plugin/os.h b/panel-plugin/os.h +index 473c2a4..9a5c544 100644 +--- a/panel-plugin/os.h ++++ b/panel-plugin/os.h +@@ -170,7 +170,6 @@ + #elif __linux__ /* L I N U X */ + # include + # include +-# include + # include + # include + # include +-- +2.13.2 + diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb index 7d7778202..35c8861bc 100644 --- a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +++ b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb @@ -5,5 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" inherit xfce-panel-plugin +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ + file://0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch \ + " SRC_URI[md5sum] = "f25aa3242e3119b49f259a3e4a1af08b" SRC_URI[sha256sum] = "99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c" From patchwork Fri Jul 14 05:40: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: 107725 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454322qge; Thu, 13 Jul 2017 22:42:24 -0700 (PDT) X-Received: by 10.98.18.69 with SMTP id a66mr3380986pfj.33.1500010944739; Thu, 13 Jul 2017 22:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010944; cv=none; d=google.com; s=arc-20160816; b=xXQcb0Hcoo0fLyQeSvQhdSNGh3c1DtFm7ZuxwkuS8YuI1/JVv4EU69/E579z54MOqc 8bRB60qXJqB0jYuuAgBCBSDO/1pKf7Of7OA+70YPgWsuz1sCxd0Wv/nGOhiaelB/cvg6 ZmlJllj3ghK8PMOhO9KIsgKjvZU7otnz/eRXRVVtsHodo/z3yYl6+kIcNYv/TJ4pb9h/ J8d6DOw7bfujSqeyMtOMlINqGni4aT1cfH0QE8o8xq9gaMvZ1bT8oIUCcrfbZm0CYrGd GDPw/WK8xJImZyqRr6dJMrW+yzy5mPr+4zM07gq2Klw18Mt0KR32dv7s5vu7SU6jxwhE /CDA== 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=ZS+qxs4vb9XqrcUhOel0XvprJAlJAFN4EP4zLOAg8Sg=; b=k2EJdRHo1WjsqI1txlAd1heTHFKLljRLvFh9b1U5pYjxvYaRBkaN04+cdctxyr31hH rpA/S63duq6skFut5hPx909vuo7XT6keHLVMF3sQYbz6pcihzjx+tVzpD7sPLKLZyR1N V2vqIPFxjeittD7zSUHtZTQDWKJDbeib/2b8+EnSK/lWw5Sx06HK85b4ALpftEup5IeK REcJCH/yBu9Lvl7HPAGb7lQQao1FrwqYQnTR46SxXwmH5rHicx92A6A/C/N1xTxY0Yvw uYNic+PqN7w+20utscYGPOkLpIF5l2od1rs4CE04ySmWbpr4baFF5BZsmgo24Eq4e/I3 KtiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=KOuaYerP; 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 v32si5681447plb.250.2017.07.13.22.42.24; Thu, 13 Jul 2017 22:42:24 -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=KOuaYerP; 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 A56CF7822D; Fri, 14 Jul 2017 05:41:39 +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 966EC780C3 for ; Fri, 14 Jul 2017 05:40:35 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id z6so9725771pfk.3 for ; Thu, 13 Jul 2017 22:40: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=5NBmwW89YRGxY8Dydsaa+DDX9TDB9uvqV1AOOyOIcwU=; b=KOuaYerPHozbM+mgBlaTUnSMXSBS6TuMex2vtzJGZ7mVKO+Ok/6CNKlXVE3Pft63pv tH+8qN3ddrdEwiG7/DYn5Q+/bfN8dMYOtCI/p9dzF+Vj0dMk8MgZ6lS7mLdejzEuUUec p85UU5HGMQzax92LDCUrmdr7OOY4pwz15+7OeNqVeZFKsBPeT6iJ0WKnJYNIpEYmtr8y A0K6JSf8FqhoSvoi88LYA7eIXNigzwo7UnVrl1RVXd4KpEMq/QWPsg5NC8O3VU2wKSCw TTI6w+9vEXQTXkT7K3qBtR1vo0g5EDhvmaujfrmKpeKvB00OfeghCAzBQEATuSAFIbTv YK8g== 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=5NBmwW89YRGxY8Dydsaa+DDX9TDB9uvqV1AOOyOIcwU=; b=GBhzRVC2jY5WrMt0FJTw4YIuTjAjdppUbKXALtG//zh36Qt2mw8hA6HynlNO4m4sbU 4yyuRobZ3XFZocrBvx6qghWWIkrYAK8ws6MV9aegZN20Z2feNzyizTYJ2WH0xulTpUYl Jq67yEC3awvttUFHO0cEgYqwdLhCb9e8T+Na5wc3edL0O5U88xyrwPJeZWCYeLLJ4pUh DU/v9MHVzUgn2znDmiJvqyvVwohcU9om74cFkSWYN66zifOnS52WnrYrUaFSuKI5dnMw gTjNidycXxzXdt5ksEm3O8BjAAzpH1RMgusmxV2S53kOdfHty8hRBaKz+A1oZ+C7nsd3 g++w== X-Gm-Message-State: AIVw113uzpaRhj66zMN2EpDuZd9n2GFotY8q+9wT44+cJBe7vKLBafIR BAIzV7RCkJ0nbbln X-Received: by 10.84.128.46 with SMTP id 43mr14165087pla.113.1500010836901; Thu, 13 Jul 2017 22:40:36 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:35 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:04 -0700 Message-Id: <20170714054013.34458-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-xfce][PATCH 09/18] imsettings: 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-Rename-use-of-stdout-and-stderr.patch | 72 ++++++++++++++++++++++ .../imsettings/imsettings_1.7.2.bb | 4 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch b/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch new file mode 100644 index 000000000..d77ce4d25 --- /dev/null +++ b/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch @@ -0,0 +1,72 @@ +From 7ee62ef0083844ab2fffcd106e3ee2e5f29b2a91 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 18:53:56 -0700 +Subject: [PATCH] Rename use of stdout and stderr + +Since it shadow the standard definitions especially +seen on musl where libc defines these as macros they +cause all short of compilation errors on musl, using +a leading underscore makes it unique + +Signed-off-by: Khem Raj +--- + imsettings-daemon/imsettings-proc.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c +index 915e78b..b78fcff 100644 +--- a/imsettings-daemon/imsettings-proc.c ++++ b/imsettings-daemon/imsettings-proc.c +@@ -39,8 +39,8 @@ + #define MAXRESTART 3 + + typedef struct _IMSettingsProcInfo { +- GIOChannel *stdout; +- GIOChannel *stderr; ++ GIOChannel *_stdout; ++ GIOChannel *_stderr; + GPid pid; + GTimeVal started_time; + guint id; +@@ -368,12 +368,12 @@ _start_process(IMSettingsProc *proc, + &ofd, &efd, + error)) { + pinfo->pid = pid; +- pinfo->stdout = g_io_channel_unix_new(ofd); +- pinfo->stderr = g_io_channel_unix_new(efd); +- g_io_channel_set_close_on_unref(pinfo->stdout, TRUE); +- g_io_channel_set_close_on_unref(pinfo->stderr, TRUE); +- pinfo->oid = g_io_add_watch(pinfo->stdout, G_IO_IN, _log_write_cb, proc); +- pinfo->eid = g_io_add_watch(pinfo->stderr, G_IO_IN, _log_write_cb, proc); ++ pinfo->_stdout = g_io_channel_unix_new(ofd); ++ pinfo->_stderr = g_io_channel_unix_new(efd); ++ g_io_channel_set_close_on_unref(pinfo->_stdout, TRUE); ++ g_io_channel_set_close_on_unref(pinfo->_stderr, TRUE); ++ pinfo->oid = g_io_add_watch(pinfo->_stdout, G_IO_IN, _log_write_cb, proc); ++ pinfo->eid = g_io_add_watch(pinfo->_stderr, G_IO_IN, _log_write_cb, proc); + g_get_current_time(&pinfo->started_time); + pinfo->id = g_child_watch_add(pid, _watch_im_status_cb, proc); + +@@ -521,13 +521,13 @@ imsettings_proc_get_property(GObject *object, + static void + imsettings_proc_info_finalize(IMSettingsProcInfo *pinfo) + { +- if (pinfo->stdout) { +- g_io_channel_unref(pinfo->stdout); +- pinfo->stdout = NULL; ++ if (pinfo->_stdout) { ++ g_io_channel_unref(pinfo->_stdout); ++ pinfo->_stdout = NULL; + } +- if (pinfo->stderr) { +- g_io_channel_unref(pinfo->stderr); +- pinfo->stderr = NULL; ++ if (pinfo->_stderr) { ++ g_io_channel_unref(pinfo->_stderr); ++ pinfo->_stderr = NULL; + } + if (pinfo->oid > 0) { + g_source_remove(pinfo->oid); +-- +2.13.2 + diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb index 4b2ca4947..7a4ce05bf 100644 --- a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb @@ -11,7 +11,9 @@ inherit autotools gtk-doc gobject-introspection SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ file://gtk-is-required-by-notify.patch \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \ + file://0001-Rename-use-of-stdout-and-stderr.patch \ + " SRC_URI[md5sum] = "8153b0583a9f47d8a62af1f92fb9d3bf" SRC_URI[sha256sum] = "41addf0458f760212b6b6100835066e16deb3a8a50eb005a0fc17fbac0a2ae66" From patchwork Fri Jul 14 05:40: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: 107726 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454461qge; Thu, 13 Jul 2017 22:42:33 -0700 (PDT) X-Received: by 10.98.208.198 with SMTP id p189mr3488892pfg.10.1500010952945; Thu, 13 Jul 2017 22:42:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010952; cv=none; d=google.com; s=arc-20160816; b=tAMhP9YupSxmlxOQhfrvJQaeO5E5ukD5QUMNlmLPbCH+nVDOjbItU3WR4CRw7vZsxw G7b0vK1Ox+FzC6Oa69+VFLSUXtGCy8yYitGp6nZgDGrcB9sdkBWT9fEOHifLLa02/Kq1 MgkXAPFvTmIMJpZQTRexVjpJeB1C80oTPwwh9+qQj2eBFlyLY3igwMfF9LiwQJc8Hyua 1CDQxyijoWvhcoigIANBQMMJowOJY1ZHM/QjJdIq11Ta79WZxG9nuBTbUW/gUSNZSQpv n5xevnuV8PLab6mz+Dkhlga3D0cpBod5BZlFylQXUVdK3cFaV5a7Z56oUPA+YQVq3uAq 9W7A== 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=ui4OXeyo2lo0sh2KIEJBYAmkLF0b4T3jDiOMStzp9QE=; b=TLnsdlVPrDUWF0/fz7YI49Lv2WeSpo5IHdP3q06o6yoF+DBxbVfCOvftPV0ozxKcM/ 8M2B4xBNrq4xqZIixDLAuI+A2nBkpT/CFqbsHkt7eP07tyivi8W0WTD2y031E+YJNiOe 2cQNEfIwqEEkDUpW2pDn7O+XEPXZ8AmfB/y9XyLR8ORRRx9ZCAz3DLRf6PysLFWnYTFb SLOWHzYdf5cmNMtJNDt79eWlJotbs4ZQVm9kKmKDwYNpVOopKTzd8kps4izvSdZBr9KD flIPa5o7Mo1SkN5HaSyn9l05MGUUcdbXEdWcXzhy/2Th0LtKNr6wqaQQwSTR5vsDsJK+ HyjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=T//k+XQD; 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 k7si5683316pfc.352.2017.07.13.22.42.32; Thu, 13 Jul 2017 22:42:32 -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=T//k+XQD; 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 AB34778233; Fri, 14 Jul 2017 05:41:40 +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 02C4C78199 for ; Fri, 14 Jul 2017 05:40:37 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id e199so9719950pfh.0 for ; Thu, 13 Jul 2017 22:40: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=guP+cF5mudGOi3NqB3ZdK3mooi0eMNa9/LD3EDt6yYo=; b=T//k+XQDokKA2LOni9xtm4CRNkQv47cBPjQIhgghTx/iGObxZcqrghFH4tW9oHAczD KVGF9IbYT7KYTsskDCYM5cR4RIBxw0qe1Vwcc2o1WzwKclXpZEu7qKqka7oHiWCzdOTP 3bmrfUVRRxsiikuCA518TpTQ/GlN/1r0Yszeeb3XtTezgwSzOJq/ytENef2hMctkuo+H 9tqZCAPBJHJFuXy9LFE7n8OTz2S8AvvGwWKvza8CgQdK90LlLWV8jJdbky3g4Ys+JbXF I2tZ9+gvbN4yhHOKBcNOU2gfhSzlc1Zqzg363wJq0NECFBarceha7wl2SOWwjuc/gIXx 4aUw== 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=guP+cF5mudGOi3NqB3ZdK3mooi0eMNa9/LD3EDt6yYo=; b=juBPYn9ZF1tFV20HP79+Gv+RRPge780ctHerosL4sB4fAtBkuyTerJziTYEPTykQ4n bdir7YaCeTF92joKwv4b4nDpAyMd2D7VIxWcW3OYaF1SexloPCuMY6UKQF54cm7txmeg 3t4DaufaypQfxeD49nbwPTfGVeBJ47hsNLQhfL1iFNXWFulumMRb+RelsGZww/H3cTgS NrW0gTJF52PxC5e/oKsAEgS75qFqoGb/fmostwSvcZ8UsqD3tHvn+0st1vn0OTCVuFHY 9YgjSp3NF3d95N7TixXQPGv+1qL8UuQVhL7kLOynN6RAg0S54Ak62Dk1rtaIcae/lme0 snxw== X-Gm-Message-State: AIVw111YMWsp0gUSwY4hHzExdJzUeYpVAB0f/cNmnXfJ1xLBGCgmLcGl fBcSm3uS+OUItgib X-Received: by 10.99.246.69 with SMTP id u5mr12859122pgj.173.1500010838255; Thu, 13 Jul 2017 22:40:38 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:05 -0700 Message-Id: <20170714054013.34458-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-gnome][PATCH 10/18] gedit: Define ACCESSPERMS if not defined already 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 Fixes build on musl Signed-off-by: Khem Raj --- ...ent-saver.c-Define-ACCESSPERMS-if-not-def.patch | 31 ++++++++++++++++++++++ meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb | 11 ++++---- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch b/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch new file mode 100644 index 000000000..11afe75ce --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch @@ -0,0 +1,31 @@ +From ee43bcc3c8d69fe56a64c3487e2d3c780ea5d25e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 06:53:35 -0700 +Subject: [PATCH] tests/document-saver.c: Define ACCESSPERMS if not defined + already + +Helps compile with musl + +Signed-off-by: Khem Raj +--- + tests/document-saver.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/document-saver.c b/tests/document-saver.c +index 9f44d5a..811ade6 100644 +--- a/tests/document-saver.c ++++ b/tests/document-saver.c +@@ -41,6 +41,10 @@ + #define UNOWNED_GROUP_LOCAL_URI "/tmp/gedit-document-saver-unowned-group.txt" + #define UNOWNED_GROUP_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-unowned-group.txt" + ++#if !defined(ACCESSPERMS) ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++ + static gboolean test_completed; + static gboolean mount_completed; + static gboolean mount_success; +-- +2.13.2 + diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 03d7fa4e5..4352b5e11 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -8,11 +8,12 @@ DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-c LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit gnome gettext pythonnative -SRC_URI+= " \ - file://0001-workaround-void-pointer-arithmetic.patch \ - file://0001-Remove-help-directory-from-build.patch \ - file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ -" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-workaround-void-pointer-arithmetic.patch \ + file://0001-Remove-help-directory-from-build.patch \ + file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ + file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \ + " SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" GNOME_COMPRESS_TYPE="bz2" From patchwork Fri Jul 14 05:40: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: 107727 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454577qge; Thu, 13 Jul 2017 22:42:42 -0700 (PDT) X-Received: by 10.84.217.152 with SMTP id p24mr14118771pli.276.1500010962163; Thu, 13 Jul 2017 22:42:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010962; cv=none; d=google.com; s=arc-20160816; b=CAPai7eUQGnv/sjnSGHfh5v9TSGuLtlicxLHqbtYIdd43iUv4XK3qHRVINBTHx+w4Y 4koKOl3TMciJ5AirgL87AlAQPQb0zaZ4mqVxWZF8UwRiaB5RSxz4tZDe+CsfYqhg1naK X7OBppHwIClKqCQwEQQTr+IYx+ivnNNxuHpZGKDl1rR0deNtnu1vHaSuD7o3nBqF9NcT WMpACvIxuhLGdWipLYQqfE5N4hDjuPC3RFNpBGNoWKxsAn2EuW8EhZLmQpBZOf5rsDF0 lFkrktAu8c8J1PB9YUwq0ddobLy9JF6mrse1jum2KaXrfRt6QG8QN7dsc06FnbrRfted 4zFQ== 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=JaUQL/gCKFHNcd16QdGOSosOaEiclMkmdCyhWM27Jsc=; b=xpI5S+xH5bNPAdUKToC5mS+7mrHsEuaUASbiwGXwAkukA/d8bUJmhOjQz6Psv0K+Iw 7BCtuYyu3Xc5/3z6Acyj0h1o3q/weC94XFXO65jemALI/O3qAFST0BIRNui46dMkbEC8 ThKG+jAzGI/ZGTCNId3B0Qe4ixVL/BaLxcr9RarXPQfqheQhULAEpryVcr7OTPHXEf2s nfplc4cDUPVfHIC7ZX6mCNIC7ZdUCOATWdzTPWbyeSs7PzefRwWl37E0XTZ227VSj9j2 aj/RzBimH0YwdGGDA0oZYEZsg319KDJ9it0wxkRV+ApAU6pEAzoleiRvaVczhny2UHsN q2SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=kalWSY7f; 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 w129si5594390pfw.229.2017.07.13.22.42.41; Thu, 13 Jul 2017 22:42:42 -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=kalWSY7f; 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 BA11478236; Fri, 14 Jul 2017 05:41:41 +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 AF50578152 for ; Fri, 14 Jul 2017 05:40:38 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id u62so9393490pgb.0 for ; Thu, 13 Jul 2017 22:40: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=pCuvorYrSH+iU+SgCEftk8MF7dDshkppunByBb5nxrI=; b=kalWSY7fxzmImxnZXU2R2P9v0n/bUeiChhM/rduL9pbCLB2UANcKVf3XVp3pwYH2mE VJ3qzMCvwk2HSV48eilr0whNJZ+rFE4MFiyeSU1WjMZ6L0NtLLELokTM9uR7XZsVUYHy NSgs8tyZbFNis2uFldHGmumrUynb0tIu1HrVUt7dGpy/+X0y89ZqBavS1hlyUJa/qiUx rTHzs/5zZO1wwnNU1Wbwt313nfDZcelQYiJAPYWI5tR2q9WYlwD5J+80hNK3xUZ1A9+f fNyKEihwnvJVsxR0wTuD5ygJDjMTMWK4T+HMdohTMbZjnqaIAWp7h/zr3EeFfuPP1HMP DSPQ== 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=pCuvorYrSH+iU+SgCEftk8MF7dDshkppunByBb5nxrI=; b=S8UOBLpzC3Y+BRnVBNXAiyVGn4Bgj5G7bQKLYQqWvLHnjRiB0Ga6CJFqs6yMJqzp5g DzSYRwiyhpK0H5/4EDas9MF69OrK3idYPCe351N3cjqx12/0SXHVM9hJ797ruDJ/ncxf LGLDr9uB1ua+aG6UVS700D0FSEcswHCZ5F0EbPOOVSb2jdW8tTf6tKiudVwJMGOZE9Wr dJvGAM9xtLwrmN/QUit7lc5su9tmk/QfiEJ2T52HGCxngLg6h5VOgmd5bqmmk7W9Tb9O HEmC7pcKa2Y484fw1Z/tM1vLtg2xP/LD5pcGohiY6cQMXAJsrCIIk2VdSAT8OjvD5qdg N8Qg== X-Gm-Message-State: AIVw110xeqKf7h0fyPg1Jjw5Y4a7PffzDxEKVTcpYa7uOEY24sBWJwRB 0p1OoispwaWge6Bw X-Received: by 10.84.169.67 with SMTP id g61mr13908491plb.155.1500010839540; Thu, 13 Jul 2017 22:40:39 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:06 -0700 Message-Id: <20170714054013.34458-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-gnome][PATCH 11/18] onboard: 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 --- ...m-Define-error-API-if-platform-does-not-h.patch | 67 ++++++++++++++++++++++ .../recipes-support/onboard/onboard_1.4.1.bb | 4 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch new file mode 100644 index 000000000..fda37895c --- /dev/null +++ b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch @@ -0,0 +1,67 @@ +From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 09:01:04 -0700 +Subject: [PATCH] pypredict/lm: Define error API if platform does not have it + +error() API is not implemented across all libcs on linux +e.g. musl does not provide it. + +Signed-off-by: Khem Raj +--- + Onboard/pypredict/lm/lm.cpp | 1 - + Onboard/pypredict/lm/lm.h | 13 +++++++++++++ + Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp +index 2e64296..37ae241 100644 +--- a/Onboard/pypredict/lm/lm.cpp ++++ b/Onboard/pypredict/lm/lm.cpp +@@ -19,7 +19,6 @@ + + #include + #include +-#include + #include + #include + #include +diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h +index ed4164a..b8b63ee 100644 +--- a/Onboard/pypredict/lm/lm.h ++++ b/Onboard/pypredict/lm/lm.h +@@ -32,6 +32,19 @@ + #include + #include + ++#if defined(HAVE_ERROR_H) ++#include ++#else ++#include ++#define _onboard_error(S, E, F, ...) do { \ ++ if (E) \ ++ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ ++ else \ ++ err(S, F, ##__VA_ARGS__); \ ++} while(0) ++ ++#define error _onboard_error ++#endif + + // break into debugger + // step twice to come back out of the raise() call into known code +diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp +index 7c62824..e7c7f40 100644 +--- a/Onboard/pypredict/lm/lm_dynamic.cpp ++++ b/Onboard/pypredict/lm/lm_dynamic.cpp +@@ -17,8 +17,6 @@ + * along with this program. If not, see . + */ + +-#include +- + #include "lm_dynamic.h" + + using namespace std; +-- +2.13.2 + diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb index 3a4f18971..10765ee0c 100644 --- a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb @@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" -SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz" +SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz \ + file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ + " SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" From patchwork Fri Jul 14 05:40: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: 107728 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454689qge; Thu, 13 Jul 2017 22:42:52 -0700 (PDT) X-Received: by 10.98.155.148 with SMTP id e20mr3386168pfk.149.1500010972867; Thu, 13 Jul 2017 22:42:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010972; cv=none; d=google.com; s=arc-20160816; b=izEm5a4HkFAFg3tfZSYoGpxUbHlMGkoMl2Z5TLfarHu6+oghqYBTYIRugmcr4A1eDH ZWQuiBC3qdntCEjbZTySEE+z/MnPGX4x1V1NkJ9VIsupWXhaJVCT+bek4y3m3gd2gatT OnFk0ODXJJum2jY7FHh9CTZabaF+i/wd8zMCPbb2CNWreknVTGSRtrIBjpqGBivygeOR +0Zcx5eQfJXLWV3nizN0/J3KMHihosoCKUG+PW2qoUzOoUFGMYmXD+N+TO2N/lPrpEhD Fyff6m7C+T1VwU4m13WXZI1Um5BWmQ0xDkslQS0NPNIg9psRHCpeF72hWzJ5OiLy/Lm2 dZJw== 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=3gMvn+riCb39T0iTcpJO//xyD+DJeW8G0RYZSKCw7N8=; b=jU1qtI4SSLaLyX7zfvNqyf7wSEoD41OEaenDHgiblhTySPIhfzdIcVmyZT3aKo4Fne cMjDWlfD8hDPs4YAu1MlYzG37jgAYyPxfsUr9GIiaIF9j1LuqyixJFkwvOr/Iva1HfhS OzFzDnPuVf5Mqodbnn6SYLsSWgqzOjAlAaSlmCo1LLqSSlJ/lFcrBJf4wPQZeeWXhN7U qZp/URKZIt3TQCu1vjiNm0jNh0rTjYBiUNylQ7yhdAxGquenyPOl3VktjujcREVB3nKE q2bKNRgdb4KqFMYhEyVpqZ0V4/E8NgyrTEgiTm8j+oOm9PLVY6TGLOmT58AyUBSxlRxF SdqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=T3rWetSa; 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 k85si5751816pfk.11.2017.07.13.22.42.52; Thu, 13 Jul 2017 22:42:52 -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=T3rWetSa; 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 09CBC78242; Fri, 14 Jul 2017 05:41:43 +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 EB40D78152 for ; Fri, 14 Jul 2017 05:40:39 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id y129so9410919pgy.3 for ; Thu, 13 Jul 2017 22:40: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=TEAogt7GPK74IvbDrpKSwUGsN5/mz2Ye/++MZxwAvQo=; b=T3rWetSa/GkmufwfdZDmpdy8AMOFTIbXasgJogJDSrDdDMEzMxuy41Ls+FPc5xqLog moNxuXl4KFUApIyKFEXqK5LAgxVjo061HCe6MRUPwkJzlnPnx2xhV1XWutY0f9oulPk7 kuBoSYyU3pjAXjrkGmcKK7aDXsYYbXvUJhVijBulD3ndN41gkVjOuYbTQigWOkkbd/5E X2GAUXlwm7wKIsQiTUJEeTHvMKJ9S4vwkmDopSHFMCs8ms6GAFNMAA5bzGrBgFmI/aGN j3gKBWJuz12k7HRwKXi9pfIr//uVncEsfC7kK/d+TBslW3Fu27zJ7qJdAaQqqU3JesdZ EjuQ== 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=TEAogt7GPK74IvbDrpKSwUGsN5/mz2Ye/++MZxwAvQo=; b=UEAKP6xEbuf9NdK92MtIhyMsBjhvwEhVauJ1kv/Lo/p4oqs0sRzJUrgs1E44wem6Ge NrLeJOAuvIrBy7MISgmuMb1jPqKQ/hcJd//mQ2J4lUmZhAR0IupRR2Lq97IcGeU8rU2/ QisSSoGOwm22tjsNFP1iH2S/JArSnYuCILDCmedj+N8AEkiYUpHbkP7m/h5yv5auucDd RBYuvVnsyLJIIeu9mSbfAKPVbMVp8QgyCZIVDj7J2cI/+ulxPxRnUtJBLekVL6y/EoR1 rl/J29uwtBDdzH7IteBVEZ1k8KBjbW4LyvgtInmjySmzUyUawM31oHVUT4vpzRIlxO81 LbtA== X-Gm-Message-State: AIVw110Tpr3fezuDhIHzgDOm6PAZLaDdgNjh4Gm0qc0sn7eMSSKxTrwc 2bDJMh1eWWfum9Rb X-Received: by 10.98.148.25 with SMTP id m25mr3452235pfe.7.1500010841222; Thu, 13 Jul 2017 22:40:41 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:39 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:07 -0700 Message-Id: <20170714054013.34458-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-gnome][PATCH 12/18] libgtop: 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 --- ...-Include-libc-net-headers-unconditionally.patch | 46 ++++++++++++++++++++++ meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb | 3 ++ 2 files changed, 49 insertions(+) create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch new file mode 100644 index 000000000..c4f7da4bf --- /dev/null +++ b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch @@ -0,0 +1,46 @@ +From 3c6f70e50cb586ac4add4dea627c316242691040 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 09:17:29 -0700 +Subject: [PATCH] netload: Include libc net headers unconditionally + +This fixes compile with musl, and this conditional +is not needed now a days if we are still using glibc < 1.0 +we have other bigger problems + +Signed-off-by: Khem Raj +--- + sysdeps/linux/netload.c | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c +index c275db2..446bddd 100644 +--- a/sysdeps/linux/netload.c ++++ b/sysdeps/linux/netload.c +@@ -34,8 +34,6 @@ + #include + #include + +-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 +-/* GNU LibC */ + #include + #include + #include +@@ -43,15 +41,6 @@ + #include + #include + #include +-#else /* Libc 5 */ +-#include +-#include +-#include +-#include +-#include +-#include +-#endif +- + + #ifdef HAVE_IFADDRS_H + /* needed for IPV6 support */ +-- +2.13.2 + diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb index d79b9e5d4..946d11845 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb @@ -6,6 +6,9 @@ inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspectio # depends on libxau REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-netload-Include-libc-net-headers-unconditionally.patch \ + " SRC_URI[archive.md5sum] = "ee29a9ef60659ebf4b075ac281f71cb2" SRC_URI[archive.sha256sum] = "463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5" From patchwork Fri Jul 14 05:40: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: 107729 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454784qge; Thu, 13 Jul 2017 22:43:00 -0700 (PDT) X-Received: by 10.99.101.135 with SMTP id z129mr12954968pgb.66.1500010980785; Thu, 13 Jul 2017 22:43:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010980; cv=none; d=google.com; s=arc-20160816; b=Wlj8R/ZTpniSLfZe8zlNHFnhzyGFrsvl7DJ4cgvU/YaZdTDDG04LHA+Qf8xvdwYqTB NcCeagAC5zF/j1e9RyKJwPpGb7FWu9Fns9P5YDddUnxW0k5fWdDvHe+e4rkJwudhakaH cJvc8NEdnXgmTpcSDVeBv59hD/q/3nJULUwNItpNjAUrglujf1IOegbRykdWz4//5wPT jM/WNNT8RDNu9xcscJIkEhZHydPUBy5MEpKtYxms9w1qrAtIW7CUtokiR2BQRsfuB5Hv 32RTnnBQ4pbd874DV53xiMPKAUeFvGRul3hANYYBZjT8qmRka/QsriCfCalhic56oq33 UYWA== 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=N2KlN5PiNHORI53jDBZzPiG6fB9FscbZLQlVj5uom88=; b=KrNNEVy68xtVkHcbGiEbarvCGcNrdxzMvsi4t/XhFXJdR3smm6PLDVhRVj3N6GbKOq olZGer9xvi/Zy2qJTVwXLcOFZZuG5TzlnFNyOBHCrQr3I693V9SpYbo5TMRXnRRPqX6h DvNWDtzVLXB+Tf/hsDY4RLOuZQ9WPV+IZk10WdLi5tXZiaYLAfrCmlhAxz0Lqkg2Kv4i msZeaRqsU3bJyjspNsN+ar50jEcxrjV6m6HWDf+SjLFhYOsjFBP3PPlvhW1IeUlqeRBD zKlkGvmgMQoHLOBaMqqBh1DUNStwfWeRdlZ/c3jU2Wg4JBh3B168URkoTzUlGKTUWIgO GkdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=QUyM3CbY; 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 l10si5888748pln.222.2017.07.13.22.43.00; Thu, 13 Jul 2017 22:43:00 -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=QUyM3CbY; 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 1CA21781F0; Fri, 14 Jul 2017 05:41:44 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by mail.openembedded.org (Postfix) with ESMTP id 095DF780CE for ; Fri, 14 Jul 2017 05:40:41 +0000 (UTC) Received: by mail-pf0-f181.google.com with SMTP id e7so40224313pfk.0 for ; Thu, 13 Jul 2017 22:40:43 -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=IXgkKjn5AUyRsDf7ZMrR2+WQ3OEe8QikBy0g68du0G4=; b=QUyM3CbYkMPWO/DF2DkmqrCaRZi9FhqfZ785eK6JaSDaXcQuxiLXtmGYbH0Awyrc43 r9WW96qUzWGq9hxHMZuWWJHyWj+phPApOHQgxB60Dge5KiTYPeSeVfvDcr8pGt3P6Xt5 YbW9vZbEieDvlpi9HX6ddB3BZ32RiYnpPV7Kgg75IYwwe1OAysEkcyaXCMHAoRm1W0R3 zNPQOZIMecdbKMKiqKZ2H3WoOHxJXW+kMVYTevS3hiAYw/mTNJXi9wrmpROmooWdzbcI S+u9jr+t3pXABUgyZKXFEDNlL4JRqxZ61X0WmHK4V6vG/RAd3T645IDyRpfOEPl4BMWn +cjg== 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=IXgkKjn5AUyRsDf7ZMrR2+WQ3OEe8QikBy0g68du0G4=; b=XlcasoFt1gjsl+b3y1gkXituywGalDbBzLHzY+3niiPe/PVmgFW2tU1+aQpeT6cvPK GQirlPeaNPpqnm1Xju7fHFkZYl0HmIcbYMi9xCj9Q26AbhSa+2eHhirnnCsPGQ8ErmFu 70gP4/PMz4zmFMHQD/RyaxiWI4hHCsC90qZobpj15Meb6vP2f9yfcpvz1MIRzjv/OeDA cpo4G/goYOiic3XMlbPHVPT5lQponKKFmTc5qXOa+i3G5yB6dF3mWgH1CuFjdRkS2wcP TAO3xQRqP7fQUu1aQnunt+nXl+EJn2jkaNt+WApsrSzvtiG+18i3QJ9ykTXlpTar+DF3 /FWg== X-Gm-Message-State: AIVw112yrvvStv5ZvG3ZaAJfDdKcjItxJq9S5ULjvIiRisnMycf7bvnn bZ4scxJ7CSSXiS+z X-Received: by 10.99.123.28 with SMTP id w28mr13052278pgc.183.1500010842536; Thu, 13 Jul 2017 22:40:42 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:41 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:08 -0700 Message-Id: <20170714054013.34458-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-webserver][PATCH 13/18] netdata: Upgrade to 1.6.0 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 Licence files has gotten cosmetic changes additionally checksum COPYING file. Signed-off-by: Khem Raj --- .../netdata/0001-Correct-Timeout-issue.patch | 32 ++++++++++++---------- .../0001-makefile-Do-not-build-contrib-dir.patch | 27 ++++++++++++++++++ .../recipes-webadmin/netdata/netdata_git.bb | 14 ++++++---- 3 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch index d5529a2a6..abea0d66b 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch @@ -1,19 +1,21 @@ -diff --git a/plugins.d/charts.d.plugin b/plugins.d/charts.d.plugin -index 40c0356..bca57b3 100755 ---- a/plugins.d/charts.d.plugin -+++ b/plugins.d/charts.d.plugin -@@ -184,10 +184,10 @@ fi - # timeout command we use, providing a function that - # can emulate the timeout command we need: - # > timeout SECONDS command ... +Index: git/plugins.d/charts.d.plugin +=================================================================== +--- git.orig/plugins.d/charts.d.plugin ++++ git/plugins.d/charts.d.plugin +@@ -246,16 +246,6 @@ else + info "configuration file '$myconfig' not found. Using defaults." + fi + +-# we check for the timeout command, after we load our +-# configuration, so that the user may overwrite the +-# timeout command we use, providing a function that +-# can emulate the timeout command we need: +-# > timeout SECONDS command ... -if [ $check_for_timeout -eq 1 ] -- then -- require_cmd timeout || exit 1 +- then +- require_cmd timeout || exit 1 -fi -+#if [ $check_for_timeout -eq 1 ] -+# then -+# require_cmd timeout || exit 1 -+#fi - +- # ----------------------------------------------------------------------------- # internal checks + diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch new file mode 100644 index 000000000..9a3a4a551 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch @@ -0,0 +1,27 @@ +From 87f868918a9ae1dcf93e01f3e177d185c19a149a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 14:32:09 -0700 +Subject: [PATCH] makefile: Do not build contrib dir + +It contains debian build iteams anyway + +Signed-off-by: Khem Raj +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 3ccf82f8..a852e529 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -52,7 +52,6 @@ SUBDIRS = \ + src \ + system \ + web \ +- contrib \ + $(NULL) + + dist_noinst_DATA= \ +-- +2.13.2 + diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index de140641c..100366211 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -1,11 +1,15 @@ HOMEPAGE = "https://github.com/firehol/netdata/" SUMMARY = "Real-time performance monitoring" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=747afe070ea9d6c2be0a31353609a35b" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a4a3b650ea3f74269cdfd45a3550e219 \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + " -SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" -SRCREV = "36c1304e37094174ea51001903058e65053107ca" -PV = "1.0.1+git${SRCPV}" +SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \ + file://0001-makefile-Do-not-build-contrib-dir.patch \ +" +SRCREV = "f5fa346a188e906a8f2cce3c2cf32a88ce81c666" +PV = "1.6.0+git${SRCPV}" # patch to disable timeout because timeout are not available with actual version # of core-utils @@ -19,7 +23,7 @@ SRC_URI += "file://netdata.service" S = "${WORKDIR}/git" -DEPENDS += "zlib" +DEPENDS += "zlib util-linux" inherit pkgconfig autotools useradd systemd From patchwork Fri Jul 14 05:40: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: 107730 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454907qge; Thu, 13 Jul 2017 22:43:08 -0700 (PDT) X-Received: by 10.84.232.70 with SMTP id f6mr14131311pln.169.1500010988378; Thu, 13 Jul 2017 22:43:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010988; cv=none; d=google.com; s=arc-20160816; b=gvKq37NeAg1dprWEPH7n/d1ERV3g6dwG2+6ba4v75Lu2iZUbLWVDgezw5czauRmnbu P5//BAKnLpT+ddo9NscbvsHWFmwr+C3xHcvTCc0lV+UarIHuirD/eqSIlRNz+8ZqfVi4 jP3yp1YG3gCp7SXBL/Y3ZNAMFDb4vcBVwU2IeZ62De7A3+43KVp02rnysXSQROeWXojJ V9Lw89Io2hCi3GcWAH0m2hphoVepAUzacJvBq8DJM8a11v+WredZZ8QrB4UYblauRbSo l4CfRyJAAXQs1bvN2SrJ17EA9+O2DfbWza88oMyCVgkkg/nbJQKYfuBD+e8ogujGgXD0 fy5g== 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=jbQac1OsvUgaCcgnMei8X0LoEMyKfWKfdnOch7VyTEw=; b=QQXeOl1dF3+UTSB28uqy9Uk9CZPWXbQVAdsyOK0HE7wIlZTJ+v4ByiZDpi4y6nM7iK JxfQd72PyhMHr4onw4bauUh8vbaAw+dzXbPuEMIIZZ82Dv/vR73ENhOll3fiwuHWe+b6 laHxont9nODcCzm99IZEB7low1getgautpcV2JDOdnLAlXRqV7q6T86UI7f2rtW7IXA8 M5sNXxY7oGxEhaV0YnTYs7bYUCU+vNK8hpv4LiKeaupN8hKdUVsB9K9dgHB06CBiVdw/ EnbDY9v34tZA1+STxM971vdaMgUE3lTw/AKYydO6JodEa/UPAaUaIfTNeT9kIOM8qGdr kNbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Pg5HNpmo; 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 d78si5762768pfb.1.2017.07.13.22.43.08; Thu, 13 Jul 2017 22:43:08 -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=Pg5HNpmo; 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 2A54F7824B; Fri, 14 Jul 2017 05:41:45 +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 705BA780CE for ; Fri, 14 Jul 2017 05:40:42 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id u62so9393679pgb.0 for ; Thu, 13 Jul 2017 22:40: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=Ao72C2I9nig5wD2/csojUj16FVXdXkKt6m+wZhI1o9s=; b=Pg5HNpmoeqbZN50ag6VZ6rNRl6bS21iB4gqpNzTuxSlrd8TccuJTQxOTDLpe0qMlfA uDcstcUositxIyc7aMx7QNnGEWca5A/T/zhX7k73vIQb+pSvy/Spr7EwUpeAqOSKLjH3 /1BjOCPNN9jRH4PY+mgAgSF8WpxHvO86yyQF0psmgwItfTYvr8Gg3HXf7oj2WbJ96yb6 MZDegUNa/R6MwZqWn7Tin7oYYA9QXUQWeK+PEm3WS07smHwplt+LiK9bXUyBkKEgQ3i5 3WoCOc0Ww7QduojdYeLknx6+0SCmMUX5hcG+4m8ouM32hsqZntMPJCGd8NcKQrmDW3kb 3ULA== 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=Ao72C2I9nig5wD2/csojUj16FVXdXkKt6m+wZhI1o9s=; b=RjYE3TMsWBmqKysOAkRIKcrKQ4zU+50Sgwnjj+xpxwJUaMqrZcescrDZlXEQxxcq2+ z25NaiYAv7LSKljES1IJQKrL65NtgevDjTnSrWUlb4rQ7YResF6v2JquGTPW0k0YK+YE 8bSpTDyBPOX7Pa59IM1bhcM2bedElnr/w7ClySHxj8YhyOF13vuxrHdX8dpEWhwdiKFZ vxwQjjXINSHmVOrJe0Q8Q38spw8vhSZEpf+k8Xal/ylPrY3qJnybfD1NJh81p4P905J/ ph7ZKvvvG+ZY+QTf0xCfxilrUWcNi02Y2klZQ1u1KLR+jS9MxKef9pPyDDIVeFlgi+M2 /cGQ== X-Gm-Message-State: AIVw1132BlgmQLYPHAKANdsIS7Mj1ZwBdLKtfGEjbxgWoXFxUZGD57Dw FrPIbaZa8NZRHP5o X-Received: by 10.99.104.10 with SMTP id d10mr12890653pgc.186.1500010843798; Thu, 13 Jul 2017 22:40:43 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:09 -0700 Message-Id: <20170714054013.34458-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 14/18] can-utils: Update to tip of master 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 Fixes build issues with musl Signed-off-by: Khem Raj --- meta-oe/recipes-extended/socketcan/can-utils_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 931e33289..a2d62c366 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=43;md5=390a2c9a3c5e3595a0 DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" -SRCREV = "67a2bdcd336e6becfa5784742e18c88dbeddc973" +SRCREV = "4c8fb05cb4d6ddcd67299008db54af423f86fd05" PV = "0.0+gitr${SRCPV}" From patchwork Fri Jul 14 05:40: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: 107731 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp455017qge; Thu, 13 Jul 2017 22:43:15 -0700 (PDT) X-Received: by 10.99.2.17 with SMTP id 17mr12908450pgc.264.1500010995523; Thu, 13 Jul 2017 22:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010995; cv=none; d=google.com; s=arc-20160816; b=sP5yG5/tC2/3kXsDQ4zQhDEw/yhwKlcfY3NRrHUIIWnC+JCCNKGDkSVz4IiVAw7veb +pulwmriSuTsvlLgaDry8IBVsn3klwAbn3268R0icssrkuWzrlSqiAmcBE1ja/Pi1hvU TuDNoLsCmOneZYU9abcfAqEHoOdZWzJUURjLGLsx92y76qnx8UyrMGjpbrMOb01T82As kXOUKU8JWTh2Wrhud2RjHhcIyVoJnd9zPgSryUEzmeIAzStXioWyAj36V+3AswSJMHD2 6/VsofR/h+t7DpcDMnZKpHGEGy6oQz0S4PYb2Tdo27XZXW90KCYiCaT/kVIeRY2qxTfc D9iA== 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=p3Tv5g9JuVSly/exdrR1cHAj2tm71KyYGoaLJav56xo=; b=KPHp+8eSfuJYiTDvQJgxGrviY/GhnUs9n+qYgaAQ+th2pKZSBlQN2u79UIWU0hhil5 /ljS5vSfeB9BbPJwj1U6iX7qCPi2zsMwZjDHH5qE83LJTHzDI7XmX1o3hxtALcfXy0Z4 LW4Z8kFMRcPeBGqdpUycspPqfUAH5sOu1Ii0GPNI2dBW0sCWZpvhUGJWSANE8y3z2fUY or++ysaAL2wLbVOS+HsIt76DvZC8f+ZdUkUdIX8IhSlnjHa/JklIVL4vkOC+2/3kiIiN n96GPub83c7AKtPIcz9h49PETI6NbcnVYLwNkHcBNTg0p/AaSgfBELgo7XNhu7hPryQ6 P3fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=DWC5WVPm; 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 o76si5607710pfg.332.2017.07.13.22.43.15; Thu, 13 Jul 2017 22:43:15 -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=DWC5WVPm; 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 3297E78250; Fri, 14 Jul 2017 05:41:46 +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 0FA24781CD for ; Fri, 14 Jul 2017 05:40:44 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id d193so9392844pgc.2 for ; Thu, 13 Jul 2017 22:40:45 -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=TFaaClM8GV/gPLF4MHZbbsbdcYVXbgofLc+JhvgK1lg=; b=DWC5WVPmSJHRzorGhRdMMiNyyD+1AewhkOS8nnqPDN/Cde0yUaGIjwEEZPq5+tvn+A TOM9QQLnwaQNZ6g6rGwx4khHNYNXfIAVS7ytIPo7YFVx66iyQYj/2Fg4fOBmmMPcPM10 VG2013S5Tx85U+qmuT24Fx8mRNcrExFmCIF09ZFGBSphQ2yCUBkKMEIfdI7RNuKO502N zkx5ARRFwGjOa8U4Pxfva0AgbEGOwMsWFIlmjfRfOkhQumq2+wa5I1mWyHQhMSqNmsMf EX281/dl8PHJhe3/HiXT623E0o2/bvHi3mt+EYvP+z0Rf39fhgNM2xFruOPvwlmRm9Hf 1Tkg== 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=TFaaClM8GV/gPLF4MHZbbsbdcYVXbgofLc+JhvgK1lg=; b=NkPi1KFsMI6Shj0Mxmg5QsYsVGEx4Fhz+dlKYvECULluuYGDlI2VkHB8DPrWNUmD+K KARCWyMH7tBSrb+PgPn0D+m7eS4NySmG14Ci6MYzheb3zLYIfZdRL3e9qec5rtjfNo7j HxUdhR7KckVXpnrGnQxzAy49QkCsDcDvucxTNHzCi4QLF2Ng+6dDJppShPctjCXp3IXz di8AYyyeg8CxsKUSgHtu9+zlh+Com6EK5LXwtWm2XJTD09s1tSDSGimcIld2yF89jYDa 5eh2OGb+b6ufL/noxfepnJ9OPOkE0WE2e+KTWD4EO0uVXsPhgbQODh99aNmsM2sSm7R2 5RHA== X-Gm-Message-State: AIVw113kldlgAyn2Fd9a9t8dlqO/H9N+tm1ZR0yEggVPzEFGsaBN1UZF +PpS4kEg9WOr8tmM X-Received: by 10.99.7.129 with SMTP id 123mr12591777pgh.171.1500010845340; Thu, 13 Jul 2017 22:40:45 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:44 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:10 -0700 Message-Id: <20170714054013.34458-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-initramfs][PATCH 15/18] kexec-tools-klibc: 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 --- ...he-order-of-headers-to-fix-build-for-musl.patch | 30 ++++++++++++++++++++++ .../kexec/kexec-tools-klibc_2.0.2.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch new file mode 100644 index 000000000..a7600b301 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch @@ -0,0 +1,30 @@ +From 86b962e7c0de43b20b6210d059e4855ce87078bc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 16:20:08 -0700 +Subject: [PATCH] Adjust the order of headers to fix build for musl + +Fixes +kexec/ifdown.c:33:16: error: storage size of 'ifc' isn't known + +Signed-off-by: Khem Raj +--- + kexec/ifdown.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kexec/ifdown.c b/kexec/ifdown.c +index 2215798..e13f777 100644 +--- a/kexec/ifdown.c ++++ b/kexec/ifdown.c +@@ -16,8 +16,8 @@ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 miquels@cistron.nl"; + #include + #include + +-#include + #include ++#include + + #define MAX_IFS 64 + +-- +2.13.2 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb index c9fec2542..49c53a3ea 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb @@ -20,6 +20,7 @@ SRC_URI += " \ file://sha256.patch \ file://sysconf_nrprocessors.patch \ file://fix-out-of-tree-build.patch \ + file://0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch \ " SRC_URI_append_arm = " file://arm_crashdump.patch" From patchwork Fri Jul 14 05:40: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: 107732 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp455117qge; Thu, 13 Jul 2017 22:43:23 -0700 (PDT) X-Received: by 10.99.56.21 with SMTP id f21mr12831527pga.235.1500011003204; Thu, 13 Jul 2017 22:43:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500011003; cv=none; d=google.com; s=arc-20160816; b=kaCVfp3nKfbV43y6UYuCT/eAQKkRSx6RkudCZu09bn/lgCZoUhpWO/Eb5jD7f6k0KR cVWXWXM/8soNzmYSAhuDVSklNzmfjwI6GsizzeJstZhuOHQOexmI7RqjpHXPvRh/vp3y KVS+yxP29wokTLcfkHH2+cpGPzXx8QeHqnG9vXX8EMXaakyXeTjxcV3jSaR2Oge0oG9l hNXvQNNnT8N51TTinoe9Hnuwaz2Z2yxLGDF7Zr22rwBHHvWj84ZWvxDy1xrkRxq/FfhQ TTPHWwTpNrpqQkwy/jlWoubXl9ImfYecJhizpblav09wJ4B2PW389qdwEJ2Efg5TFPTf gwEg== 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=MamPu4Ixax/d3qlPamj3GRuGXys0ZDlcdJvtBnj3Gpo=; b=cbYKSZRngBwE25HhqcDSdqtNRDkZsoiXpfQ8TIZ3E89Sebw2w5AyqtZrrUAjse17im puX+BvC/2baFl29QH8ItpiFQBFIc/V/2rAhDjBlisjQhiDwzroD5E3wENzmyN4U3WQVb AVt3QacBGjB3o61ZCIGGGhdvXSZPAegS677qzXOzNJEMQa9ioqs/dJiEEbXPe8ARF+6I atsTGb9NN1sIDqayMoEpoYQzhNXiym+W77MtiZknnDC7MCJ6GhwGkh/UQ0RBq1NVQ+pL 6exz/xV1MRL9W/57CeBqA6AfvU3eZpCHCCn8K40ERl7adPXeAlDePDTK1IKq05N8Z86K fD0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=M3RKlkxy; 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 g12si6166253plj.555.2017.07.13.22.43.22; Thu, 13 Jul 2017 22:43:23 -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=M3RKlkxy; 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 3EDE778254; Fri, 14 Jul 2017 05:41:47 +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 6CF9278152 for ; Fri, 14 Jul 2017 05:40:45 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id j186so9397089pge.1 for ; Thu, 13 Jul 2017 22:40: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=XvlLMqRHLjboD0CmTcx97WLvWdj6KdMhdcwT+J8YnHY=; b=M3RKlkxycaG88H8NS2e0BI38oj6CTMF9IYhjvJJFnFyFwKQAJdyjHfWXbU+2pbvJqt HZxQlw+7vgZT01DUQ8Lzsvfs37+vB5MbZ6+o+LRsxzdS+9cyIdZgDV7uBSSXJqfU+9DJ 2aKHam+pduG7hUBMkU8W/iFTLSNEfPDMhdpph5mJlfIDx53ax4wnO2Gx9lLhpDPDJYc+ SwmvXzF+qOjchwYBVXbzdITwi3+zA00QUSa+QTt8yx6JqOgB5kTtVq+7N5mp+cQlz85R xbVuk8Bswg2hojLhiQlm3RpcoOewh5vLO+IJsldbOQ5K/8EmFQ86Fdc2B4mrRrIeCJ2L wKhg== 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=XvlLMqRHLjboD0CmTcx97WLvWdj6KdMhdcwT+J8YnHY=; b=O38lMSq1TQtHT9iwM3pKPSqM8tsSy8oBXmPq5YLhosF6SKs53uGql3GosMy8Pa1uIv oNfIjXQhLlomWBikJ+OQdwTVnJReKfYVm0YYSmo4cW95CG1xc7OommRhdu342A/23lDp ag6Vm2iyQ9RsOdhjhiqpbYpO05eugkJ/HF9BsY0SmwhAxPZ1JNaFu11DjoGfy/Z0NSFo NfBKe47HuEJYGZ2F8Ekzt+5oFA4/XKgDW48nDydQi5wsCg329ki7MrvCQkOkA9DtfQGW ZHOpQrmKlFKqqAvmHlb8MGraie14x/mL2QUck56AAhWDioGDP8XuOUKdVpTbB2jtsgkK gpGw== X-Gm-Message-State: AIVw113TL7oZqz8uYOdoI0+EQUsPva3GKk+FcT0x+oOnsroN/fNNtSKO SF9eiChD269f+Ele X-Received: by 10.101.72.130 with SMTP id n2mr12908926pgs.198.1500010846747; Thu, 13 Jul 2017 22:40:46 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:45 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:11 -0700 Message-Id: <20170714054013.34458-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-initramfs][PATCH 16/18] dracut: Upgrade to 045 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 while here Signed-off-by: Khem Raj --- ...-util.h-include-sys-reg.h-when-libc-glibc.patch | 33 ++++++++++++++++++++++ .../recipes-devtools/dracut/dracut_git.bb | 19 +++++++++---- 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch new file mode 100644 index 000000000..32714038b --- /dev/null +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch @@ -0,0 +1,33 @@ +From 06011ce55b1e892e863568a73d64eebc6389544f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 17:14:05 -0700 +Subject: [PATCH] util.h: include when libc != glibc + +For musl libc it is required to include to +have __WORDSIZE defined to e.g. 32 for arm*-musl. + +Taken from void-linux +https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dracut/patches/musl-__wordsize.patch + +Signed-off-by: Khem Raj +--- + install/util.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/install/util.h b/install/util.h +index 2ad3254d..062626ec 100644 +--- a/install/util.h ++++ b/install/util.h +@@ -36,6 +36,9 @@ + #include + #include + #include ++#if !defined(__GLIBC__) ++#include ++#endif + + #include "macro.h" + +-- +2.13.2 + diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index b91f3fae2..09c86d0b7 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -5,13 +5,18 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -PV = "044+git${SRCREV}" +PV = "045+git${SRCREV}" -# v044 tag -SRCREV = "1bc3e733f96033a508841e97fe08da7a12851782" -SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http" +# v045 tag +SRCREV = "39c9b67f86145953aa30def9d77c68597a4ccfe8" +SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ + file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ + " -inherit bash-completion +DEPENDS += "kmod" +DEPENDS_append_libc-musl = " fts" + +inherit bash-completion pkgconfig S = "${WORKDIR}/git" @@ -30,7 +35,9 @@ EXTRA_OECONF = "--prefix=${prefix} \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd" -EXTRA_OEMAKE += 'libdir=${prefix}/lib' +EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"' + +LDLIBS_append_libc-musl = " -lfts" do_configure() { ./configure ${EXTRA_OECONF} From patchwork Fri Jul 14 05:40: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: 107733 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp455226qge; Thu, 13 Jul 2017 22:43:30 -0700 (PDT) X-Received: by 10.84.128.102 with SMTP id 93mr14242846pla.21.1500011010503; Thu, 13 Jul 2017 22:43:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500011010; cv=none; d=google.com; s=arc-20160816; b=NuQpSyvnbRL8hWUEW+/CyoPQcPFaR6oYU5maHD6W3Igxm32MX5+yk2NAEfTBNPMjeH lXvnl9LWSazHzP+y/2ebL17zcPFH2ZmZhXtM0HGOa4xKDu+W1Zc7MW0dv/3WvB10+R+V iuBdQIQXTXQL9bmXHKvZ8xt57IqyCLsJXX3cKofAknw/9VmR02qNjX0HZZBD3z7jCR/h F3jVKuHVT23/3F2c9Bcb3zHl5ndWxP2GZbX/vHHNJJP4LpTsAxkcwXhh44fahWUNdiu2 nruui3Odxghmw315mJxXRQ2rNjMT6NsTuQZZHVErAbylJ0FPThjgAeVIge/rTropzT3h UIgg== 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=yDi6F4ct44FaFSC50Hrb4dteRH7eYAzofnbPJvNuG9I=; b=03XqniSWVwGv83HxBgyVo6Bqc5laapE7Eny9S7htQbbU4NtEfeLl47pFee+pr6zw45 51bUK3Nn8ElFQRPWK+Qe/6dDXRNZs46xlvREGMJoLL3o02pgxcpCgoJPNfqEnLwfI/l4 Q+5KfLq7+xbefvan7zYXnoLvNUi3TX0wnuchq6wDrtV/uLxaVcBptwukXx9G5hIoGxKu 81nN6Zy81uFZzTi+JPNcdehh4w2AKcug7MxTGfK7oj6JOe8LFBmhx1toue4vI8zJuA0M z0aN+DnYsCBStPmrryCFWXHVnzG/LH0FSzlMtyu3oC8PkjmBKCEQp2336FUsNEDqLmiZ ybUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=XJuXY9hE; 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 l63si6058546plb.494.2017.07.13.22.43.30; Thu, 13 Jul 2017 22:43:30 -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=XJuXY9hE; 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 47AFE78259; Fri, 14 Jul 2017 05:41:48 +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 E8F3F781F3 for ; Fri, 14 Jul 2017 05:40:46 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id u62so9393866pgb.0 for ; Thu, 13 Jul 2017 22:40: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=SP9UWhhRem51aMxVI1kwzQE//QcAkCmcNJnh5GmD9f8=; b=XJuXY9hEqolo7d1Ps8qlE6p2lrgDK5np5fGW+dlcsLPxbeE3Oc4hI9amY0vdttjeq4 aFELzcpOiwCVeA/ba7I7NjekJZPlhdwpP1hr5mgXU5LlS79lijpciekrs0XjecC/b0Kk HPS3YHKLxlqw1Qxird5K2LrqbJT48a/iUVBsq9pJnlsuQKqwO/rjZ4/bR2EP4HCTQtl+ C92WkIZAZw9zh5tO9Enu2R8TrW/4klCEOGKipXm0agmIp5rQim33fdjF5jqzHGi2TacU ByMIwQ6kCopuChVQqQQGJMIIDPRyrRTsnYA9bZ+Hd+ttdAPILV+vu5yGdseJGiIeS3Ob oEsQ== 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=SP9UWhhRem51aMxVI1kwzQE//QcAkCmcNJnh5GmD9f8=; b=n6em+o+2HRh5HFRPus7hRmVfy8aX0RL0NGNjuyQrA0YfX4jQAHoAtYOcRxA8XTcqtB R08uovKdnjEkCxRnZkGwnSQoBCOiC2ylD/CsqAoLNIVAFW/OLWhh4Swv8BIzwl9BLC6H t65P4wWYKAdaO0ZBuufln+pMUyK+aaGlDNdZSbYSaIiIFRnOEB5sEVgLR4iio/t9qn35 yFzgCxBnnMu43e9Jbkc5ikWBMqxphdG8GBTJru/lvreptCQ5TfUodoqSpMkeUvgdZM5X JwPIkO5wXGZDQBApA+uvQF9dKUMbOJfnY4MOzPciuLsnoFbH5fU9ku/sgDQfgnv7bXv4 k0Nw== X-Gm-Message-State: AIVw110b2St9ZOapuZsztJltcauoa8hex9iiNYglrj58gI1sNoq07ATf j3t/p9OxLsWU8Y4u X-Received: by 10.99.97.4 with SMTP id v4mr13150832pgb.254.1500010848218; Thu, 13 Jul 2017 22:40:48 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:12 -0700 Message-Id: <20170714054013.34458-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH 17/18] yaffs2-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-define-loff_t-if-not-already-defined.patch | 30 ++++++++++++++++++++++ .../recipes-filesystems/yaffs2/yaffs2-utils_git.bb | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch new file mode 100644 index 000000000..df202c855 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch @@ -0,0 +1,30 @@ +From 848717da4a28d33f8aa8f889377e61e6b1b8ae67 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 18:29:52 -0700 +Subject: [PATCH] define loff_t if not already defined + +Helps to build with musl + +Signed-off-by: Khem Raj +--- + yaffs_guts.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/yaffs_guts.h b/yaffs_guts.h +index 6bcf12d..4af17ce 100644 +--- a/yaffs_guts.h ++++ b/yaffs_guts.h +@@ -18,6 +18,10 @@ + + #include "yportenv.h" + ++#ifndef loff_t ++#define loff_t off_t ++#endif ++ + #define YAFFS_OK 1 + #define YAFFS_FAIL 0 + +-- +2.13.2 + diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index e8d187389..67c926b2c 100644 --- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -14,7 +14,8 @@ DEPENDS = "mtd-utils" # Source is the HEAD of master branch at the time of writing this recipe SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \ file://makefile-add-ldflags.patch \ - " + file://0001-define-loff_t-if-not-already-defined.patch \ + " SRCREV = "bc76682d93955cfb33051beb503ad9f8a5450578" S = "${WORKDIR}/git" From patchwork Fri Jul 14 05:40: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: 107734 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp455308qge; Thu, 13 Jul 2017 22:43:38 -0700 (PDT) X-Received: by 10.99.9.67 with SMTP id 64mr12972810pgj.12.1500011018713; Thu, 13 Jul 2017 22:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500011018; cv=none; d=google.com; s=arc-20160816; b=KsU36po0tPgLFl1XfdeJLcPk/OesOb//nKHLhWsjR2eOUIZdmP4f4sEgr3GBp+xexy nJm9PLDQjPEwaZD5bgarQtQRPOg0SGebIBpEjTmX5EtCRCPZFlazEx3ZABI+nTJJ+8jk yZSawI2MSAg1YEd9Qi6mV7J3RDLBi4XKPKpwQAl3S6hKgpViVLH9kQS21M4dXwkbb8e3 b1q1dQ1sCrRaezOiMabhNq85MOEf9zV1KQIfdoCRbKDpDWioUaKTcxjFzIsEZiatVqzs SoNvW6MU8R6nGYIQS0cCy+kLi+YYF0fvm6PEgW6kDgQEP7DMz7Bqa3sByGxwx2XUvfTq czGA== 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=N4b8HyVbmn6I5G7Kf2BOqcMpEY1FE5JSHD//WxZ5zM0=; b=x+9iPytw6urVWEwFhpb0UA3c4svJ8r6Mgdt4G+g/8/UoGYSUZdKFE0sLaRYzPmQQSP nxygm1/t41qo6muOwiGDyJ7AzSEEH99pIQjcALtNHdXb0xxbKYDXgpQo74KomD5QsK2n vkEcJxNpRsY+jG50Jlec6Jt/ujV7dNbGaSqxU+rGDwf4DkeBVcZN1srOVtcx9PkRejkP AcuXzfHJT5HsdUI6Oj10V+5DlrnczYVPeBvbFBqbxb6++0QgUHc+E44+FbP8Trel4YwT hZmaSW0UjktR/N30pagxIMAFQvcXaZfwxAtYyNeDANnXyXC0hegdWpYODoOJx7kcG2IH FbUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=JCIBZTjC; 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 v22si5798442pgn.308.2017.07.13.22.43.38; Thu, 13 Jul 2017 22:43:38 -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=JCIBZTjC; 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 7DD7F78261; Fri, 14 Jul 2017 05:41:49 +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 514B7781F4 for ; Fri, 14 Jul 2017 05:40:48 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id y129so9411338pgy.3 for ; Thu, 13 Jul 2017 22:40:50 -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=VKt5KuYM61vHP90buV3ESWm2W5tkcILdviZ2tfEzzPY=; b=JCIBZTjCJmULC8PtGBMJjPNpt0D8HObV6Qp1+psMmE7yH42jHsD5aEWil5h4Cw8xNE GFngSPFODnlyqw1psheBNMdj3SIwYM/bJZ8lUEXEh8Jphe6qQNwH4QSDA1H4rAm02xoa 2MOVPV7nIQnx4B6JOYI2udSyDQnhwPDZGpCZHJVJML6OnQ1ufazEuupoOgPGyYFuOLxj EG7StobTpfUl+3M9WDAvWTaXeKamdJA7WXYUKlswX4fjxL49uMBz14YoQ0eLBnXUrDui VJylA3XQE/fPzqPyf8wOyfezE0uJAxykGaQnTeEDKwf6fhcrJ7HN5JfVLo/X2IikqCcx L6MQ== 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=VKt5KuYM61vHP90buV3ESWm2W5tkcILdviZ2tfEzzPY=; b=Sks4ibKxLMd1czX6a3bWDJnMeUIf32sXsXOUGMiSXZ4Iqd7+p8DOXtZhClbGJo4Ey3 bNwA2ZXOgtV616TMX1trvVt71N5170YZIBHX6sb1kasX2UTQ9QsW7egUSiABKV+Pc6zb X6c6qf15qYTeW7yS93Vk1EHHAEAjEyRUVuDrDDcACb+Hvwz8aApDjBrCsk0gUdtXm2ab DgXrRRR9lxu/oR4ywIqXxglXEKNHOwbEvuyXhqcBKmSI2rXsyXhTDEjUqqw5zjRDEq7U PodyrhGP9NjA4sVbfK3lgRJZJxQ365afppfadqG5n035xz5Zqi+N/WqpWL+RegdBbHWJ nTjw== X-Gm-Message-State: AIVw113/8BPeuO4cuAdRLyE7wNDGdXX/XcXFUmoSCwHX+sO3eZDMB+Z3 r9AXbypxHhYAETLO X-Received: by 10.99.123.28 with SMTP id w28mr13052668pgc.183.1500010849580; Thu, 13 Jul 2017 22:40:49 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:48 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:13 -0700 Message-Id: <20170714054013.34458-18-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH 18/18] logfsprogs: Rename setkey API to _setkey to not conflict with libc 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 --- ...-conflicts-with-libc-namespace-about-setk.patch | 135 +++++++++++++++++++++ .../logfsprogs/logfsprogs_git.bb | 3 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch new file mode 100644 index 000000000..dbf7ae016 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch @@ -0,0 +1,135 @@ +From 5a8e26157d9642f022587cc1ca7525213c7a5379 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 18:41:53 -0700 +Subject: [PATCH] btree: Avoid conflicts with libc namespace about setkey() + +This issue is highlighted with musl mainly because the +function signature from stdlib.h does not match the local +static function + +Signed-off-by: Khem Raj +--- + btree.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/btree.c b/btree.c +index eddc33b..dd3fef9 100644 +--- a/btree.c ++++ b/btree.c +@@ -123,7 +123,7 @@ static unsigned long bval(struct btree_geo *geo, unsigned long *node, int n) + return node[geo->no_pairs * geo->keylen + n]; + } + +-static void setkey(struct btree_geo *geo, unsigned long *node, ++static void _setkey(struct btree_geo *geo, unsigned long *node, + unsigned long *key, int n) + { + longcpy(bkey(geo, node, n), key, geo->keylen); +@@ -292,7 +292,7 @@ static unsigned long *find_level(struct btree_head *head, struct btree_geo *geo, + /* FIXME: If the right-most key on higher levels is + * always zero, this wouldn't be necessary. */ + i--; +- setkey(geo, node, key, i); ++ _setkey(geo, node, key, i); + } + BUG_ON(i < 0); + node = (unsigned long *)bval(geo, node, i); +@@ -311,7 +311,7 @@ static int btree_grow(struct btree_head *head, struct btree_geo *geo) + return -ENOMEM; + if (head->node) { + fill = getfill(geo, head->node, 0); +- setkey(geo, node, bkey(geo, head->node, fill - 1), 0); ++ _setkey(geo, node, bkey(geo, head->node, fill - 1), 0); + setval(geo, node, (unsigned long)head->node, 0); + } + head->node = node; +@@ -342,16 +342,16 @@ static void steal_l(struct btree_head *head, struct btree_geo *geo, int level, + + for (i = rfill - 1; i >= 0; i--) { + /* Shift entries on the right */ +- setkey(geo, right, bkey(geo, right, i), i + no_entries); ++ _setkey(geo, right, bkey(geo, right, i), i + no_entries); + setval(geo, right, bval(geo, right, i), i + no_entries); + } + for (i = 0; i < no_entries; i++) { + /* Move some entries to the right */ +- setkey(geo, right, bkey(geo, left, lfill - no_entries + i), i); ++ _setkey(geo, right, bkey(geo, left, lfill - no_entries + i), i); + setval(geo, right, bval(geo, left, lfill - no_entries + i), i); + } + /* Set parent key */ +- setkey(geo, parent, bkey(geo, left, lfill - no_entries - 1), lpos); ++ _setkey(geo, parent, bkey(geo, left, lfill - no_entries - 1), lpos); + for (i = lfill - no_entries; i < lfill; i++) + clearpair(geo, left, i); + } +@@ -366,14 +366,14 @@ static void steal_r(struct btree_head *head, struct btree_geo *geo, int level, + + for (i = 0; i < no_entries; i++) { + /* Move some entries to the left */ +- setkey(geo, left, bkey(geo, right, i), lfill + i); ++ _setkey(geo, left, bkey(geo, right, i), lfill + i); + setval(geo, left, bval(geo, right, i), lfill + i); + } + /* Set parent key */ +- setkey(geo, parent, bkey(geo, right, no_entries - 1), lpos); ++ _setkey(geo, parent, bkey(geo, right, no_entries - 1), lpos); + /* Shift entries on the right */ + for ( ; i < rfill; i++) { +- setkey(geo, right, bkey(geo, right, i), i - no_entries); ++ _setkey(geo, right, bkey(geo, right, i), i - no_entries); + setval(geo, right, bval(geo, right, i), i - no_entries); + } + for (i = rfill - no_entries; i < rfill; i++) +@@ -399,14 +399,14 @@ static int split(struct btree_head *head, struct btree_geo *geo, + return err; + } + for (i = 0; i < fill / 2; i++) { +- setkey(geo, new, bkey(geo, node, i), i); ++ _setkey(geo, new, bkey(geo, node, i), i); + setval(geo, new, bval(geo, node, i), i); +- setkey(geo, node, bkey(geo, node, i + fill / 2), i); ++ _setkey(geo, node, bkey(geo, node, i + fill / 2), i); + setval(geo, node, bval(geo, node, i + fill / 2), i); + clearpair(geo, node, i + fill / 2); + } + if (fill & 1) { +- setkey(geo, node, bkey(geo, node, fill - 1), i); ++ _setkey(geo, node, bkey(geo, node, fill - 1), i); + setval(geo, node, bval(geo, node, fill - 1), i); + clearpair(geo, node, fill - 1); + } +@@ -487,10 +487,10 @@ retry: + + /* shift and insert */ + for (i = fill; i > pos; i--) { +- setkey(geo, node, bkey(geo, node, i - 1), i); ++ _setkey(geo, node, bkey(geo, node, i - 1), i); + setval(geo, node, bval(geo, node, i - 1), i); + } +- setkey(geo, node, key, pos); ++ _setkey(geo, node, key, pos); + setval(geo, node, val, pos); + + return 0; +@@ -513,7 +513,7 @@ static void merge(struct btree_head *head, struct btree_geo *geo, int level, + + for (i = 0; i < rfill; i++) { + /* Move all entries to the left */ +- setkey(geo, left, bkey(geo, right, i), lfill + i); ++ _setkey(geo, left, bkey(geo, right, i), lfill + i); + setval(geo, left, bval(geo, right, i), lfill + i); + } + /* Exchange left and right child in parent */ +@@ -615,7 +615,7 @@ static void *btree_remove_level(struct btree_head *head, struct btree_geo *geo, + + /* remove and shift */ + for (i = pos; i < fill - 1; i++) { +- setkey(geo, node, bkey(geo, node, i + 1), i); ++ _setkey(geo, node, bkey(geo, node, i + 1), i); + setval(geo, node, bval(geo, node, i + 1), i); + } + clearpair(geo, node, fill - 1); +-- +2.13.2 + diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index c41f0eaa6..1b4d97d76 100644 --- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb @@ -13,7 +13,8 @@ DEPENDS = "zlib" SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \ file://0001-Add-LDFLAGS-to-linker-cmdline.patch \ -" + file://0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch \ + " SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" S = "${WORKDIR}/git"