From patchwork Mon Apr 30 14:14:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 134704 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp3820299lji; Mon, 30 Apr 2018 07:15:12 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoLdTP3E5w8SrysIkF1m1+vUoNwG7vxEekFrXmada8DaaOc3XhX3SLOaLzqunhin02mEWy2 X-Received: by 2002:a17:902:294a:: with SMTP id g68-v6mr12731771plb.110.1525097712747; Mon, 30 Apr 2018 07:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525097712; cv=none; d=google.com; s=arc-20160816; b=UqsAnVCD82ozFKzXTmPRnNu9a9bVB0OdWXsNnrL3f5sh/hXoETtcpl/gwtxfCpHxVd DVL88qzv2CztWOfAKz1qHX3fZGEPQ1prmBgS0ClX8PpNdWirX8DbYwVeAiH1oi7n1Kqn NkfVR5t/7qYM5ob4llsi3OCT7uMoCQ8wx3empTcxCBTz2PZLpra6xdbf+9zHxMYCxS7S vLp5i4e08e2pq3Y+2DNDZp2PZfBeQiqyWKFgEVatO2Xl8pCR8mFMGiUwHgzkddQO1YWV oTZVGdZ8b+e/RQ3LC+wO/sbbbenkF3zSVLnBCTMUx7+RqJKCb6vtzApTPpSxpiVhhAxr 92yw== 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=sDqf7r5NvUjRmxd7xLHFuMpKeNlDx+OwXmhNynKeYzQ=; b=D+tmWE4goFEPyxBpwZfTdBAkgipQWrrdIVudnOwZvFIvT5q6//Vt3yNB5UA2cMYIhq dBNWTulu+k2KiHLBtQqEXR3pvW49qkNb320baiZcV/p78/g0s0/yDWhr6+cVuK9rFlcY 27F/KhQLoqiJ35dQj6DLGu0R75rArqhbTc/Qh7NYj+DXl+Cc29cuVNhMWc3kf6Uypawt XlCQ3oUN1QB/r3/fNncjaucNNWlCojEztwPL4bYZk7AlSxOaFKjxwgZNivETiGyjMzwP 3aMZWVCjdak+EVTHe3YQVQGY1hGftDaXTm0kz5lZzYM3EGPCUWc6+DEKYfCiZWLL3VDX 8q8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=e/2/tCNn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y8-v6si6175976pgp.527.2018.04.30.07.15.12; Mon, 30 Apr 2018 07:15:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=e/2/tCNn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 97E2571D79; Mon, 30 Apr 2018 14:15:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id 5CB4E6011F for ; Mon, 30 Apr 2018 14:14:59 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id f15so6848866pfn.0 for ; Mon, 30 Apr 2018 07:15:01 -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=q+/KYeW1Dzw7V++BUU1meha0JXDuFNIF/nOxZY7iUNg=; b=e/2/tCNnUsg8gW/wBbLPGyLk/AEqM8hW0AYElt/Xi+L+7xtVrHYjDemQzNjHj1XJcy VtDdd3wNzr5GBFhMUedm+cQlfBqI3kUy6kHB//w0vez3535gmbS8CtWEqVd2mUcFQiCK h2MG8pGXL/8w905P1z/u05kp5gzOM/P5BgpPBOcnPu6vL+kuC+GiJ0mtxFGdvTHb3gpj ZZtArroOqQMyPeP+/ani5GUqbxNEFAuUG/w0lZLpsW8+1nBHDI2AdD3CWT0MLgElP/fV IhjR8Smy5OoEzWvzeBGfks5JcC8Zp8il+5059pwHvJJVN5v2swwF6Ey45eL0BzLMhJlF WHFw== 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=q+/KYeW1Dzw7V++BUU1meha0JXDuFNIF/nOxZY7iUNg=; b=gyTqy0B1GaGhO9Fn88UVP88t8/Rb1snEQY/4Nc3JqJ+Gm/g0/+PKHW70SETZ4jzxfs rPUyBVSKfIAtMvcoIi+49IOA8UhmQXRsJJSYPhsDMltu+gRaKOQDB1wVwYxXBo3Ys52K Es7Dv33a7KEGfCE1cqfh/zeTMWxiW7J3CDtMMQWF3Q2lU6Qz+8PyPksCsfycMXohfhsK O+Toi3tX6EW3lwNMaFvehZX/HX9yVaJmCn34vzP7cBqDEMeLCNoWALxW1G/gdudw7NhW Sgc+82KpDDWerv4+HgMDAusJLfiHfgXbmHmHgzZOXZQp2QvN0OT1WyYmEbontuR+kycG 1RWg== X-Gm-Message-State: ALQs6tAnxh/xIVcgNtq+NxYVY90RGfQaHjOtSqs5VQdVolZs1byDSYXi u3vKSg0ELGaNv4/EsOgxt1UqVA== X-Received: by 10.98.196.19 with SMTP id y19mr12177917pff.97.1525097700803; Mon, 30 Apr 2018 07:15:00 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b72sm15781621pfm.69.2018.04.30.07.15.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Apr 2018 07:15:00 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 30 Apr 2018 07:14:54 -0700 Message-Id: <20180430141455.2248-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430141455.2248-1-raj.khem@gmail.com> References: <20180430141455.2248-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH V2 08/25] alsa-tools: Update to 1.1.6 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org License-Update: FSF address updated in hdsploader/COPYING and ld10k1/COPYING.LIB Fix built with clang along the way Package python dependent tools into a separate package Signed-off-by: Khem Raj --- ...served-user-defined-literal-warnings.patch | 28 +++++++++++++ .../alsa/alsa-tools/autotools.patch | 42 ++++++++++++------- ...lsa-tools_1.1.5.bb => alsa-tools_1.1.6.bb} | 25 ++++++++--- 3 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch rename meta/recipes-multimedia/alsa/{alsa-tools_1.1.5.bb => alsa-tools_1.1.6.bb} (62%) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch new file mode 100644 index 0000000000..2290915eab --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch @@ -0,0 +1,28 @@ +From 2e48e4045e1e951433da0ca4b1e49798eedde14f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 24 Apr 2018 12:21:18 -0700 +Subject: [PATCH] Fix clang -Wreserved-user-defined-literal warnings + +| us428control.cc:66:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] +| printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); +| ^ + +Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10360805/] +Signed-off-by: Khem Raj +--- + us428control/us428control.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/us428control/us428control.cc b/us428control/us428control.cc +index e839bf4..8cb3c42 100644 +--- a/us428control/us428control.cc ++++ b/us428control/us428control.cc +@@ -63,7 +63,7 @@ static void usage(void) + { + printf("Tascam US-428 Control\n"); + printf("version %s\n", VERSION); +- printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); ++ printf("usage: " PROGNAME " [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); + printf("mode is one of (us224, us428, mixxx)\n"); + } + /* diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index 2e74963c89..c85834a593 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -1,3 +1,8 @@ +From b9a65bf3ba5628cfe8cfd2d10ce2dcf11a606775 Mon Sep 17 00:00:00 2001 +From: Dongxiao Xu +Date: Thu, 14 Jul 2011 15:40:36 +0800 +Subject: [PATCH] alsa-tools: Fix recipe build error. + Add parameters to autoreconf to support cross compile. Remove some sub-components which needs further recipe support. @@ -5,22 +10,17 @@ Signed-off-by: Dongxiao Xu Upstream-Status: Inappropriate [configuration] -diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile ---- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800 -+++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800 -@@ -1,6 +1,6 @@ - #!/bin/bash - --autoreconf -fi || exit 1 -+autoreconf $ACLOCAL_FLAGS -fi || exit 1 - export CFLAGS='-O2 -Wall -pipe -g' - echo "CFLAGS=$CFLAGS" - echo "./configure $@" -diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile ---- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 -+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 +--- + Makefile | 4 ++-- + ld10k1/gitcompile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index c32bf25..1119372 100644 +--- a/Makefile ++++ b/Makefile @@ -1,8 +1,8 @@ - VERSION = 1.1.5 + VERSION = 1.1.6 TOP = . -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ +SUBDIRS = as10k1 envy24control \ @@ -30,3 +30,15 @@ diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile hwmixvolume hdajackretask hda-verb hdajacksensetest all: +diff --git a/ld10k1/gitcompile b/ld10k1/gitcompile +index 99429ac..20005d9 100755 +--- a/ld10k1/gitcompile ++++ b/ld10k1/gitcompile +@@ -1,6 +1,6 @@ + #!/bin/bash + +-autoreconf -fi || exit 1 ++autoreconf $ACLOCAL_FLAGS -fi || exit 1 + export CFLAGS='-O2 -Wall -pipe -g' + echo "CFLAGS=$CFLAGS" + echo "./configure $@" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb similarity index 62% rename from meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb rename to meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb index 1be43aa6e7..e065eec6b8 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb @@ -5,17 +5,19 @@ SECTION = "console/utils" LICENSE = "GPLv2 & LGPLv2+" DEPENDS = "alsa-lib ncurses glib-2.0" -LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ + " SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ file://autotools.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \ file://gitcompile_hdajacksensetest \ + file://0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch \ " -SRC_URI[md5sum] = "3afb92eb1b4f2edc8691498e57c3ec78" -SRC_URI[sha256sum] = "bc3c6567de835223ee7d69487b8c22fb395a2e8c613341b0c96e6a5f6a2bd534" +SRC_URI[md5sum] = "5ca8c9437ae779997cd62fb2815fef19" +SRC_URI[sha256sum] = "d69c4dc2fb641a974d9903e9eb78c94cb0c7ac6c45bae664f0c9d6c0a1593227" inherit autotools-brokensep pkgconfig @@ -37,4 +39,17 @@ do_compile_prepend () { cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile } -FILES_${PN} += "${datadir}/ld10k1" +do_install_append() { + sed -i -e "s|/usr/bin/python2|/usr/bin/env python2|g" ${D}${bindir}/hwmixvolume +} + +PACKAGES =+ "${PN}-hwmixvolume" + +FILES_${PN}-hwmixvolume = "${bindir}/hwmixvolume" + +FILES_${PN} += "${datadir}/ld10k1 \ + ${datadir}/icons/hicolor \ + " + +RDEPENDS_${PN}-hwmixvolume += "python" + From patchwork Mon Apr 30 14:14:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 134705 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp3820404lji; Mon, 30 Apr 2018 07:15:18 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoXQDzIu+oQhFKQAIA8wGGLsa5H+6TXGjBRNCoRXGC/7mYxYZr5pZn9oi7C0RpsLYM7HCkv X-Received: by 2002:a17:902:f83:: with SMTP id 3-v6mr12550127plz.336.1525097718483; Mon, 30 Apr 2018 07:15:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525097718; cv=none; d=google.com; s=arc-20160816; b=HwAlLZeWfeCukJzlBATMzy5Me8KhyfGL3VlrwyVfH6R1+pMImwlAtOqq8gRhj8Ec3Q 4+FWqdnUgVf6hUNcVrtgPHKpG0cILeHxnz4yhzOTEXpA+BCV4hDanJkdHuYM34yyoEP6 rIBdIaGTEcd+6HIbp0EUfb5XPOVFXuvX+TuOXx/JX53Yl/7pfvoH4ET9rBNr7QRBu2Fi N2+oBHmb5WXbIFniDj46jFGtnzuGqaU1IWH55qYO4DDB8aKOTzk36M7mgXHKIv4rFThj foQb4MhFiTwWXy/xYxnnpI6EMa/o5r7wNIRvTo8Y92ZakK/+li3F45Z/WUqay7gHW25N 2R4g== 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=tyIwLexTGREHj5e2YY7l4Yvv7Ox4Mt9W16sccXYBXYU=; b=SVPIL9xeCYP9LscnJVXQPRXopkmtuW5xZsSupuxmhZoZuMGsVTQ1quKnMEpx9frGUH EtPykULZXSWHLMcW+zo6cdZjWweRHxY5Apderh/pIacOF2I7Ir3Os4qU4YmAaXKraVm2 l8e+iTTKf3swDOaLkAKoz4VEl1meIyPaiUj+hWofyD+j3mxL2mZzrBYkMOqvJHO/Bv6W 3EG/kJBPloD2ufwjou/TvypRZJSasTYATjigFaZTd0ZLOUZMG/jirxbn8MyqAHcwlL1f 8vRa4Ykz0ZlGlfCINvJYEeUdWfPN1DHec7Q5hUjWS365i9z1q01Wl16iiGI5yAEvCq/y Sakg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KHmueqo0; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p11si7534358pfj.294.2018.04.30.07.15.18; Mon, 30 Apr 2018 07:15:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KHmueqo0; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B14F87449D; Mon, 30 Apr 2018 14:15:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@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 EFBE76011F for ; Mon, 30 Apr 2018 14:15:00 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id o76so6840550pfi.5 for ; Mon, 30 Apr 2018 07:15:02 -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=d8hyZq2XIny9ZJmGD8ST85K0JV0sXnv/iNyDtlRMSOw=; b=KHmueqo02uWL/h0FYwYMmZz4tIqPmyniDuKpJdyEIlqytZkLbkG3Kv8sZ/n8IuyMVl cPOPGT6mzPbjbWJ/MttNeAOiwOn+VqdfdOArw82AdpZlcYBDt1/zs29FLpiR3cnd4xe4 Heexb/bT1z2SVp1IXmG6mPDSbSHi/xIdTRVgRoLauPgjhsklwaUj1+t444mDnQ2Y92Ke AwBGD+9wwiA0WWcciBKSIAdU95yRixs7+MFWo71k3Divx2KmqGNLzlJfK+w/YkLrUroN Une1crFJ9Ah+SBgbS//ZnZ4v8uZvavW21dIPUcz3wGKexX8KH+pRfZegmokqm7CIRCnr Xnlg== 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=d8hyZq2XIny9ZJmGD8ST85K0JV0sXnv/iNyDtlRMSOw=; b=mav9i+yBq13jxvliLI4H6N1nTx0oiIkQZ6QzFOM+7deoM5jx2MiQyrnffR3yqvRxhH CRsUJFpa1WiOdYf0FD/7R9YplSNlQdGBW49QfxMRm/TpICOvlI/NSUMENWXt2X1M+2oQ JHbrEP7OUH6ASSCHedAFW8M9JEsBigDqYB/jqcI3YHddTCcfmuidzs8vFg6lWieOLCsw TKhjuaZ1PvTT3Q7gPCUVMiD5He25U8yV4NMqdQhR70gArM3gIwnFYgklysVDECRZzbrs EsEym0goCF0m6Y4k4LO1beH8UGHKt1d9uSoNXzCu/eGlMFPR5PbLM/kiNZDkNz9MHQ64 mqJQ== X-Gm-Message-State: ALQs6tB3V9t6ivqpI4vy3ED/yIsWcF8feUlkWlOP4AYmYfTJgwOyrYn/ AQCyXZW17mSkCWfoENCDW4c2KQ== X-Received: by 10.98.141.201 with SMTP id p70mr12139425pfk.72.1525097701560; Mon, 30 Apr 2018 07:15:01 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b72sm15781621pfm.69.2018.04.30.07.15.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Apr 2018 07:15:01 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 30 Apr 2018 07:14:55 -0700 Message-Id: <20180430141455.2248-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430141455.2248-1-raj.khem@gmail.com> References: <20180430141455.2248-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH V2 10/25] ruby: Upgrade to 2.5.1 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org License Update: https://github.com/ruby/ruby/commit/322d0d93adfe42fc89c574f67bcb9acb9b82f251#diff-c53151ffd180a17416e8f09b1ca4bfc3 Signed-off-by: Khem Raj --- meta/recipes-devtools/ruby/ruby.inc | 11 +++++------ .../ruby/{ruby_2.5.0.bb => ruby_2.5.1.bb} | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta/recipes-devtools/ruby/{ruby_2.5.0.bb => ruby_2.5.1.bb} (90%) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index fd3911ba75..a366e93f66 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -7,12 +7,11 @@ It is simple, straight-forward, and extensible. \ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD | GPLv2" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ - file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ - file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=8f871f3f03732c018a5fa9b185958231 \ -" +LIC_FILES_CHKSUM = "file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5 \ + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LEGAL;md5=23a79bb4c1a40f6cc9bcb6f4e7c39799 \ + " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline" DEPENDS_class-native = "openssl-native libyaml-native" diff --git a/meta/recipes-devtools/ruby/ruby_2.5.0.bb b/meta/recipes-devtools/ruby/ruby_2.5.1.bb similarity index 90% rename from meta/recipes-devtools/ruby/ruby_2.5.0.bb rename to meta/recipes-devtools/ruby/ruby_2.5.1.bb index 1ac7f2aa5a..91048284c1 100644 --- a/meta/recipes-devtools/ruby/ruby_2.5.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.5.1.bb @@ -5,8 +5,8 @@ SRC_URI += " \ file://ruby-CVE-2017-9228.patch \ " -SRC_URI[md5sum] = "f4711f856fe14de222b9da3d3b8efa89" -SRC_URI[sha256sum] = "46e6f3630f1888eb653b15fa811d77b5b1df6fd7a3af436b343cfe4f4503f2ab" +SRC_URI[md5sum] = "23867bc8c16c55e43b14dfe0614bcfa8" +SRC_URI[sha256sum] = "dac81822325b79c3ba9532b048c2123357d3310b2b40024202f360251d9829b1" # it's unknown to configure script, but then passed to extconf.rb # maybe it's not really needed as we're hardcoding the result with From patchwork Mon Apr 30 14:14:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 134703 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp3820150lji; Mon, 30 Apr 2018 07:15:04 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpFM2RG1CYkE4tG7mw4QD4PNKBZeySkunaz/zydBjAhmTqTl+0i92UML9/oUFELBLeW88TQ X-Received: by 10.98.75.139 with SMTP id d11mr12223073pfj.244.1525097704367; Mon, 30 Apr 2018 07:15:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525097704; cv=none; d=google.com; s=arc-20160816; b=M0rihky5jtsDixM2gFehaIMdFjWabA9YkvAqAzxISCRINswV5gQ7bPVQR2ec2oZKUW zp2k9KI+Wp7QH2E657n1zhaNBttRtE2BKb9Yy/Tm3CVKcYRRERoFRB43GgJfcQuw2+rD Fw3bihWF7I7B9Ifmro1QY5vQGfPkQW2FOpTqUJh/Nx6rMKsq6OW6t8cW5Ofwn4itKNMj yNeSX5AatjqnDhzYz7xW+Fq5bO4vpGtnqISGWP8Gqxau7HNmzfwZfYszzIkl/hxUzqCZ vBU/D129+oPIopkHSLW98Ojxn4eXruuozVlsFwdDNltgfn81O6k4cHtauQKKK61NhxyZ 6z3w== 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=vu2Ei1+5b4ljE2+kLGzsEO0VsKfszZ/TnHsM+jaXusw=; b=IsjvdEDyB6wqxkRXj2XC2DCnmPViXneu0s4Ap1pdZaSQLCp5PBpyZ8LWulKgvadiYm dDKxFn/BwiSldzMqT7R/Q8N9qWOKfpklz6cWEVDtX5pl2u5WRjxqiladCZPMoZyOXyH4 4WAQFbHnZlL2JveFlsuOrnNx8fQdgT11i8UXjGXMP+5W8iey/PZawpjixLzoKL5iuSoN aBhSeN6pR8xPps9hMOwpzFE73raWiehj3kQ81WPYlhhCdhVFsSz8oXkfTz6Kduh3gkg1 kE5L2dUebAKU+G+KGf5TSYkqpWiwty6LkAYzXSF8/wwdF6HGACOUgLZGe1LQ+AwI0Ujb 0PaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oo8NEhxt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l5-v6si7481127pli.409.2018.04.30.07.15.04; Mon, 30 Apr 2018 07:15:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oo8NEhxt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4C4DF71AC1; Mon, 30 Apr 2018 14:15:01 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 936A86011F for ; Mon, 30 Apr 2018 14:14:59 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id v63so6836948pfk.8 for ; Mon, 30 Apr 2018 07:15:00 -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=oMbmqL98t8dcMNAS+W8mp86YEcqU7ruq4As7AUW/TKM=; b=oo8NEhxtEnHx2JvawV9aU5zZltepTV/QXSOcNldvdcdy99DDTD4MktmvdCoUwD+u0S Vk0epgC0rC/pmfuBMoGxYMVJzsORI69DBWFqtZjraJCXDK79p75M+xh/s3Aae1kq5E/b ZsbOnZkafDwxWCW2U7RVPKmypAxxTImob9kEnlxLYJAn0K+sk7J8fzG/M2oM8tnXTlNG NKmQawp2WxBLOgD33QJuIL1iQDbNrWFa9jAinNtOK8vBThn9QRjD/0r7tGsKnXQXozd9 MmyW645xlRQ2mOB1HZWHXStlvPedoedstosBNe9b5IU149B5KlxmTECD8ijs6r2CzBfK wjgA== 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=oMbmqL98t8dcMNAS+W8mp86YEcqU7ruq4As7AUW/TKM=; b=EqYZo0iSd2KKU2N/xxs9hmptNZhgYvb5LNkMvCywTiZh8VbfqzZUD+YZWWCHaPxLsY UEn6PR1R162OUokXuOm7eSXO1piiUudQPbxJHWCVR8PT+04+ixyIxR1iUwEiTsqCjS+q W50acjXg2uBxOhQ4nNGvANyizRHyhbPfFaGhKfMWkrHF/XYsNSP5omf4X5Pf+1kHH5GS z1VUDC1ysjQRrp1Mk0rhe2oXJaFn+dAfnnAlZWoMzjKj5v6TPhYT679sFhzjsG8yhLoT RZDzENndUUNB7xl4H3KaZA9+26Mqamx3xiVabAg8HUC8AFrIhc8zfrEAHywQJoY7zSuV eLbQ== X-Gm-Message-State: ALQs6tBxls2G3QU8yalAgpOkhtxddHWXltURkub1a5rESp7QmU97c6HW 26czN8/TNITep/uKpiNiLKE+Wg== X-Received: by 10.167.132.204 with SMTP id x12mr1775303pfn.79.1525097700018; Mon, 30 Apr 2018 07:15:00 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b72sm15781621pfm.69.2018.04.30.07.14.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Apr 2018 07:14:59 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 30 Apr 2018 07:14:53 -0700 Message-Id: <20180430141455.2248-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [OE-core] [PATCH 25/25] packagegroup: Do not add libssp to SDK X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Libssp is only needed on mon-glibc/non-musl systems Add rpcsvc-proto for rpcgen since its not part of glibc anymore Signed-off-by: Khem Raj --- .../packagegroup-core-standalone-sdk-target.bb | 2 +- .../packagegroups/packagegroup-self-hosted.bb | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 43fc599c73..f5b2d69cef 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -13,7 +13,7 @@ RDEPENDS_${PN} = "\ ${LIBC_DEPENDENCIES} \ " -RRECOMMENDS_${PN} = "\ +RRECOMMENDS_${PN}_mingw32 = "\ libssp \ libssp-dev \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index adb0c56c3a..f1273e8a17 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -76,9 +76,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ intltool \ ldd \ less \ - libssp \ - libssp-dev \ - libssp-staticdev \ libstdc++ \ libstdc++-dev \ libtool \ @@ -90,10 +87,16 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ quilt \ sed \ " -# glibc-utils: for rpcgen +RDEPENDS_packagegroup-self-hosted-sdk_append_mingw32 = "\ + libssp \ + libssp-dev \ + libssp-staticdev \ + " +# rpcsvc-proto: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ glibc-gconv-ibm850 \ glibc-utils \ + rpcsvc-proto \ " RDEPENDS_packagegroup-self-hosted-debug = " \ gdb \