From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7279128154668531712 X-Received: by 2002:ac2:5bc7:0:b0:500:9a29:bcb0 with SMTP id u7-20020ac25bc7000000b005009a29bcb0mr2037667lfn.42.1694804098144; Fri, 15 Sep 2023 11:54:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ca07:0:b0:4fe:1116:70d1 with SMTP id a7-20020a19ca07000000b004fe111670d1ls904787lfg.0.-pod-prod-09-eu; Fri, 15 Sep 2023 11:54:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEfBtjMOhOqdxPuD9fdHjcJeFkgNXBhqbYPG4mcUzNeNT6W2WTXtc81zM65abpVtgs1LyC6 X-Received: by 2002:a05:6512:118d:b0:502:fe11:a694 with SMTP id g13-20020a056512118d00b00502fe11a694mr275141lfr.45.1694804096247; Fri, 15 Sep 2023 11:54:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694804096; cv=none; d=google.com; s=arc-20160816; b=rRc9aE2b4fsr6GaFN1GQ30HpGQ8DNFQ3hvjmLUp1wRQLQ7tPPnRPGn70YzYrvoPZrP 5xhlhcURIz4h5PSswGXMK2q5fHqRHkSZCEXBUGDftOsg6oSudx3+dIeAHhHrCrul7/LD 1T6KrLO03oA9+TMl8VEvg9/iBsiAVY0nt0tvoarQclyw08v7oeUxy0Tl9YGAuN9EWylp 3+LkZdDfzYYy19+wgOBuDdTqxlbLhCUL6zUmYXwssH8wAl1gqiib5zmw01jGFvKv6+DM ib8/JnBX/3r6OPjnuai6jKAwoNcenI8ZNKqr6nFu0/gK010ljFj+yKrjPKpXA2f8A1os vBmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=yroiGXFCzILBl3Oy8jOY6qsP4Uwsw2C8KMErSglYLos=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=qPEqfc1AAYv+3DWjcu0OrsCYrZH8rLt/aLx1ncFWHYmiDtSc+9dErUC+S+WKqoroM1 t3MwCO7WDzdOgAHJmqB0E836Lswq9JLdlW7wYvxSu4d+pqr0Z7jJUWG4Un6PiQwHc4le 8CpWetYXuEOOLhjAZ6NPhnGLRw13tgh6oiOsFatCB1O9NxFt4NkBp8QZACXrHgHqpvDX 6PUSl2a81Tn8YXNlHt32AiXTq64PzqR5mnENNUstk8CunIUgK9Ho+Ta5P/l6kRkxVdLi 0XgHYe3inB2aLrpo3OVamAv3axfadPLJvXCKE75EUvy6czFdBA1/J7RcnQBfN8C4zOEI sHnA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o10-20020ac24e8a000000b005009dc902ffsi344869lfr.4.2023.09.15.11.54.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 11:54:56 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 38FIsopY026150 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Sep 2023 20:54:55 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 4/5] dpkg-base: Copy isar_apt to workdir in separate task Date: Fri, 15 Sep 2023 21:54:38 +0300 Message-Id: <20230915185439.2954192-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915185439.2954192-1-amikan@ilbers.de> References: <20230915185439.2954192-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: D5QH3UBfvEzP As only isar_apt copy functionality needs repo locking and dependencies building it can be placed into separate task to simplify tasks requirements. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7b02f378..f223fc16 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -186,10 +186,10 @@ do_prepare_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" -do_prepare_build[depends] = "${SCHROOT_DEP}" - -do_prepare_build:append() { +do_local_isarapt[depends] += "isar-apt:do_cache_config" +do_local_isarapt[deptask] = "do_deploy_deb" +do_local_isarapt[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +do_local_isarapt() { # Make a local copy of isar-apt repo that is not affected by other parallel builds rm -rf "${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/*" mkdir -p "${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO}" @@ -198,8 +198,7 @@ do_prepare_build:append() { cp -Rlf "${REPO_ISAR_DIR}/${DISTRO}/pool" "${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO}/" fi } - -do_prepare_build[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +addtask local_isarapt before do_dpkg_build # Placeholder for actual dpkg_runbuild() implementation dpkg_runbuild() { @@ -324,7 +323,7 @@ python do_devshell() { bb.build.exec_func('schroot_delete_configs', d) } -addtask devshell after do_prepare_build +addtask devshell after do_local_isarapt DEVSHELL_STARTDIR ?= "${S}" do_devshell[dirs] = "${DEVSHELL_STARTDIR}" do_devshell[nostamp] = "1" @@ -336,7 +335,7 @@ python do_devshell_nodeps() { # devshell may be placed after do_instell_builddeps in downstream classes. # devshell_nodeps will always stay right after do_prepare_build. -addtask devshell_nodeps after do_prepare_build +addtask devshell_nodeps after do_local_isarapt do_devshell_nodeps[dirs] = "${DEVSHELL_STARTDIR}" do_devshell_nodeps[nostamp] = "1" do_devshell_nodeps[network] = "${TASK_USE_SUDO}" -- 2.34.1