From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6596658663135379456 X-Received: by 2002:a19:4e98:: with SMTP id u24-v6mr554383lfk.7.1535904283395; Sun, 02 Sep 2018 09:04:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8246:: with SMTP id j6-v6ls1600197ljh.10.gmail; Sun, 02 Sep 2018 09:04:42 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbxl2nqRX/LpwhYwRPZ0u0DGAP4Zh3In31g+cNn822gYNAh2ND80q08Q4rgmDBKrctyNK6L X-Received: by 2002:a2e:6390:: with SMTP id s16-v6mr1041988lje.15.1535904282836; Sun, 02 Sep 2018 09:04:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535904282; cv=none; d=google.com; s=arc-20160816; b=Qd6BynEiOjhIy3D+BARs6z1RtsTRqq4aOHuas2FEUK+Lp6ASfwsh7UQTE6/Vkow2tb GHGXZ46r2uvy2MzcqKQBGLK5TIfvzX7dndGmy6PoAOyU7YPVUesiZjVbI/RZ5uzHcg3u YVG8WcyQja7GmpF0CLwvUqmz1ZkvO8c2p/o9qoaPYqmeR+74OM4aweoaKl2gQlBf7YsB kd/FD25rpNLMdWGO7ojUXhtsVOpdTfBWrCTpdbequTN20Ks5oB9cLFb8wBbSyXAJcF3r U3O3WfAgnen+TWRIEXkPqUgsBZG2xnJYgCqarq56fQZpZqlCFWZyp6G4q130EMj+JiHD 1vww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from:arc-authentication-results; bh=9plQSG0ORihGYvtCa5rIKLvblYa9WyV8BpfKO9vhdmk=; b=rMBRkkeHysa9z0tUcWUrufnqZ26ifhRcQA6/zgT3dzYBK6h7EwbF3Osd3ysyaSlhkE cY0ywynFFO/UkS/Pkm0mATKfVN+Xk5R6snC0WFBKYyS8t7qOYiIXSIMtxN6YdjaKjrlG QSg77zrAusSu7DoCWuR/B2eEWHhiDdiRBo4Yu9Gt2qTFCYEVxiySlp3dIwsZXcOSdzYE ZkOj39QFzJ5OcS9848i1kXV/ZJZolgF2s3gsMIQnaBO0tiIFXd5qrecUA4cdtfoIh+OV 5ZsVCPwwzsH2MBZC0SQAF844JFuonuXU874erdt8ZLFkL2icXJl/afDeYnGQQ3rdwir1 QRUw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id q4-v6si437182ljj.5.2018.09.02.09.04.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Sep 2018 09:04:42 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id w82G4gI8013703 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 2 Sep 2018 18:04:42 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.32.125]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w82G4fqq004352 for ; Sun, 2 Sep 2018 18:04:42 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 4/6] dkpg-base: Clarify dependency logic between package recipes Date: Sun, 2 Sep 2018 18:04:38 +0200 Message-Id: <4fe5c52f7c005d9508a7d15341fca2592a17df9c.1535904280.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: +nUGuEYVpsGg From: Jan Kiszka No functional change, just reordering and comment enhancement. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 84c56af..6299ef8 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -3,6 +3,8 @@ ISAR_CROSS_COMPILE ??= "0" +DEPENDS ?= "" + # Add dependency from the correct buildchroot: host or target python __anonymous() { mode = d.getVar('ISAR_CROSS_COMPILE', True) @@ -30,10 +32,6 @@ do_adjust_git[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" inherit patch addtask patch after do_adjust_git before do_build -# Add dependency between Isar recipes -DEPENDS ?= "" -do_prepare[deptask] = "do_deploy_deb" - def get_package_srcdir(d): s = d.getVar("S", True) workdir = d.getVar("WORKDIR", True) @@ -85,6 +83,9 @@ do_prepare() { addtask prepare after do_patch before do_build do_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" +# If Isar recipes depend on each other, they typically need the package +# deployed to isar-apt +do_prepare[deptask] = "do_deploy_deb" # Placeholder for actual dpkg_runbuild() implementation dpkg_runbuild() { -- 2.16.4