From patchwork Thu Jan 10 13:52:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 155172 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1919079jaa; Thu, 10 Jan 2019 05:53:08 -0800 (PST) X-Google-Smtp-Source: ALg8bN6DLy9U16L9WTtMzDL0kYf64nL+XBaWe2ibLND9/cbA5OkyEVAhVUGSfrBrZvMokmmSQgqd X-Received: by 2002:a63:5346:: with SMTP id t6mr9646316pgl.40.1547128388196; Thu, 10 Jan 2019 05:53:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547128388; cv=none; d=google.com; s=arc-20160816; b=QuJQI1G8t3TiENkMLlL4FKjNTaY5nQl8bEwxwlKSXQ+47o657rAQzulwzxFXeGSI28 qYqhyxH5VwB95WvBtq+gVHMziHN28RY98k09v39UF8cSpDzu1Vg6l8zreTU1mFNyejNv mTTfemB8WsOvp+G2s856KV8jkF8ReIoqdYy8UFYjyV8aLh2n1O1tIZnUTt9KQEhHCNPw oj/mxariMjfAinrj2j1PHmoVR4d/u8iyEB5Bapb0y8W0YM/NPR5i9lci8Ho45qcfciFt jOzL0bHpoTEPADJI4Dye0sDWaQp02QzOevhBl7KkzTQ0D/vPIgIt5dyFne9hpOW76WHY IfMw== 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; bh=Csx6TQs0XKSTco8x+xx+ujUfkYiTHf9QV2M5DG4jfzs=; b=CID69uLYrlhad1G2ytpbPXCAaUmRJVJOc3vr87a4CEMJccOOhDA6jIRpddLnlmRVTs 89eWyc/dk4V1bUGRM+DGV4RFkr4rtOyvu9mKl+JQTudC9tSHCDD5kiDfoJbNhzxSaVwi VQrHTGGXbryHZabf6rXFTadawMAQXQ/6d3qNbUN1sGaPqF15yr3M1tAd4YkcoVbOhAzz oyZFuLLu4aWtA5dc6NOVaam2OC0HcvXUopCTekghPkl9BJqg9WwEaGvCx3CmzF1flyZ7 neA1Fb7VKwBNjkRRdVKj//W7dz18FwdK3F+fKiF3eHVO3JR36oy0RIYJ/zkRT8AjUdOw MBLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=2O90jOMX; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g98si71992270plb.99.2019.01.10.05.53.07; Thu, 10 Jan 2019 05:53:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=2O90jOMX; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E01967C088; Thu, 10 Jan 2019 13:53:04 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id 6020C6B7C2 for ; Thu, 10 Jan 2019 13:53:03 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z5so11425193wrt.11 for ; Thu, 10 Jan 2019 05:53:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=Cb0X64sgGjKWoPaviAeDNkt7HW4ZsrG5MZnol6eQbXU=; b=2O90jOMXGE60HX+gv1yGGlpOTjxA3qY4EqG+F8B0lQiYYUd8diRRMsb4pyHitGb6k2 w4JDdEv3JlBQxYuja0SKS8qxtMOu5RfLcMAbVPBC3idSzNr+UN5zB6lYFVnG8U+RObIs gLO/ApXbaWT9X+m8qEDyN1E82HbXSuLj17/vTRg+iC3C7Ugb06KKd/2SG8zEM7OtsiA7 xKsF3q1wIA9pcTrCKStSUTFDoGjUn2pdCag8p+fTwXV5lJOYi2IFXgGqGgjzE3SrEnk7 XedE3muaGqwF+i4TV1SsijzJxat+mDVp8S/V2PyjMvuS9U4RX/dF7pbswa+Tqaxevixq f6tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Cb0X64sgGjKWoPaviAeDNkt7HW4ZsrG5MZnol6eQbXU=; b=FK4GuayRbafyFSzqPZgGXYpy0iA2mkFHAmagX+G4jyXHMlrvcDm7yHjxEmBv6aWDmM v/N/E15fyZaGu1tA0bi5E2jMJ/pB24euDJiTRNX7GROVWn8W7gxPtPnMCNwwg2Zw32aJ dWTj8w+mw6UbcFjb58VmxXnnj3BXy8Ew//jYhEnaOJbpSr9FnkZ2hQpV9qwtvuh/Gv/t XSYf77DUCMrDoUoTOs5hCHXX1wqjCGHL2ZAWOWMkkKzlnSqNz2LXs/xxRSJKyOhxheAE /PkJPHUs75EwQcb/2CA6q9OOiAmmtuLHvfJ3Cr3AGi4pfKTynLYMDUwHuwgcqFY5Pc3w zzeg== X-Gm-Message-State: AJcUukcAFxiGZNuXOUAPTfBt90T/EnHtHkWO831QyljdJUVJtgds+7h2 87AvPQbuYKmQIU7EejgxPY0E8afpiCk= X-Received: by 2002:adf:f5d1:: with SMTP id k17mr10020533wrp.59.1547128383772; Thu, 10 Jan 2019 05:53:03 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id q9sm78248587wrp.0.2019.01.10.05.53.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 05:53:03 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 10 Jan 2019 13:52:57 +0000 Message-Id: <20190110135301.1888-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/5] pulseaudio: fix multilib packaging 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 The magic multilibisation doesn't quite catch every instance, so replace 'pulseaudio' with ${PN} where needed to ensure the packaging is as intended. Signed-off-by: Ross Burton --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index f526690390f..82b31580b7c 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -210,11 +210,9 @@ pkg_postinst_${PN}-server() { } python populate_packages_prepend() { - #d.setVar('PKG_pulseaudio', 'pulseaudio') - plugindir = d.expand('${libdir}/pulse-${PV}/modules/') - do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) + do_split_packages(d, plugindir, '^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) + do_split_packages(d, plugindir, '^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) } RDEPENDS_pulseaudio-server = " \ @@ -250,8 +248,8 @@ RDEPENDS_pulseaudio-server += "alsa-plugins-pulseaudio-conf" RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" -FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" -FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" +FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper" +FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" # The console-kit module is good to have on X11 systems (it keeps PulseAudio # running for the duration of the user login session). The device-manager and