From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7325014627589292032 X-Received: by 2002:a05:6214:1c05:b0:680:b36a:b52e with SMTP id u5-20020a0562141c0500b00680b36ab52emr12233573qvc.83.1705487870753; Wed, 17 Jan 2024 02:37:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a0c:b384:0:b0:681:77a6:9e55 with SMTP id t4-20020a0cb384000000b0068177a69e55ls1345670qve.0.-pod-prod-03-us; Wed, 17 Jan 2024 02:37:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFV0HxdVrNYr2FzX9Lx8d+zzqEZeXUzCt/6psGWShZLELCQrS6R2KGVIs6JRBOsnVFU804D X-Received: by 2002:a0c:e410:0:b0:681:77dc:bdf3 with SMTP id o16-20020a0ce410000000b0068177dcbdf3mr1346786qvl.63.1705487869712; Wed, 17 Jan 2024 02:37:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705487869; cv=none; d=google.com; s=arc-20160816; b=aEOc+STmoYXeLcuEKMvLGlOBaYOzMF/l4bfbJY06ZSdr1f3spc9rVvR9uRgb4RGjRF lN3YrihCiBjWj8Yc+PvYWL2ydsHLNkvFDwOa7WkByi7Pq+Ugfx01p3yro9Lj1LO7if+c KX0/umIUcY+a+5zj0XzohZKv+hRBeoNOt+GmUKf4/nnv+YMgVRtq6EDwRcFuxNG2fFJh eTAOjqOEjvcXixHYWgQ4ungQdp3told25CBdRAr/btwm1pccrV4EAlKdcLK8nyfvgoIu EllMKsrzXzlaB/u5/rrbbzoq5Gt8nBIyasOApd0F8OJRB7+I332A6sVoEt3Elvw7XYCu F1AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=tROUK08ztNGMx4Qo2FBiUEtfrrEdHJ9Qu0Weg3yXG6A=; fh=y4Q4sSo60XIDMfQl4kOzeqW/gQkja1RlhaZM6hZs/O8=; b=RMXpzQw+4OxKev9Co5/kXTzsaTb0obnBoAtxb93PeSAcQfQn9yF3fPAhW50f7uUIag y9Zez9NkE6qIc2oGsOMD/PJjI+X/Xr9jPFqmYOfTTcTn/2hTqT3Bk2NG8m/ipLJ/l6uD U6/Np06Tzs85zrAKMVyDPEFMIn5IAmqi9bwfsNo0fFDsbcRohyAAh3vci/tJ2+BfVRy4 Ysf3GlwEtHSaIE1V7LZHab/JzefGtn7pbvB9E5cQQ+YBDdgn9KzsIhaLi4qEII/9yZcV h/jAUmSt2AX6gykHqMR832ZLpAWovuzt3vNlZYhr6R9MGUwsAHpws3t2V8YXZNP0irRh YgtA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="D++4/RcA"; spf=pass (google.com: domain of fm-1321639-20240117103748eb251b60c802d5db5e-btu_v1@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1321639-20240117103748eb251b60c802d5db5e-bTU_V1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id qf24-20020a0562144b9800b00680aba839c2si1124978qvb.0.2024.01.17.02.37.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 02:37:49 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-20240117103748eb251b60c802d5db5e-btu_v1@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="D++4/RcA"; spf=pass (google.com: domain of fm-1321639-20240117103748eb251b60c802d5db5e-btu_v1@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1321639-20240117103748eb251b60c802d5db5e-bTU_V1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20240117103748eb251b60c802d5db5e for ; Wed, 17 Jan 2024 11:37:48 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=tROUK08ztNGMx4Qo2FBiUEtfrrEdHJ9Qu0Weg3yXG6A=; b=D++4/RcAKFQavkkiD67yzdJEo34zi7IpOWHEO9G5oxXzRUVP327vY5vSb+Da5IsnkGcBYH eFiVrb6BbXPVUug3tXheiHRxlohla05HAiRb+yytUF2EctQvP54v/xRlSuG46uonjXNI92Ii rp9+RokQ8YE6CuggPxVcUfab47960=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH 1/1] fix dependencies of devshell tasks Date: Wed, 17 Jan 2024 11:37:30 +0100 Message-Id: <20240117103730.241499-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-TUID: ziMomONoGys5 In 21a0560 the local_isarapt task was introduced, which needs to run before the devshell. By that, the dependencies of the devshell tasks got updated as well. However, the do_prepare_build also needs to run before the devshell, as otherwise the preparation logic is not executed. This commit re-introduces (adds) this dependency again. Signed-off-by: Felix Moessbauer --- meta/classes/dpkg-base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7b054d3f..95ca3db8 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -323,7 +323,7 @@ python do_devshell() { bb.build.exec_func('schroot_delete_configs', d) } -addtask devshell after do_local_isarapt +addtask devshell after do_local_isarapt do_prepare_build DEVSHELL_STARTDIR ?= "${S}" do_devshell[dirs] = "${DEVSHELL_STARTDIR}" do_devshell[nostamp] = "1" @@ -335,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_local_isarapt +addtask devshell_nodeps after do_local_isarapt do_prepare_build do_devshell_nodeps[dirs] = "${DEVSHELL_STARTDIR}" do_devshell_nodeps[nostamp] = "1" do_devshell_nodeps[network] = "${TASK_USE_SUDO}" -- 2.39.2