From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7095678487044816896 X-Received: by 2002:a05:600c:5022:b0:394:5caf:2b46 with SMTP id n34-20020a05600c502200b003945caf2b46mr22064614wmr.156.1652091395497; Mon, 09 May 2022 03:16:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:500d:b0:394:77fc:d6b8 with SMTP id n13-20020a05600c500d00b0039477fcd6b8ls3665652wmr.1.canary-gmail; Mon, 09 May 2022 03:16:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzb4eITJDFh7hEV8mm8voVSmGPSS4erdI5f0sh0Qmt+Rvb9M5GNYcCEuwP6VteHub1c6D/C X-Received: by 2002:a05:600c:4ecb:b0:394:5be7:791d with SMTP id g11-20020a05600c4ecb00b003945be7791dmr21453216wmq.151.1652091394542; Mon, 09 May 2022 03:16:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1652091394; cv=pass; d=google.com; s=arc-20160816; b=X2DlS9k3Qy3075un6oPgUw0fd2m/gPDvEt41omR+mm2yq95BhOT0ZbGZSEpPUA8hjb ic+9jXmQVdaipaZMbU7f8ditMPN/VaoNXFfoDTe021SZqf+4QJwQVqv0fy+xUXqJ/jR1 QaK4WX6LHw6oKdhG+vDbMiT+gHeX4UNaqnVWt4aI1NEQ/w7543LM6mscN1XI6sKn2Kvd l+zlUJyJgj8RD6VojgmyAtGl/q0yHAA1pG/5X8PZoGx9p6dDZWXQMC19LIw80OCxMeGa IRXw+aUCom4c1LyIIxsb6Zd9TD0V0FugK3XOd0TiiOpAMa448dic0O4FTroasqXGzBbX 4iRA== ARC-Message-Signature: i=2; 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:dkim-signature; bh=edMSbgG37op+oRYu6k3XGgg+sBW5TWKc5O79lNuK8dc=; b=FhMCM+RqTzXZDjJOlVwXTHPvthy2g8yMv1DiDiIVyYxm8xzJ0Lp1X/QsHP3E+n4Sts TBm/El8D11y9SwjAFD52PqT0Dz9jB92uGQ4FrKcDAYdf1c5n3n/opPHUfqMBn2bu+zxU MwgD78a1OFg50H6un8uKsVpP5ii4r+Wsut1DzXy7efCc7og5GA8UsHcNHxHHTaOFUbX1 wkAE4zIkqG80xYnmknDMtF9J7E4iITlUSHkzVoObbkDIc3Zv4N/7/r5WeM4HRip5EQsN kETScbFePmshyXdOzMvOd+V8MEgUlNTwdAuNQJWiC+EygMm1pU9+JAomW23JGaya+SqW +UMQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=D9KKrKRR; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::62e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2062e.outbound.protection.outlook.com. [2a01:111:f400:fe1a::62e]) by gmr-mx.google.com with ESMTPS id bg21-20020a05600c3c9500b00394803e5756si309193wmb.0.2022.05.09.03.16.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 03:16:34 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::62e as permitted sender) client-ip=2a01:111:f400:fe1a::62e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=D9KKrKRR; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::62e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DpApfoYdkAJ5vjkvTbBEdDckgx85ju7U1iHaY+FL4Mp8jYEmzlE+AREcwjg1ma+CJuof/CH75LaJF1ERY2wFxtQ4pWWVFO9NY/Kip/loxRTVjbPJ6RTdhKUAmzDS1TUCnf8XqJmzMKBsmA3zcQ6Jk/jTolHDwK7MfIAwRjdz3P+1sXFC6L8gwe4phWDMHytEgXf7xkFkvy0KnpcVUPLIeWAAyE2r2efgOXg3m+W8pkyA+mi0VTFCxY/s8PHBhSk2IfLjI6YeAsRJhHwjRrhrhC1pqXB9K3WvcpbrI4FzXWfA60NBl3QAkZosivdrotcF3p3bn6FTzky5nzEK8kQBJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=edMSbgG37op+oRYu6k3XGgg+sBW5TWKc5O79lNuK8dc=; b=RwDHURWsJA15/CbWNX5VOs0kYcmOTWNyDmnpEqQhmvP3pBCTWKB0oiOOKSM3/RocKNqim4cYPGZNTtj/hnD5M5PUKpaKA9llAb5H20X36CFgR23TFC+J2FLSFazh207HhzRE/w8U6g9PHd1PQgr9wZWQgVdCYcXXm3Dgo5LKK1Fx+mU7cfPzFIfq4Iiw8wkIOuiz4hms7znUHsR5v0FACZqPuRhRFwvRoXWjsqeFh/C/cNfI/IzDgP6CSfBnzDOygwN8T4jEtP9ATPaAaY8TrfRpHkm6FzDtTnd0erLupS1MZLqamFiOfUrAjaeO3dWz2M/QQbZCrBcjg01K1FA06g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=edMSbgG37op+oRYu6k3XGgg+sBW5TWKc5O79lNuK8dc=; b=D9KKrKRRm8mhxeW/k4m4bZWcgakBvc/Ea5p9zTfv4MwTenmGHJncjDB8WpC0BodbepFoI5AwF+nku+UeU1qhZNmOL8J/hX/dDRep3YMmmHlZPAme/wRLwrIb/JNVhARAwXSru8HBVl/WgOuCWguxjW40rO7o7wVvaldBuXIW70fHnHw7kSD+RgaubRX5D05jw7FJCdg1MHYmqgZ2umHFcSvWvTihJNj+d6gKATEveOBxa7TKZX04SUfnPaNqoqmjLrzcCItdep+ctpnVSIugNmLobgplQTEdO/iE0k3iyexcBaaBy1aMdgtH7POOiSm2YRAeYQj6QJ8xoTpVXuOrlA== Received: from DU2PR04CA0339.eurprd04.prod.outlook.com (2603:10a6:10:2b4::18) by DB8PR10MB3580.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:138::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.18; Mon, 9 May 2022 10:16:33 +0000 Received: from DB5EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:2b4:cafe::6c) by DU2PR04CA0339.outlook.office365.com (2603:10a6:10:2b4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23 via Frontend Transport; Mon, 9 May 2022 10:16:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by DB5EUR01FT061.mail.protection.outlook.com (10.152.5.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Mon, 9 May 2022 10:16:33 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 9 May 2022 12:16:32 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 9 May 2022 12:16:32 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 4/7] dpkg-base: refactor dependencies of apt_* tasks Date: Mon, 9 May 2022 12:16:01 +0200 Message-ID: <20220509101604.3249558-5-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220509101604.3249558-1-adriaan.schmidt@siemens.com> References: <20220509101604.3249558-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: adriaan.schmidt@siemens.com X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 563d26af-2c62-4e30-5f5d-08da31a4fe39 X-MS-TrafficTypeDiagnostic: DB8PR10MB3580:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: neRdVuhKDEQybUGtxH6oZyJYirGq0Pa/c2bNusUTFEzM3vNUUmaTI1Sas6ZNKFAJvYUlulrDMAysmFxpdLMCBr52rk8kfSaLOWEt7plxcYDCcXZ8r7OFx4PLFk6T0D9PwQkvGiXQYDM0A/yOxq2YW5AnBCwf/O6VSpetmXU9XfDUtAsevaeomqDFqGubBgqhjaK/aUy3OYW7Fp6pzieArTfLogomcGSE7aa/FqiHfjlS0gypvy/+DjX00hZyUShZG5sniPNmu2JinMnlTnZONFU4UGhF2EJSqZ3blzAC85gXUh74ZFnEw3mBWK98ht8h1N20Fm0D4/sNsV/LQZ5tuBE5nY9lvgreIwQ1j2Js/4dpfMd0hRicmlGk8o/E1O5n8xxAG+uuppxoSCnXGbeh1jAGr6l7MNuTzueGopOekcy0XhMmRqSRwR52l8RPcdiHKor88eITLV3CfAgZBAd/zwQx23ic5Xb9cKOrBLz4NSjeFuQIIYYvUhOoKSykaGHHfR1CEDb9tgsUKa4X4QulWvulOAYn/MP15ZLVzE2z1kMw+Z/nTtYGZxFJIIMYm3ad9lD5gunHATnwAXcf+nvXFYZYwi0ErlZeSnl3R+4lgHYFPPJQdRNwF6uigJMH5itgPfO4jCiUQB9BWo12oaOw3hp1qzQwfFx7emvYpFUC8we41u4nKHdEEohekTvvT2qS6zBpwEQ8F9PKDlbZcdNMmg== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(82960400001)(82310400005)(6666004)(81166007)(36756003)(356005)(336012)(508600001)(47076005)(40460700003)(36860700001)(2906002)(5660300002)(16526019)(6916009)(70586007)(70206006)(26005)(8936002)(44832011)(1076003)(4326008)(8676002)(83380400001)(86362001)(316002)(956004)(2616005)(107886003)(186003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 10:16:33.5135 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 563d26af-2c62-4e30-5f5d-08da31a4fe39 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT061.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3580 X-TUID: oKBqpKEThNDi Only recipes with `apt://` sources in their SRC_URI run the three tasks `apt_fetch`, `apt_unpack`, and `cleanall_apt`. The current implementation creates the tasks (and dependencies) for all recipes and sets them to `noexec` if they are not needed. It turns out that bitbake doesn't generate sstate signatures for `noexec` tasks, but carries them as dependencies to other tasks, which can break analysis with sstate-diffsigs. Also, I suspect that `noexec` may not have been designed as "optional", to be added in this way (OE never does this). The new implementation only adds the three tasks when they are required. It also: - removes the dependency of `apt_fetch after do_unpack` - makes `install_builddeps` depend explicitly on `${BUILDCHROOT_DEP}`, a dependency which was previously only given via the `apt_fetch` task. Signed-off-by: Adriaan Schmidt --- meta/classes/dpkg-base.bbclass | 14 ++++++-------- meta/classes/dpkg.bbclass | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 86933c57..fe6d46dd 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -95,10 +95,9 @@ python() { d.setVar('SRC_URI', ' '.join(new_src_uri)) d.prependVar('SRC_APT', ' '.join(src_apt)) - if d.getVar('SRC_APT').strip() == '': - d.setVarFlag('do_apt_fetch', 'noexec', '1') - d.setVarFlag('do_apt_unpack', 'noexec', '1') - d.setVarFlag('do_cleanall_apt', 'noexec', '1') + if len(d.getVar('SRC_APT').strip()) > 0: + bb.build.addtask('apt_unpack', 'do_patch', '', d) + bb.build.addtask('cleanall_apt', 'do_cleanall', '', d) } do_apt_fetch() { @@ -117,11 +116,11 @@ do_apt_fetch() { dpkg_undo_mounts } -addtask apt_fetch after do_unpack before do_apt_unpack +addtask apt_fetch do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" # Add dependency from the correct buildchroot: host or target -do_apt_fetch[depends] = "${BUILDCHROOT_DEP}" +do_apt_fetch[depends] += "${BUILDCHROOT_DEP}" do_apt_unpack() { rm -rf ${S} @@ -142,9 +141,8 @@ do_apt_unpack() { dpkg_undo_mounts } -addtask apt_unpack after do_apt_fetch before do_patch +addtask apt_unpack after do_apt_fetch -addtask cleanall_apt before do_cleanall do_cleanall_apt[nostamp] = "1" do_cleanall_apt() { for uri in "${SRC_APT}"; do diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 320102ba..af833536 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -26,7 +26,7 @@ do_install_builddeps() { } addtask install_builddeps after do_prepare_build before do_dpkg_build -do_install_builddeps[depends] += "isar-apt:do_cache_config" +do_install_builddeps[depends] += "${BUILDCHROOT_DEP} isar-apt:do_cache_config" # apt and reprepro may not run in parallel, acquire the Isar lock do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -- 2.30.2