From patchwork Wed Feb 13 13:25:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 158214 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp69754jaa; Wed, 13 Feb 2019 05:26:04 -0800 (PST) X-Google-Smtp-Source: AHgI3IbiAu+Pe/wh8pOH/HcaOjKhLxjHB7x2A1B0sSQxL0KRJRmlDZffHHmBSCdNnuf5TAILZhQU X-Received: by 2002:a63:7f46:: with SMTP id p6mr516380pgn.54.1550064364145; Wed, 13 Feb 2019 05:26:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550064364; cv=none; d=google.com; s=arc-20160816; b=UscD7syH6aHfxavs9PxGLxc8FERz2Vb4LFKSNdBXsB03M1lM6KEBBz04yC/x7WCgIm MYx12paPxynf4fW7F8I86Zhjtq8qiH+RlLL/sni4+NKx1GvspGeUvV41LrLDTuCGrfWU K3YI0OvINVCFW5wOaKjmA4DyDJoRZzYfH/owIh9xnnEbHJC8Ee6nTHivMet/b687DJ06 Pr8kgpJA70YF6nqrKsRqykf9apahW1uq8stMlKUyAqSMddveVu2WrtN3eucKzQYbipkc vjpOPWXjNAxCibbdAGPzhZlCg02RI4Y+8MMoMLx24pyNKrQMxAi3c3+5xBo2di1baD1y Iztw== 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=3teOIVpfhNAvXTEfZuydiTR6DQqZhaQFkjFW60eumXw=; b=wyd8C8xay3S2coAygwRXI9QIf5NwXY4A4737aokMSzZ/1F2x9gvR8bsxxvtesaEee4 SAmjcyEPw0viKrFTWh8YYkiYy+Q10p5oMJrquO4IUMMme+6wrm5nDLnY9p8UZQlcYr3+ GR3PMcKyHr9S0FuTvr0d6+H3urQgs2oYXgsGiWro3GM9c7wy6r/i4uRsqKB2A4Jh1ytG kr7t+wo8SxC6W8aNO5QyoDlXo3ZedPmpr1fxVl+RT2Ye8NIng4odVnSf8Pz6XGNbtivs Vm3fC54DT2+SnLrzQcs1AznHZb8QHPomxPA4TsaPNFiZ+8qsslyE/RW+AEVptDYVUOsL nsWw== 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="K/S6LNiT"; 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 g1si15710757plo.406.2019.02.13.05.26.03; Wed, 13 Feb 2019 05:26:04 -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="K/S6LNiT"; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 425717C556; Wed, 13 Feb 2019 13:25:58 +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 1F7486BF3E for ; Wed, 13 Feb 2019 13:25:55 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id f14so2510254wrg.1 for ; Wed, 13 Feb 2019 05:25:57 -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=pOpfGB2xon+bRCC6ZttciWQcp2nCBSQwquBayRPeq3Q=; b=K/S6LNiTH8xKv9dqrd9jpeBl9tYizILZhtWF76/rMsZ8FwwetC3tatm9fPc8tz9ZBi 4g/3YtWEh3bROoz/yxb4JeOc9Gj7RACM/mFL02L09viYWZ+sWENKoxQYItuWwlEG3KjL y4Zzs1n+IfiDyaAarlbY5gr0SWj0kNH3gfHTAc63+p4lJeLYJ86b1zIEvsI+XwG/zAwU ZZz8tp/pyQ/NNuAC3hkD2YL1AUy/tzpDX34Tow7uYQdRdC8BTspH36BFALMih1L46ABx WmQmo2kkwOA4rjTYrob+kNor6c47I8EMFNzeOhP62W/3AhtbRfkk118a85Jg1rjAghGr zbSg== 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=pOpfGB2xon+bRCC6ZttciWQcp2nCBSQwquBayRPeq3Q=; b=BAEW1HGpvu3szzYoTARO7TIk0PnNFprMVsBS6pp9EGWSoEL1TEnXxG/gBC2JI0MOAZ +aItYaYTsGG/0OdLTwHziS3xcrTFgA/d1xJMLzrTZpKRdRnssZJYYtSjK6DQPuxyekfe gH+83PqN1oW3nWqprHhLigyyo7UZEZu22bf+r5VaOBdyWwDMZP+1ZIrKlIq1faf3o4TI vtSaOgqkohlVj/yCOclWkVqp8jgB/iHJeepmBag9Efv0szCHkOzjkQey4xkrGQ908eit tsQWgOTlQYyK0P8kpAGiHBUHXSuqM8UG3NtXlsWTk+hDNlba0LiHuGg+8ZHKC35AtIoi Ivvg== X-Gm-Message-State: AHQUAuZc0J4XhnY0xcDSwYlBYBYzwSGg2Lxk8ZYElZ6LfwgwBPLedVVI yzulkIcoSbvxwIc5rP/Tkg4/oYf2Cow= X-Received: by 2002:adf:ecc6:: with SMTP id s6mr435874wro.144.1550064356251; Wed, 13 Feb 2019 05:25:56 -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 l129sm4517400wml.42.2019.02.13.05.25.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 05:25:54 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 13 Feb 2019 13:25:51 +0000 Message-Id: <20190213132552.24550-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] utils: add -src to system package name blacklist 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 oe.utils.packages_filter_out_system() returns PACKAGES after removing "system" packages but it doesn't handle ${PN}-src as generated by PACKAGE_DEBUG_SPLIT_STYLE=debug-with-srcpkg. Signed-off-by: Ross Burton --- meta/lib/oe/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 7b574ffd30d..0c1d48a209e 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -214,7 +214,7 @@ def packages_filter_out_system(d): PN-dbg PN-doc PN-locale-eb-gb removed. """ pn = d.getVar('PN') - blacklist = [pn + suffix for suffix in ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev')] + blacklist = [pn + suffix for suffix in ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev', '-src')] localepkg = pn + "-locale-" pkgs = [] From patchwork Wed Feb 13 13:25:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 158215 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp70074jaa; Wed, 13 Feb 2019 05:26:23 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ3j7DgfYOqc6aUYzWObmvY3LGS3BtvxCQt02y/ZNGDhLUOkyNlImeyAbf2oz6XB3kZLsfL X-Received: by 2002:a17:902:708b:: with SMTP id z11mr511723plk.203.1550064383859; Wed, 13 Feb 2019 05:26:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550064383; cv=none; d=google.com; s=arc-20160816; b=y7qlfwGK9e0/lNaZ9G+Mtqp0wyKcSkxlxJF8V6aP4AK0A85Bqx3+k+Gs5GfSZnlqqE ApYwWs7oVHS9WYAgtNb5chFSJt5XuGrmzr6P/Af521F8c6axo/TonxxLakcKDCcJ7x20 dXLfk8EFfE3GcGbwTM+ma5fagrP2Nal15qlqw4+BqxQjq7vcS/kbSHECwzdgqSKPSkX6 bIijDesgZDMyArU8g73eile1Ok5Kn7tziiKvVEV6eDQI/Eda3XpCHcvAEdoclVnJ2g4R lqod19TeC2Epn4kGv27Ra6+z3neyWBVQLTQOui/Rf1QEC94hGRD3rJPV0mV5p6En+Ebu EvIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=gUhwroTYCz9DEd+97rIiQn2nSM0Qo24Ux3NWzQvSk2k=; b=jJFc1m6ZP21U8C3df6PtHodS0kYfFUDgO92T9DyW8O3YA/vBptYFHjNpHObQLCSs89 Cu/O7YAFmg3YYoN8SKk4dcSk3TJs+m/f3Ggv00S2WkPVAUhqWez0j6fmhrQPxKr/pvaB pe/7z4H4wuz1j8FOTRKPDfUFMtRuBc7Z/Ak4PwRfuvJd+ZrkQvcSkAjIC/EY7O+J5NrU 0SkNahNDcgRh2KxXyjv7r5c8o7lclQPJvfRA0MOOaOvaCADS+mAJ6UccCgYn2AdprM7S tu+tbVl4d0vhzbtAUiGhevV+BU85++S62aRnHW8AQo0QVbk8l5+gHWnk+3IAXmxq+/lB qXYA== 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=pwEnMJ4V; 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 d1si810999pls.164.2019.02.13.05.26.23; Wed, 13 Feb 2019 05:26:23 -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=pwEnMJ4V; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1C75E7C5A8; Wed, 13 Feb 2019 13:26:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mail.openembedded.org (Postfix) with ESMTP id 2E7A36BF3E for ; Wed, 13 Feb 2019 13:25:57 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id x7so2439093wmj.0 for ; Wed, 13 Feb 2019 05:25:58 -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:in-reply-to:references; bh=/DYb2QSZLk6L1YD/pD1BkI7Qgox9oEZGd5lTmHfhxc4=; b=pwEnMJ4VMY1IflJK8IrSmJD7Jjnj5g7kfqwF1N4F0TFuwAp3BIzMz7OZmlUzl4wd2J Z3IHJDwKDf11jQVtrEemAQp84n2BPbRSZ8ZHfzNitCm/NdEQOyPWCRlhDEq1SGnTuU5C eaEM0QxLntn24eR6fnXKtXDzttcXw58hAyaIoFjh2xrffX0FiPZ1qY39MJ9mh+k1eC6H gyXTB9OEfbhU2HTAY9mgx3j9x88NffrTH42pQhgAGTBd6tL1dcYQkKjr0Dtgo3O1kwd8 23PC64gB6jTbYUAgk65gMN2aZYMvPXmTVySVFN3WdXmBT5+AjeicdyiwUnzb5kj/XZ/l M1IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/DYb2QSZLk6L1YD/pD1BkI7Qgox9oEZGd5lTmHfhxc4=; b=cp0ReD4LyFhatV1R8wmuVQp6MueucnVB6J0MmF2qggMO1iEg4FD5grOJrchz0x0zD8 ShoPEniOwvTJvSzfea8kCpsQz7nhu2kCe/lMqVFezFnkPXbtmqCm4SJVBOvSRJbV9FLF TTI3A7w1Yk3nQWCUnJX1F8I3wWph/hWal/M402pLBuwkya7U4LbQ/GAHTEhj/Fd4pikb fxvW+H3Vd66+EGykSKqlRxx+ov0p1sCL/McFDlLxSnKgbFI8CLnPTzVyUDOsx7m8u60a d2R1GO4rpQ+MUHMt09fGzGkpttKzD5xrazKqCJMgUQK8SqfEd3X8A1kXAu7/VlyHpWNs mAVA== X-Gm-Message-State: AHQUAubwFrtSnemOmsuxz0ipZnr5nNo3Q+lfd54nnFqQ/AxPTN1mkNsc tBF9WdaiABNkSnj+R9nebVxmzUrOXi4= X-Received: by 2002:a05:600c:2102:: with SMTP id u2mr323459wml.152.1550064357406; Wed, 13 Feb 2019 05:25:57 -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 l129sm4517400wml.42.2019.02.13.05.25.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 05:25:56 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 13 Feb 2019 13:25:52 +0000 Message-Id: <20190213132552.24550-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190213132552.24550-1-ross.burton@intel.com> References: <20190213132552.24550-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] gstreamer: improve metadata dependencies 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 Instead of maintaining its own copy of the 'system' packages, reuse oe.utils.packages_filter_out_system(). This stops ${PN}-src being added to the meta package, which meant anything depending on the meta package was also pulling in the sources. Signed-off-by: Ross Burton --- meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 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/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index c995e29e09d..6781e98c319 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc @@ -15,17 +15,17 @@ python split_gstreamer10_packages () { python set_metapkg_rdepends () { import os + import oe.utils pn = d.getVar('PN') metapkg = pn + '-meta' d.setVar('ALLOW_EMPTY_' + metapkg, "1") d.setVar('FILES_' + metapkg, "") - blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] + blacklist = [ pn, pn + '-meta' ] metapkg_rdepends = [] - packages = d.getVar('PACKAGES').split() pkgdest = d.getVar('PKGDEST') - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): + for pkg in oe.utils.packages_filter_out_system(d): + if pkg not in blacklist and pkg not in metapkg_rdepends: # See if the package is empty by looking at the contents of its PKGDEST subdirectory. # If this subdirectory is empty, then the package is. # Empty packages do not get added to the meta package's RDEPENDS