From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6729358150130991104 X-Received: by 2002:aa7:d153:: with SMTP id r19mr17203531edo.68.1566800790832; Sun, 25 Aug 2019 23:26:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:b850:: with SMTP id k16ls5669289ede.12.gmail; Sun, 25 Aug 2019 23:26:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqyzgIuU/+Ky6U+LvgcWcCV7+EmFMwecLryzI4ZvXUcRm2vW0ek8qW8x2eebjsZqiPh7MX+d X-Received: by 2002:a50:9eab:: with SMTP id a40mr16963664edf.20.1566800790376; Sun, 25 Aug 2019 23:26:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566800790; cv=none; d=google.com; s=arc-20160816; b=fZnm3KjMFNQpHTEdI8hoJiaMIAiGdgWsKvwOGdj0ZCn0eLfssIZ8ykyN6fYq5NZFr/ WY8zh22fA2/viULl2YjUQEMmQNX8343F+NGY0z2X0eUGLQSxreYtLk2DuYRPMo1Hqmym /KqzsBG5QBqBSzfwbRvOUdBjWU181A636dbA3N+JYBPdp2urwvAKcnY7QpZFZKWIuvPq Ju3Gfk2dwm7p7c/qdV33N4vq2Hwpke1tlapvHQxiL7SdTG3iwJA0SuS3T/KCn0yzotR/ JFDlu9avT3J/lJ1WomrzAA0NTcbpJnpYEYrJzmu+RVdtMYWTz7NlPsoL3S9JDawJD/53 2KLg== 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; bh=z4PtSBDFOMO22eoa7EBDagkxEySSLc5VbIuasXKO++I=; b=Ge2mcOsEtrOojQvImo46wRIJBxBnc1ZN5Ew+n1ilwEidyAaTJ3UPu8c+cOWWYbY7CM FPkb2nGHE49slxijqHpN+MtXbPYu/7jjuVAxly+kHyjEh2qHnmCRJU+HQZLmbUkflOVd kCZn1jZVxex9ZObX+1et7ojrFS2LyAwBhdkcdzkn4VSjxR7h5zXe8nbQGSr5TvzmPzHw GphsPBGFFfmpkLsXykFPJbZOJAEJCdcJPGzjsEQsjLvR/+7CzAHYh8UVJe7qwje8TaZk 1H4q6FPFr5ZXnVSZHoIztgcxVeyX9omXIX30xSkVOYoH8iw5hXjptp0oKJfyPlqVsyLx /qdQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id d22si434999edq.5.2019.08.25.23.26.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 23:26:30 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x7Q6QTKN013595 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Aug 2019 08:26:29 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.99]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x7Q6QRH0015165 for ; Mon, 26 Aug 2019 08:26:29 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 06/26] dpkg-base: Free do_build task Date: Mon, 26 Aug 2019 08:26:07 +0200 Message-Id: <398eba53daf5a112a221ab2024b00a108109b3b2.1566800787.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 31uTTkpz9zg3 From: Jan Kiszka Rename do_build to do_dpkg_build so that the build task remains virtual, just like it's common practice in OE. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 10 ++++++---- meta/classes/dpkg.bbclass | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 8146328..50df06d 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -18,7 +18,7 @@ do_adjust_git() { addtask adjust_git after do_unpack before do_patch inherit patch -addtask patch after do_adjust_git before do_build +addtask patch after do_adjust_git before do_dpkg_build SRC_APT ?= "" @@ -63,7 +63,7 @@ do_prepare_build() { true } -addtask prepare_build after do_patch do_transform_template before do_build +addtask prepare_build after do_patch do_transform_template before do_dpkg_build # If Isar recipes depend on each other, they typically need the package # deployed to isar-apt do_prepare_build[deptask] = "do_deploy_deb" @@ -87,7 +87,7 @@ dpkg_runbuild() { die "This should never be called, overwrite it in your derived class" } -python do_build() { +python do_dpkg_build() { lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", shared=True) bb.build.exec_func("dpkg_do_mounts", d) @@ -96,6 +96,8 @@ python do_build() { bb.utils.unlockfile(lock) } +addtask dpkg_build before do_build + CLEANFUNCS += "repo_clean" repo_clean() { @@ -129,7 +131,7 @@ do_deploy_deb() { ${S}/../*.deb } -addtask deploy_deb after do_build +addtask deploy_deb after do_dpkg_build do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb[depends] = "isar-apt:do_cache_config" do_deploy_deb[dirs] = "${S}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index df47ced..f5396cb 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -11,7 +11,7 @@ do_install_builddeps() { dpkg_undo_mounts } -addtask install_builddeps after do_prepare_build before do_build +addtask install_builddeps after do_prepare_build before do_dpkg_build # apt and reprepro may not run in parallel, acquire the Isar lock do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 12d8d9c..c045b89 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -41,7 +41,7 @@ do_install_builddeps() { dpkg_undo_mounts } -addtask install_builddeps after do_prepare_build before do_build +addtask install_builddeps after do_prepare_build before do_dpkg_build # apt and reprepro may not run in parallel, acquire the Isar lock do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -- 2.16.4