From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6596267782275334144 X-Received: by 2002:a50:929d:: with SMTP id k29-v6mr5388873eda.5.1535813273106; Sat, 01 Sep 2018 07:47:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:8825:: with SMTP id b34-v6ls6510434edb.8.gmail; Sat, 01 Sep 2018 07:47:52 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYAF+hE98EOMwIMaOYzSCDxflqT/km2wl3m2gmlYfGiSvxtDDd9eYryqu6xBUC1pwcFOUPP X-Received: by 2002:a50:9eee:: with SMTP id a101-v6mr3159889edf.9.1535813272626; Sat, 01 Sep 2018 07:47:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535813272; cv=none; d=google.com; s=arc-20160816; b=bQtT7UflqLCaQfDOhYFZSxDZsh/V2TMH0XlGqXQefO8P6AEOC4UuHXa2HXOcSkewLY p1+tHH4P65QchjcjzVD/NdDEwrD3OhrrA//fj3cS7JlEF1mYYXA/wqhrSoe6CYzCoUm+ zjkv9LtsBto6eIjkGeArSiFuUuE5eQyJXujEoGy0TnNUkQQfNBgvuBq47Ze4jmyToz0w l3D4eOeESRmnpa7BztWjNHogu5UOsOdHS1iXg3lKzHUiYCSFCIeMxtL1dalCla7HJc+c NN3FbRKSAFHWJJilmII5uQcEROQuXzT/MZ9IXUr6d4yNS8n8PNzHkpvNb6nG1xkP5POm jlig== 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=E0MJiLFFPGcboo+a3q+vZpQxAqFC5Z3VsAalyRmg2ntTgqt37badMBESNucTfzPc9c M/N7A6PmYUe4CQ6TTNXdYszpoFq9TBLwQ7C2QWAKC6fJ9LBUoxN+WGQAsbpiybSljo8A P6D6T9WsYe8+u+WD7yg5jKGJCNh7/E02xx8m4+UxGsEFniM7x8UeC25HpeHKA8CDJpgs 0NJdnuuuOnVrxN3Iax5AN6QaTpQw6PSaj4bIlWntwjfT3ySE9tQlUCrk0yQjf51sIoV0 vYGXpJcN83rXMRme1jgBk4JW4KSuSEyaYuPfANHP9hiDo9cYl/+NVxVxpZjF9HNKbXk6 5nDQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y4-v6si410095edp.2.2018.09.01.07.47.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Sep 2018 07:47:52 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id w81ElqIg009390 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 1 Sep 2018 16:47:52 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.9]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w81EloWe011101 for ; Sat, 1 Sep 2018 16:47:51 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 2/4] dkpg-base: Clarify dependency logic between package recipes Date: Sat, 1 Sep 2018 16:47:48 +0200 Message-Id: <45c00ea5d4bd9ed859237d9b0704d72ea144d48b.1535813270.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: Ga9BnYZenVEA 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