From patchwork Mon Jan 29 17:11:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126184 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2609271ljd; Mon, 29 Jan 2018 09:11:26 -0800 (PST) X-Google-Smtp-Source: AH8x2242PEK7Gq4DlrYvn1vPiDpwTwfIb7NmXUYJDcYWlIHvw89S28GEcS5vAWlAxdIeSh4jbLtE X-Received: by 10.101.102.3 with SMTP id w3mr21887698pgv.326.1517245885924; Mon, 29 Jan 2018 09:11:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517245885; cv=none; d=google.com; s=arc-20160816; b=JrQzNS83VVliVYwwRpzhWmfhdJMNLBGAVV5M/7+LlKlz0ZJFdZtMm0okyYwjDIAM3S TxnU23+N/xSWzWWmk0qnMgC20mS/KfoY1HvsWTlz/rP3y8Y9SsrK65KeXPxXYjJVrddu aDts3IuDlJi+rmYbpZp5Jzj+bda8rQUdpi6pX8sZSqp+8Ngkkh8y+WZsDVjRBVAQdKss dZ4bLE/7iSI+p37oU4KiMpB1Emk+u0pEa1cZ0f0tO7Y59OnOjjqRgIYorTLtwmNUDPlv LebsAjt1b6BUeZdOnkJVzwHN1mh/lkWx8nqMg1vvlT3KfO7uXWd0BahYab05gP7mYgqZ n9UQ== 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=23nFVyCrwoMArpYgf3wbr1lH2Rf30SEAU5TMAQAceo4=; b=MpL+LmJwQD2ewildgf4gxlL6KdOrtBNPaQkQ5Ejy/CHDMRuhd1omb/Z/wBSHU8Zdd2 5kGv1YKzRCxtp0op5k/atOtADV9k2YF0X3kS93Y93PJy04zYXbGQEdX8o9frFybdSIIa BqnIGf4iQ5Tl5bkVIgpPzVvUJkRVeHnNySHOlI84WaHBd6B26mmexlJHV89NqoOQNZ8i ejLRBCzk+QN0w2xru1WgP2J1xrlAuWyUlqkkhhltj0PXybr1oaAeh14/q/hS9I5uaYL7 4ftIzYa54Su3ogtdgxJg0L9WTqsfWVI4Neh6R0tTZto9lg60n824UafuHoerwGnoJ5kg VLXg== 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=r+5iTQjL; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z17-v6si9761078plo.794.2018.01.29.09.11.24; Mon, 29 Jan 2018 09:11:25 -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=r+5iTQjL; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EF8F978544; Mon, 29 Jan 2018 17:11:19 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by mail.openembedded.org (Postfix) with ESMTP id 65ED578544 for ; Mon, 29 Jan 2018 17:11:18 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id g21so8035744wrb.13 for ; Mon, 29 Jan 2018 09:11:19 -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=uapo68wqcYTrezhSNtPBJyd0UL9WBb5piVYG++aSV7g=; b=r+5iTQjL9XGoskZxZwyUlZTT+ec1OiDEzEG3CGnUq2z7x2elZfCrGuyGDuxB7ZZwY8 VNTZbs52xkoU4VmBE8Cyee1eUg266c+GMuwAS3+yN/22dCJVs4bGU7bP70F7QUIj6eGg KTWf0r3nQ+4im8IVKdiPV5Q3WEONHIbOazbaXNqI7N2cd3hZuWXB8Z7a8K4cp7JCTOt6 eudvMRVmon+OeB5iAwjss+GAwEXfmn+2vhoTNJ8VAX9uj+0eRJUxb5zDrgFpD7S/JO5P I88fig1kLms/eLDl7vonwR3wymeoOCmb7WdpO6Njn5YCAmDOku7aQCQ10BhDsvt4LLN9 awYQ== 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=uapo68wqcYTrezhSNtPBJyd0UL9WBb5piVYG++aSV7g=; b=d34uV0ZvjJfj6f7zDBRSDgJJsytql+QKo8TGQDX1aXXol3p4jScF0qHXUmkfIVy08D 5BxhC07kYg3stk92c947zW3YLbHAGZ1fx/jsDe9r12PPRJSQuaaTcXzVMKcfEQYWFVwE 2zvZW0LAi3WYZbWKCFWSzojz63rv6aHBVgCpojAy9BdwP6bQlOM6RAbfimgvulussPTs BvFx9zZ5kK0jaOV4KQg5bvAw5Ce4X1hiF56SrkA1fIwdsDbowrGZSpEogEbyacr/Rhpk n04FBsML3BDcGnZr/J0/iwuVvUE6iTJSCdESKWIyqZg4BM3/hqXOAajVde0ikAInzIPu fcSw== X-Gm-Message-State: AKwxytft1CgCDlIIwe7Fwey2TqI5KR+d0FFTm6rs5o/0KWpBNE1r59pE dbOvZZYPPQZeLtvFkJgjAYekK9Mr X-Received: by 10.223.146.33 with SMTP id 30mr4816051wrj.14.1517245878888; Mon, 29 Jan 2018 09:11:18 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e16sm11515244wre.5.2018.01.29.09.11.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 09:11:17 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 17:11:07 +0000 Message-Id: <20180129171111.14502-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/5] ofono: only depend on pygobject if its going to work 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 Signed-off-by: Ross Burton --- meta/recipes-connectivity/ofono/ofono.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 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-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index 676a0c0042a..4443a95c2f7 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" -inherit autotools pkgconfig update-rc.d systemd bluetooth +inherit autotools pkgconfig update-rc.d systemd bluetooth gobject-introspection-data DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info" @@ -29,7 +29,6 @@ do_install_append() { # Ofono still has one test tool that refers to Python 2 in the shebang sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/ofono/test/set-ddr - } PACKAGES =+ "${PN}-tests" @@ -39,4 +38,5 @@ RRECOMMENDS_${PN} += "kernel-module-tun mobile-broadband-provider-info" FILES_${PN} += "${systemd_unitdir}" FILES_${PN}-tests = "${libdir}/${BPN}/test" -RDEPENDS_${PN}-tests = "python3 python3-pygobject python3-dbus" +RDEPENDS_${PN}-tests = "python3 python3-dbus" +RDEPENDS_${PN}-tests += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)}" From patchwork Mon Jan 29 17:11:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126185 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2609431ljd; Mon, 29 Jan 2018 09:11:37 -0800 (PST) X-Google-Smtp-Source: AH8x225cuyn8Bopyl/E8ybwkMLN+Ns7BMzozdjckGzEN1VQoCURosHtxuDCUxaGARvoDAj8gEFRV X-Received: by 10.99.114.5 with SMTP id n5mr22214880pgc.211.1517245897792; Mon, 29 Jan 2018 09:11:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517245897; cv=none; d=google.com; s=arc-20160816; b=xMlmfgbNC2NNvYoXZlZyQQLtN5HDkeIJKM5PBDDgrKaZbj/jjKukTbUBeu/NC5+Iac TeoZc7tRTiCssCmt4KUGRU+2BjsJFFxUaiGwOxQ3jlXrVTkALV1cOG7Lj68TNKxGouIx x54chuMfOjhqGDPbjqwuj4x7fjFxyyXJ3+IVXtI+BNO93zfi2iBQz0L4CVql9HuFRDIT 9HwVzD0DiJE0mHUKk9JjCICTDnSaCC8uwZYHRO9/BNr73kg2IqmuLHc+UhvQBa26PE/P 9I6e/7PQzyRpuRa3JSLA34IE2y89xeR4+5TblKQCyT9ilD5CdOCkcME3eExS6l3NNuK9 XSdQ== 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=DUGvBgmYjT2MXLWAaTOl9vwJSVsaHdBTaIhPUyq/sm8=; b=PIZShNuBBj7mht9fxCfwEDWcjIAwijZunS1RgcUJl9zOC9uFJc4ZgA6KHqA1MZPXnv KA4+5by/ydxHyaQZ4j5/iRlkak9YYO7sQrM1QiaAI7uS6qF9qMqgf6kUXAS5ABP6BkiU 82LUS6VbJhQWQqr9v3hRriBTZMUBR2K5rx6HXdJN6s69gnFtQfjEsCBKj7WaIRuvRsa5 USGXiVlXoz2eYRauEKvkiQe02a7Fyfd0D7pJl0NHfclTI65PmgyzY6g3vkcaJb9E9afo 3igg69S3bUYiESJl1T/TLjcDQiDinBxcoJaJwoHUbzsD2rokxQhQYQmgQNFks03wh8Z6 zPxA== 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=fX1/k/np; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b65si7755346pgc.70.2018.01.29.09.11.37; Mon, 29 Jan 2018 09:11:37 -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=fX1/k/np; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7F5547884F; Mon, 29 Jan 2018 17:11:34 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id 6A12C78544 for ; Mon, 29 Jan 2018 17:11:18 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id v15so8056128wrb.8 for ; Mon, 29 Jan 2018 09:11:20 -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=fnveXSPdOicxWS6CX+o/30ZuTPb/EhGaRudFdoFn7f0=; b=fX1/k/np9Q0Q9lXyovN4hcx9u824Ug4XLx7Jyw/czF+oJVT4XuuxY26snR/W88NEgx k2dM9z62s6sP+A9D0UGzWrAgDdO1JpxSLbGpIOrKq1h8AhdxGF//ILy6tXUwOEiAOZ+o kYSEkAUsMqbIDO04zP/PzanQhU1IkDLI3ilozkCnDS6678f8ZZ1vQpIAHJH3/WeM7ay7 +MbBjbGqd93WygyvfFhiiX9xhHOI3XjFiymnX/ggEhBBIlmk1MxE8PImmeVIpphl+F+d 4qtDemephzQOHIVh9pGJ2BdYuMZ3w+WQ82p/PMkGSL8wpcIsTfVXykVT84oVZG+I1Ape rMYQ== 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=fnveXSPdOicxWS6CX+o/30ZuTPb/EhGaRudFdoFn7f0=; b=DSKasbGJfs2JPWvQyjcunYbOW9dcZ4rVGIVnixSHT68roeVNiP/C4gexYYbIOrnTaU kLyh1Xp/NvARpcm1W6jCq/D+ISSTkp+t4Ab8ltceE9M7QzkAxd4516rETygU1dnGzITK d2KOfimDssglz8bjn/39CAuxnvOQxgO5ImRbzVYDt9n1OqtYWvAHJ0QECMrrIMKzDp8a ffjq+HLQ/kx/ZWOLpzacfs7/iRF7zpW1uAfqPTdTKBcF/UTIZYOFJkMQzY9aWvaxJJqR FqoyWAnsjkOyGok39d3FBX0EZJbNsz61VWcFbcFJkvve0fEThRXCEnncDzIyWfqYf0kf lJ5g== X-Gm-Message-State: AKwxytebrEdgx3o8hQwyw2C10t7nLa9LGLSdZvb0dOYNbJF5UUKktr5W cM9TlzJTVEF4G6w9zl3uVhZz4WYn X-Received: by 10.223.178.9 with SMTP id u9mr18591125wra.149.1517245879864; Mon, 29 Jan 2018 09:11:19 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e16sm11515244wre.5.2018.01.29.09.11.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 09:11:19 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 17:11:08 +0000 Message-Id: <20180129171111.14502-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180129171111.14502-1-ross.burton@intel.com> References: <20180129171111.14502-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/5] bluez5: only depend on pygobject if its going to work 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 Signed-off-by: Ross Burton --- meta/recipes-connectivity/bluez5/bluez5.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 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-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index e78f174c5cb..2607a058228 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -55,7 +55,7 @@ S = "${WORKDIR}/bluez-${PV}" CVE_PRODUCT = "bluez" -inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest +inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest gobject-introspection-data EXTRA_OECONF = "\ --enable-test \ @@ -129,7 +129,8 @@ def get_noinst_tools_paths (d, bb, tools): FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS'))}" -RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject" +RDEPENDS_${PN}-testtools += "python3 python3-dbus" +RDEPENDS_${PN}-testtools += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)}" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'bluetooth.service', '', d)}" INITSCRIPT_PACKAGES = "${PN}" From patchwork Mon Jan 29 17:11:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126186 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2609515ljd; Mon, 29 Jan 2018 09:11:43 -0800 (PST) X-Google-Smtp-Source: AH8x226WK/leZ779RZlrKbq4iTZcWLNuhQRC410HgS/YbZ15x36sqAGZN0fidrjiXkpj96jNHfft X-Received: by 10.98.192.10 with SMTP id x10mr27841751pff.27.1517245903359; Mon, 29 Jan 2018 09:11:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517245903; cv=none; d=google.com; s=arc-20160816; b=qD9CXpL//jCVLWuzOQ9x9SYbQ8mD2NDmyJW5K+sc/9ZwmqWjVCFqiBC3FnGqAx/GzS poIm4Luw97YRvwIC62SvoTmsHN1pE8GeEKf60G+WvwYhFkEO3k92QtCZQRudt2SPkUsB AspGNJZWmrubiHoktbIiaIIsSex2Qqb84kNgIEtPBoZGbOeh2s02a12r/nDvR8eAPFUu hTssEM/0EaZC0D+z2544f60jwSy232N8wwIzkpJ9kii4e63aiwL4YwsYGVSc0kAnQLLI UeC3ushiht+2JcmVLRwf8GA/cETIWHyx/m0jgppobD3hioQH30X3P9HltXvTuzW0WT7F wWUw== 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=x3a9fMTV6okTGaRND2gu81BnBdrGwicFFOp5rv7+8WA=; b=edouLuXbTbPdmIePBWL+K5/7VGJOPrRrgMHLJV4DFlX8QAU/XNNpCE3fI5rASfw3B7 hKQesL8vdY0G88xEo3liBwl24lwgchuLXPeJ//CCtYG+E5KqCYvNzryahS8oyaWAAuGL zCb7PWOV/9w2Wm93/kknb5Y9ZRWN/RJINkNb6S7Ho1M/uhrPrf54DQGIrH7eomjQWtR+ PWXGCXMkBxlpIsmCsugdAvxSS7Vnq7XVLBjPFacUOtNJ4I7670FL7P50fbIj54lkR6aR ArxNH30sqIWV8kaFQSWsYWKn6s+5TXJ/77djn23nLwinzwpBd6ezlylkQqJP4STKrpWy D46g== 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=1U3QlDYR; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f61-v6si9681545plb.179.2018.01.29.09.11.43; Mon, 29 Jan 2018 09:11:43 -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=1U3QlDYR; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8814F78858; Mon, 29 Jan 2018 17:11:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by mail.openembedded.org (Postfix) with ESMTP id E8E6B78430 for ; Mon, 29 Jan 2018 17:11:20 +0000 (UTC) Received: by mail-wm0-f52.google.com with SMTP id v123so35140837wmd.5 for ; Mon, 29 Jan 2018 09:11:22 -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=iXKsfz2DR52rzIjD8mLadluZIAJ3/MoJDCgOzpwJSfY=; b=1U3QlDYR02B6i7wb25kR5xDx9SGQtjw+0ygHHFJor6vFpcag61I4ddK8dwRy0mdecV Cfwuf60KYJcjzMqdkGRKtD2vYhGvBlUPuPIPL6D2PKg8SwCeHFqLMVYNYGJV6Sg6o9rP 19bMcARLVzKBoTCH0K6Hb9hXA4l1uPyR6hbkojH5s6itt2nW3Wy0UYjx2CrFhPmauosZ 31Sb6JJFm2tbgo+L/vPKiud/o90QvO+WnJ+oI2+lYTE71vNtTdNBtQkF+5zBHK9jCPHG sj38YvkkXvaeW9gcYIWBVQFUDKSU9NqV3ejEFLGh5G/RXYEP43lN43OFXG+QTLYsupqB U/wg== 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=iXKsfz2DR52rzIjD8mLadluZIAJ3/MoJDCgOzpwJSfY=; b=tuf00oif5HXp78CMZ4gDK/DtjX06MHQgRAO2oe3cR4MtiwQq9EWfodE4E3X/uwzYkH jMwaoweDYnZmYxtAFvE6v4/SGuSnfXYFxCFpmAGTZY5PlmOJPehCCtE9DL2Y8xGUUZ39 elIHBwn+yD4U2M3pt8d3egtMLgu6oInTp2bBWux799IYGKpOVakgZAPOoZt6djfnthBW yhwJgnEpeWNORyZ7r3uZ+0KL2TppoVtb0gZmI9n1i5C7XdKqhzoimyEVFImovfbZiycW YQ8T1yMCO4/yciXICzYyopg402IRMH0LWjcCmCkjJLQS8Nyy9hRNlVxmTjkfR85VTaNM g5Aw== X-Gm-Message-State: AKwxyteB0kejZAr40XXy1wJV1FTTHP+muJXWJKJQWDtChFlUekFNe0v9 0p8ZAJYxETKpB/7ck+igdZLPzh66 X-Received: by 10.28.197.201 with SMTP id v192mr18014579wmf.53.1517245881090; Mon, 29 Jan 2018 09:11:21 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e16sm11515244wre.5.2018.01.29.09.11.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 09:11:20 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 17:11:09 +0000 Message-Id: <20180129171111.14502-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180129171111.14502-1-ross.burton@intel.com> References: <20180129171111.14502-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/5] meta: don't use deprecated functions from utils.bbclass 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 These functions were moved to meta/lib/oe in 2010 and the base_* functions in utils.bbclass were intended to be a short-term compatibility layer. They're still used in a few places, so update the callers to use the new functions. Signed-off-by: Ross Burton --- meta/classes/image.bbclass | 2 +- meta/classes/image_types.bbclass | 2 +- meta/classes/kernel.bbclass | 2 +- meta/classes/libc-package.bbclass | 20 ++++++++++---------- meta/classes/module-base.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- meta/conf/distro/include/security_flags.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- meta/recipes-connectivity/openssl/openssl10.inc | 2 +- meta/recipes-core/glibc/glibc-package.inc | 4 ++-- meta/recipes-devtools/gcc/libgcc.inc | 2 +- meta/recipes-graphics/mesa/mesa.inc | 2 +- .../x11-common/xserver-nodm-init_3.0.bb | 2 +- .../xorg-driver/xf86-video-intel_git.bb | 2 +- meta/recipes-support/icu/icu.inc | 4 ++-- 15 files changed, 26 insertions(+), 26 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/classes/image.bbclass b/meta/classes/image.bbclass index 4531aa2a57a..7abb9182120 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -17,7 +17,7 @@ RRECOMMENDS += "${PACKAGE_INSTALL_ATTEMPTONLY}" INHIBIT_DEFAULT_DEPS = "1" -TESTIMAGECLASS = "${@base_conditional('TEST_IMAGE', '1', 'testimage-auto', '', d)}" +TESTIMAGECLASS = "${@oe.utils.conditional('TEST_IMAGE', '1', 'testimage-auto', '', d)}" inherit ${TESTIMAGECLASS} # IMAGE_FEATURES may contain any available package group diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index b17c435274e..ae3e6edef33 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -228,7 +228,7 @@ IMAGE_CMD_f2fs () { EXTRA_IMAGECMD = "" inherit siteinfo kernel-arch -JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" +JFFS2_ENDIANNESS ?= "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" JFFS2_ERASEBLOCK ?= "0x40000" EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 1ecb840caf4..d181e2b6e0a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -547,7 +547,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base" # not wanted in images as standard RDEPENDS_${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image" PKG_${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name('${KERNEL_VERSION}')}" -RDEPENDS_${KERNEL_PACKAGE_NAME}-image += "${@base_conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux', '', d)}" +RDEPENDS_${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux', '', d)}" PKG_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name('${KERNEL_VERSION}')}" RPROVIDES_${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION}" ALLOW_EMPTY_${KERNEL_PACKAGE_NAME} = "1" diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 739adce6943..2e7cd25297e 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -113,9 +113,9 @@ python package_do_split_gconvs () { bb.error("datadir not defined") return - gconv_libdir = base_path_join(libdir, "gconv") - charmap_dir = base_path_join(datadir, "i18n", "charmaps") - locales_dir = base_path_join(datadir, "i18n", "locales") + gconv_libdir = oe.path.join(libdir, "gconv") + charmap_dir = oe.path.join(datadir, "i18n", "charmaps") + locales_dir = oe.path.join(datadir, "i18n", "locales") binary_locales_dir = d.getVar('localedir') def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group): @@ -189,7 +189,7 @@ python package_do_split_gconvs () { # Read in supported locales and associated encodings supported = {} - with open(base_path_join(d.getVar('WORKDIR'), "SUPPORTED")) as f: + with open(oe.path.join(d.getVar('WORKDIR'), "SUPPORTED")) as f: for line in f.readlines(): try: locale, charset = line.rstrip().split() @@ -231,12 +231,12 @@ python package_do_split_gconvs () { commands = {} def output_locale_binary(name, pkgname, locale, encoding): - treedir = base_path_join(d.getVar("WORKDIR"), "locale-tree") - ldlibdir = base_path_join(treedir, d.getVar("base_libdir")) + treedir = oe.path.join(d.getVar("WORKDIR"), "locale-tree") + ldlibdir = oe.path.join(treedir, d.getVar("base_libdir")) path = d.getVar("PATH") - i18npath = base_path_join(treedir, datadir, "i18n") - gconvpath = base_path_join(treedir, "iconvdata") - outputpath = base_path_join(treedir, binary_locales_dir) + i18npath = oe.path.join(treedir, datadir, "i18n") + gconvpath = oe.path.join(treedir, "iconvdata") + outputpath = oe.path.join(treedir, binary_locales_dir) use_cross_localedef = d.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF") or "0" if use_cross_localedef == "1": @@ -344,7 +344,7 @@ python package_do_split_gconvs () { d.appendVar('RDEPENDS_%s' % metapkg, ' ' + pkg) if use_bin == "compile": - makefile = base_path_join(d.getVar("WORKDIR"), "locale-tree", "Makefile") + makefile = oe.path.join(d.getVar("WORKDIR"), "locale-tree", "Makefile") m = open(makefile, "w") m.write("all: %s\n\n" % " ".join(commands.keys())) for cmd in commands: diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index 6fe77c01b7e..f851b851639 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass @@ -12,7 +12,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}" # we didn't pick the name. export KBUILD_OUTPUT = "${STAGING_KERNEL_BUILDDIR}" -export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_BUILDDIR}/kernel-abiversion')}" +export KERNEL_VERSION = "${@oe.utils.read_file('${STAGING_KERNEL_BUILDDIR}/kernel-abiversion')}" KERNEL_OBJECT_SUFFIX = ".ko" # kernel modules are generally machine specific diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 01416ba7411..1473bfb0824 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -220,7 +220,7 @@ EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}" # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -crosssdk -cross-canadian" -BPN = "${@base_prune_suffix(d.getVar('PN'), d.getVar('SPECIAL_PKGSUFFIX').split(), d)}" +BPN = "${@oe.utils.prune_suffix(d.getVar('PN'), d.getVar('SPECIAL_PKGSUFFIX').split(), d)}" BP = "${BPN}-${PV}" # Package info. diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index ab2062b78f5..7ea1049edff 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -9,7 +9,7 @@ GCCPIE ?= "--enable-default-pie" # _FORTIFY_SOURCE requires -O1 or higher, so disable in debug builds as they use # -O0 which then results in a compiler warning. -lcl_maybe_fortify = "${@base_conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}" +lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}" # Error on use of format strings that represent possible security problems SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index c8932ddc592..aa112f51401 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -17,4 +17,4 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" PREFERRED_VERSION_linux-yocto ??= "4.12%" -QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" +QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc index bd96551c625..02a0e16e972 100644 --- a/meta/recipes-connectivity/openssl/openssl10.inc +++ b/meta/recipes-connectivity/openssl/openssl10.inc @@ -25,7 +25,7 @@ TERMIO_libc-musl = "-DTERMIOS" TERMIO ?= "-DTERMIO" # Avoid binaries being marked as requiring an executable stack since it # doesn't(which causes and this causes issues with SELinux -CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ +CFLAG = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ ${TERMIO} ${CFLAGS} -Wall -Wa,--noexecstack" export DIRS = "crypto ssl apps" diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 4d3dc679b40..824b185b3ac 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -118,10 +118,10 @@ do_install_append_aarch64 () { # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 install -d ${D}${nonarch_base_libdir} if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then - ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64.so.1 \ + ln -s ${@oe.path.relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64.so.1 \ ${D}${nonarch_base_libdir}/ld-linux-aarch64.so.1 elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then - ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ + ln -s ${@oe.path.relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ ${D}${nonarch_base_libdir}/ld-linux-aarch64_be.so.1 fi fi diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index 1500fb5acea..5f1dff609c0 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -28,7 +28,7 @@ LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" FILES_${PN}-dev = "\ ${base_libdir}/libgcc*.so \ - ${@base_conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ + ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ ${libdir}/${TARGET_SYS}/${BINV}* \ ${libdir}/${TARGET_ARCH}${TARGET_VENDOR}* \ " diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 15967959a41..88ba0050d5e 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -77,7 +77,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnav GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}" GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" PACKAGECONFIG[r600] = "" -GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" +GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 345b5896969..a77c56445c8 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb @@ -60,7 +60,7 @@ do_install() { fi } -RDEPENDS_${PN} = "xinit ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" +RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index 9aff9d8c229..2623cb2f317 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -38,7 +38,7 @@ PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc xcb-util" PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr libxdamage libxfixes libxcursor libxtst libxext libxrender" # --enable-kms-only option is required by ROOTLESS_X -EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' +EXTRA_OECONF += '${@oe.utils.conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' COMPATIBLE_HOST = '(i.86|x86_64).*-linux' diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index b9ac59a1add..983118cd619 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc @@ -28,8 +28,8 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF_class-native = "" EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_append_class-target = "${@base_conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@base_conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" # strtod_l() is not supported by musl; also xlocale.h is missing # It is not possible to disable its use via configure switches or env vars From patchwork Mon Jan 29 17:11:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126187 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2609603ljd; Mon, 29 Jan 2018 09:11:50 -0800 (PST) X-Google-Smtp-Source: AH8x224XJnYus70sv5NU9jePGJSluUjMORDSpVmkW8w2/uldhxG6W4II86Yl46pGgEDBVARQc9bS X-Received: by 10.98.202.214 with SMTP id y83mr27043441pfk.49.1517245910119; Mon, 29 Jan 2018 09:11:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517245910; cv=none; d=google.com; s=arc-20160816; b=Orp0bHP0ngh/QvsAwOo+Hi1gyJIxR+iZoKohvOGt4cU2UMEl8DWVrYT6PWaL+T8zIT ztN0W05C4YrnoH46n56ph5JJ2PbfQ3EaA5j8ouwKyDv2uoCNqLul073mZSia0MPtI3P3 6bqloWV/xOHSyR+AxanE7tqJX98wgvviy2Z8naXpMqUtcYLR74GEFAyJGPqDyGXPuzxI DqkSJyiKPi5db46LUIWFraKuVXYCcYIg261yZyD4k2QRNzC/ePHQimmyT8EuTnKnijJ/ m8AIPpLmVdv0PWgsshJ6Qv2JMa6s+s5ipUBV9JaNlpg9crDTcOTHeiZ2udP+3gP1RGwX w/dA== 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=lcSRksskR1mR4IeYDXbFsFDFwAqMKegZODt3Z66T06M=; b=tQ7ahZJ8g3WUcOyzr61vTAaBtLT0zaSwSR8A/XwF6YukzRxe/4Q/n5/c2w76GnqeZj qH80H0WIDArg9bId9Y7VxN/zVEzcWWfa7csPnLDjGMMPUOZTarPR99TtvC/EfCB7QYrO f3e3Odf9oayTnT0f07MAWU6ahsiLfYJJSVQZExizv0Z6Z3mGrFE6VzM5fmQrZsYDeZK9 eFqG22Mdzc877cUtbOyXbZuIZH0+RTbZ+T2Rg5jJWqjF/lu47mg57PrRr166jtCvjxTq hz5+EcNROSRTKpYei1Y/JSmknaF+1ROKxhBWvLKCsYtdRbuJhmJe76yFdQv+VKtivreZ 4+jw== 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=lORZpHA2; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g59-v6si9755474plb.469.2018.01.29.09.11.49; Mon, 29 Jan 2018 09:11:50 -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=lORZpHA2; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9770F7885D; Mon, 29 Jan 2018 17:11:36 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id 49E7878846 for ; Mon, 29 Jan 2018 17:11:22 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id b21so35160609wme.4 for ; Mon, 29 Jan 2018 09:11:23 -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=3fbPk4lBsZU3LZHvXacLOmAskQZX9hwZfuTExxHXG14=; b=lORZpHA2IcqdBRnJZq1LnZ1nVvWEpRoypO8IesUquc8MUsQyebSdo2/3iPdE3V4fZJ vo4m/jVNLLJB7IAj7X8IclOdFYudM+RpQBgzBQX5s9YKLeyhxwC2DASLVEJnPTy3IYKd 01Br86WJQNYd7UYIJFqwQbY1iI5irRIP4Ymb6rvSCDtT9OoI98AfpUx8gUZmH6BQuLe+ Zsokl6yq5X+803qRTDOw65lKpYbZ51IyGZrWrScXKxHSQ4eXUp/Iz/EUFwVu/FlCaeMq 41uLMte+LKOfi2/HmRHXa9rUZBsJhVCPdo2IRT1w1rbSMnwSH1JdRLSwNdvHlOFdNCAS M4SA== 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=3fbPk4lBsZU3LZHvXacLOmAskQZX9hwZfuTExxHXG14=; b=k81zExZTcgA8oKKDi4xe7dDHx7s3ilODVaedE4Gp2e69VM1DmSXhGw3XcIA008qC/9 Jjpe9lGocztaTjgD6LisY/Oosk2T2Lf60fcY9YoC2N+Cs2B3CxPwXnlaDk1msQvqFbAr znR0mNzC2auzgGPE00jl9Fluq26UL/TOOt/xcp4nWXd1aUERAOLZA7kvlnL+Apk7kaJt 8uGAJUErCIPpjD1VmzvwF7MgLsG1dGTvukIzsl/W1ouAU9COuzWztOP4kzwvqUDTURrQ dVR2Sr2mctyzFyvB8KOIXrPweKXYIXqZLqSq/FmS0fqP0j+vm+m6svN43z7oO5cz/nS/ zUWg== X-Gm-Message-State: AKwxyteKeM/ZorwCBKwedbHCi9hJZJCLg2JnquGDU86ayVrGcPrONmo9 Y8wBT6CsEUea3p47l1uq6wuUUGiB X-Received: by 10.28.186.132 with SMTP id k126mr17629654wmf.159.1517245882918; Mon, 29 Jan 2018 09:11:22 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e16sm11515244wre.5.2018.01.29.09.11.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 09:11:21 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 17:11:10 +0000 Message-Id: <20180129171111.14502-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180129171111.14502-1-ross.burton@intel.com> References: <20180129171111.14502-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/5] classes/utils: remove compatibility functions 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 These base_* functions were moved into meta/lib/oe back in 2010 and wrappers left in utils.bbclass for compatibility. It's been eight years, so I think it's time to remove them. Signed-off-by: Ross Burton --- meta/classes/utils.bbclass | 41 ----------------------------------------- 1 file changed, 41 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/classes/utils.bbclass b/meta/classes/utils.bbclass index 32cae7e3125..4f016e3d002 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -1,44 +1,3 @@ -# For compatibility -def base_path_join(a, *p): - return oe.path.join(a, *p) - -def base_path_relative(src, dest): - return oe.path.relative(src, dest) - -def base_path_out(path, d): - return oe.path.format_display(path, d) - -def base_read_file(filename): - return oe.utils.read_file(filename) - -def base_ifelse(condition, iftrue = True, iffalse = False): - return oe.utils.ifelse(condition, iftrue, iffalse) - -def base_conditional(variable, checkvalue, truevalue, falsevalue, d): - return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d) - -def base_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): - return oe.utils.less_or_equal(variable, checkvalue, truevalue, falsevalue, d) - -def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): - return oe.utils.version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d) - -def base_contains(variable, checkvalues, truevalue, falsevalue, d): - bb.note('base_contains is deprecated, please use bb.utils.contains instead.') - return bb.utils.contains(variable, checkvalues, truevalue, falsevalue, d) - -def base_both_contain(variable1, variable2, checkvalue, d): - return oe.utils.both_contain(variable1, variable2, checkvalue, d) - -def base_prune_suffix(var, suffixes, d): - return oe.utils.prune_suffix(var, suffixes, d) - -def oe_filter(f, str, d): - return oe.utils.str_filter(f, str, d) - -def oe_filter_out(f, str, d): - return oe.utils.str_filter_out(f, str, d) - def machine_paths(d): """List any existing machine specific filespath directories""" machine = d.getVar("MACHINE") From patchwork Mon Jan 29 17:11:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126188 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2609700ljd; Mon, 29 Jan 2018 09:11:56 -0800 (PST) X-Google-Smtp-Source: AH8x225wJyYy+pABCDIGlq1Jt8zrIjANRZO8JYD7euqriroVmL4EJazyOim0pssEKA/GkHKbw8Mg X-Received: by 2002:a17:902:121:: with SMTP id 30-v6mr21753034plb.288.1517245916414; Mon, 29 Jan 2018 09:11:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517245916; cv=none; d=google.com; s=arc-20160816; b=hUyteY6PUcSy1v84Vu0A55h+TCq3uGaGi+h2PBFPqtetlNn0Xd+Uh2kOl+bnWBhMm7 EaFw/HIiPKQNas9M7cQ1UCBjjB+JyqTq0nqWf1euNlLt8f2qaYAO0DqoEcFCUOkei0ra tLG8JPjNHm7K/tqV3DOOGD0Nrpk2cegXkKgaciHqMy2k3QxuqKHz92B2PTRQNV/WEbHt 5OocZKc/Khtp1vT0Syb5nqKGvYctN3ecR7ywnrcVDnUVJCr+o6dkojMrgXExnU5THqz2 Wv3Gx6xzCL8IcRF3RBCxTJST2yCNqBNlGFqewf6yxURPVPL3G06feXLJmd5LqBsmecqc 2WQw== 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=2sTx/acfRxMVXttbmg8bNN/pI5DOyba00h3S2SI8B4k=; b=n3/br+FqiarSKd3+CDbTwwWAPoQrpPS6UKGNYjmrAG0nXafCkR6mXCE9oqgX/l+DAw QkVB5SnlSlsJAfWBNTrfh8/ETAc11tJBQK54hfafTPTt68M3JDZfgRmU32V2V8dDwT+O 5jaWPQiHLpprQoiZJ9NTyOQZVH4RISJQy3KQpEGl8/0SmpEq4OaYARMvxr9XjfkQC+eY 66JGJnzuby26YANE7C2sxv1JHrSAp3QM7sEgJxfUoEUOXbe3kBijIjnrSe6vnhPWSKFp 3kQsaC0UnCR3fl1rkQFTMWBexvI1HWSIrCL1jHGKwSDph/XWh8IFiaSfCXF40NI9f5PP 4P/g== 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=uozktDZX; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n61-v6si136341plb.67.2018.01.29.09.11.56; Mon, 29 Jan 2018 09:11:56 -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=uozktDZX; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A2C2578864; Mon, 29 Jan 2018 17:11:37 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by mail.openembedded.org (Postfix) with ESMTP id 520357884B for ; Mon, 29 Jan 2018 17:11:23 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id g21so8036044wrb.13 for ; Mon, 29 Jan 2018 09:11:24 -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=0uUbKzEa5iDfr27lLrf5CdvomL+YKxdNQ8hx82aUjCo=; b=uozktDZX/sGCak9F/XWvJUH/vDjLMHXwOFfV2NdZM8v6Om8L0vNvaq0htWPXf/bTyc PsXiG6d41bSK7An+mpR2jXokE1MieBgGIKkycqAdpb6HBrMO3A02iyESkY0uFcKfkbtD j630XexolVjQvFVDzJ30dctZgOCBGAXxPss52WupkiuE8kgMi5LAVOqC53pUIJgT9J8u aQ286ZPvCIQh52LePKXt3+yZe6r46GHzrHJlYT+n9NzSr1fhUH1WUxJdMiz/p+vw2YBJ RDpn9OO8SiE6wfIeqpDVpCDGz2uF3kS93J3CqZ9zohLScK347/MS7erZEht6F+PKgIha CWlg== 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=0uUbKzEa5iDfr27lLrf5CdvomL+YKxdNQ8hx82aUjCo=; b=cSGtIf1F9DBA0lu+XXNcXNByCSaJhE/ko0T/hM2n6XB5ixLP5YjJ2WjcBsjmdIrcg+ ICD/7KVeqcvdKbDShDB1IsIt2fFWjLk+rQLhedfSZeZLQoG9xn9rANUE6zGxSHS5E02/ mMgCtFABRtbespx2rw37h4SweIEaEB1NI2jAFnkLJeba7d+I2BtI/zBzQDt2OyOqf7Ha ypy857CtAsrdO7ug9Ytd2Iv5l9AO6dUnYGdOIjFJ2/Gf3KsO0kskqjcjdETebcEq0vLw tyJrDqSjvYNdoeDK27mf1hvOy/46R2rIJeCk+LqMjs7zZuP7mB8I22I3QxQD+DIE6Fy5 rdCA== X-Gm-Message-State: AKwxyteqRl7JgLRWxKSgoftXPW+mB59al90x4c9Q86zKYfBzVWtwC/Ea nTA41cRD4PIm8TbeYuzjaNZqkNWQ X-Received: by 10.223.185.124 with SMTP id b57mr19387172wrg.13.1517245883877; Mon, 29 Jan 2018 09:11:23 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e16sm11515244wre.5.2018.01.29.09.11.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 09:11:23 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 17:11:11 +0000 Message-Id: <20180129171111.14502-5-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180129171111.14502-1-ross.burton@intel.com> References: <20180129171111.14502-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 5/5] ofono: use patch sent upstream instead of sed 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 using a sed to fix the hashbang in a test tool send a patch upstream and use that. This way we'll notice when the patch doesn't need to be applied anymore. Signed-off-by: Ross Burton --- meta/recipes-connectivity/ofono/ofono.inc | 3 --- .../ofono/ofono/use-python3.patch | 27 ++++++++++++++++++++++ meta/recipes-connectivity/ofono/ofono_1.22.bb | 1 + 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/ofono/ofono/use-python3.patch -- 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-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index 4443a95c2f7..0472414b199 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -26,9 +26,6 @@ SYSTEMD_SERVICE_${PN} = "ofono.service" do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono - - # Ofono still has one test tool that refers to Python 2 in the shebang - sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/ofono/test/set-ddr } PACKAGES =+ "${PN}-tests" diff --git a/meta/recipes-connectivity/ofono/ofono/use-python3.patch b/meta/recipes-connectivity/ofono/ofono/use-python3.patch new file mode 100644 index 00000000000..7b84075257a --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/use-python3.patch @@ -0,0 +1,27 @@ +set-ddr should use Python3 like all the other tests. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 29 Jan 2018 11:31:25 +0000 +Subject: [PATCH] test/setddr: use Python 3 + +All the other tests use Python 3, so this should to. +--- + test/set-ddr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/set-ddr b/test/set-ddr +index 5d061b95..33631f31 100755 +--- a/test/set-ddr ++++ b/test/set-ddr +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + import sys + import dbus +-- +2.11.0 diff --git a/meta/recipes-connectivity/ofono/ofono_1.22.bb b/meta/recipes-connectivity/ofono/ofono_1.22.bb index fd7ee15af1d..e57eaa77eb9 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.22.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.22.bb @@ -3,6 +3,7 @@ require ofono.inc SRC_URI = "\ ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://ofono \ + file://use-python3.patch \ " SRC_URI[md5sum] = "2a683ab8e98448ad8bc5dc9868d2893e" SRC_URI[sha256sum] = "8e34a6696c300c9841b55e8dff640bd3096e49f5dbe55bbebaa69a71676f687e"