From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6644847399572340736 X-Received: by 2002:a1c:6708:: with SMTP id b8mr588969wmc.5.1547133126283; Thu, 10 Jan 2019 07:12:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:840e:: with SMTP id g14ls1628057wmd.5.canary-gmail; Thu, 10 Jan 2019 07:12:05 -0800 (PST) X-Google-Smtp-Source: ALg8bN5LmWYw8gz93FjdTS/VkGYXEmZhAoC5MtjM/XKHnRUwX3nUdVL7CXfPlFoqMEweuHHX/6n7 X-Received: by 2002:a1c:c284:: with SMTP id s126mr600891wmf.5.1547133125804; Thu, 10 Jan 2019 07:12:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547133125; cv=none; d=google.com; s=arc-20160816; b=OdN+Ks9sofnZKo+B1Weq9mvojsoIVRQ/281Frq19ZibN3u0ilEMIw0scfFOirRSkWx UUfMAABhAIAPXak+3GqGgv06ZXelQCPxGh3SZV5rtx6DaEfLjtZfzo/bfN72tb0THes2 WZlHuVg5Gaj/CoMOQGgs5T9Giaf5gfbvUvqwDQJOMItTAunHbzo6Cg1YN9CsHZ0ZC0/s eJQADBCdn8xZjRzpKFoEejiQjm+RklppANfcy1Vl+UZh6IAxfInTE0DW9SxSC0hTGJSb 78ZqLC/xex7jvXiH8LFWOG1AO/MK8ACaH3fGaEW8WB1iLXi6PHYBlKRkk1rGsRoe5+3G +y7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=Az/zFKzSrNK7LWZ+gQ9t35VEImlUSaC80VKn0qhDOH4=; b=fbUE5nkkBYMk9IS/KgvQ76hNhrkZm6XNztdbOySfN8UQly1xkBDaVn51+d6oz625eN GJBffFUHp7uhnYXuA82UKhL6E1er4/5BxkwaPN6vmDYOU1wTKukexd/WeXjC75s3ULbT DJseLgS6bz4rq+WN58XV16/VThgW3Sgou11ZniVfqi9KJAKATmUQJfvAta7KhdyQID6c 7PM4KRITqZjMerpxcNxvqCP/h2RY0Z9WEXG99h3LUTZcKWHe+//EZizPYQsvYdPPQhOE b8q4a5qsRbPMhEOO6PV5KS4wfRjeQLb92R0P7QnBSMMFRHbi0O/CWtpIWnba6CVPv1ki kibw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id y200si676436wmd.0.2019.01.10.07.12.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 07:12:05 -0800 (PST) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x0AFC5Ma016273 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Jan 2019 16:12:05 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x0AFC5DB004695; Thu, 10 Jan 2019 16:12:05 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v2] Fix wrong inline python in isar-image.bbclass Date: Thu, 10 Jan 2019 16:03:51 +0100 Message-Id: <20190110150351.27270-1-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Sjp/PPFdqL+E From: Andreas Reichel The inline python string used a mixture of python and shell, which failed while parsing recipes with: The URL: '${@' is invalid and cannot be interpreted Problem is that in SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }" ${DISTRO_CONFIG_SCRIPT} is not interpreted correctly. Use d.getVar instead. Signed-off-by: Andreas Reichel --- meta/classes/isar-image.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass index 754e896..e221ba6 100644 --- a/meta/classes/isar-image.bbclass +++ b/meta/classes/isar-image.bbclass @@ -6,8 +6,14 @@ inherit image inherit isar-bootstrap-helper +def cfg_script(d): + cf = d.getVar('DISTRO_CONFIG_SCRIPT', True) or '' + if cf: + return 'file://' + cf + return '' + FILESPATH =. "${LAYERDIR_isar}/conf/distro:" -SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }" +SRC_URI += "${@ cfg_script(d) }" DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}" -- 2.20.1