From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:adf:eb8e:0:b0:22c:e009:a201 with SMTP id t14-20020adfeb8e000000b0022ce009a201mr59654573wrn.70.1671202152415; Fri, 16 Dec 2022 06:49:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b27:b0:3c6:c1ff:1fd with SMTP id m39-20020a05600c3b2700b003c6c1ff01fdls3232874wms.2.-pod-canary-gmail; Fri, 16 Dec 2022 06:49:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf5F2wivox4wMdnO1pJ2JuYlD5E9nc++YZLeXRo6DqKS8FpU2AmIACY1nJMZqMaa3ZAaXoYF X-Received: by 2002:a05:600c:688c:b0:3d0:73f5:b2c0 with SMTP id fn12-20020a05600c688c00b003d073f5b2c0mr26116427wmb.20.1671202151395; Fri, 16 Dec 2022 06:49:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671202151; cv=pass; d=google.com; s=arc-20160816; b=rtZ+4/7LlRR0Zqc+MecbAgpoiLJGvnKw4/fkqIytksBLDn3rCvrIcdTOU+auYaGn5D YRdEfjKnLnKGgcAaZfcRaZFvNKsfzanD/WmqepANHDpqLtzw6zkXz6dajYjOaApdXdCM 1WFHQxk02/uAJM/P4LHU+FZSjnrR95Jh6CgrhJuqy/ibpXOH4vt1MHA5MdYB4xVlCnRz ydN7s8neZhdpUl50o7/4lAW2oOgWZGbrLPRdth2b+9+atJMMHOqCdp7Z8qR4Z1FX4uK+ eZ1hcm4BgoEELc5Gady/5FEt3VrwpyxWHn/LEUD2wLn9VXEJM1LtaOQ0x4ywAOJ0fsiI hZfQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=iV4XXrbG6umM7s0KFGttg6ZUwqD07k4WWtxcqgAv9G4=; b=g1xzuxGlYjmuOhNVyVuaMv6vKxcwhiWtVpteecO3y3zt4fNa18I6J4iVB/2Rv3Wzt3 lIxC+ZruUfXxYv5Wxg79Y3UgbTBq/PbIUgsu6cOCdiS436x0NGUTRb69WqE2cw5nEZyO bcwaS6Rb+9WU1h3SVz2wRStnd+EHRu+7xVIV3rWaJy8xSHawOJYifR6noK+mF+QL2cG4 sIWjuctg3zLFckPw8rP/vD3k/jBY2ICP7zJ6eVwX/NkLY/zEU5m5F9m1E87bmia5Ceji DCXhQC5KAl4gmO+g+2lMrdipBsbQTNQW/TI7TB0TBlQGGCh+upmbkYvgH1SSuLd78fqT CdZA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AAU1TgyV; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.104.80 as permitted sender) smtp.mailfrom=henning.schild@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-dbaeur03on2080.outbound.protection.outlook.com. [40.107.104.80]) by gmr-mx.google.com with ESMTPS id n23-20020a7bc5d7000000b003c4ecff4e2bsi127588wmk.1.2022.12.16.06.49.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Dec 2022 06:49:11 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.104.80 as permitted sender) client-ip=40.107.104.80; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AAU1TgyV; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.104.80 as permitted sender) smtp.mailfrom=henning.schild@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=JKVpRm/H86s7FcC46IuhP2bKnMFjJXn+o0kijsqHc17s2YXSrXYiq5N3Fq9NykrXMaauC/LxqvOdVrikEUeNAymxy9lODtDziUMCk1+8xWXoblNdwOlmKXFHVw3eCfoiHW0Gee8fn/RTZuy+JFyDP2kDssDV4W2xglDViQYmD/2sZbAW+PSwgt8BNObARqCf7pbDT2k7lnujw/1dTqZbIsYtoLwSrgRK1bI9c4zXGPQRnRfSp8l3oU4XpwG7Llg3iUAt/jckbuCh830CXIHJWBrINh3Rqa+TxWW7tglKyfvWuQS1jphEzCDA5BWzc3It6xlqR8ptJpXolegkdxlZNQ== 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=iV4XXrbG6umM7s0KFGttg6ZUwqD07k4WWtxcqgAv9G4=; b=JqSrikiWiQH0Gh4uy/rgXz4ttWhjJ/CF5c6qTG1HBb3qj2pmy1+rJ8t6GUMEc8KxCfmjRFX/YRK8WGH2nbuCaJB4p22YhqWWeJLnb4fCl+nmtDTHr1NT0jXKfCnVjAMUIlRQB9kk87EHj5QJ/UFUX4Omj45GoBVztqEynFN23D9YIjbpBXZVDWVaCp6zb3rRo1a0dNtZ/z59+jS8vdMOVTVWFxrC5behVuDDoQnXKWBi1uiK/0ThuNmzBZXOfMg1MrnlueHyR1jvl49ALqYfHBgs8KQy5LJV8oF2hdBWSNRlC6UR5+qLlClKd1W1XuzrO8KFHVn1tCUJWl5p3BPAsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=iV4XXrbG6umM7s0KFGttg6ZUwqD07k4WWtxcqgAv9G4=; b=AAU1TgyVjlRz0wNSR8pChJmrLAa76urmZYh97nnvoFiFy0gPhfCBDFWhNVWvNXw6+1WVGNJgWxoUH7OiNWBgduSZnOvQ287NG3LY8ORB8hdf1yAWLXbsc9hO5e0y53HV398e0D5NICOLD4ZLiKv0PJl03YZfjczo6HJua9imwl4kXWJp60R3X1LXr+DFWSVmBZGn68PLllyUxy4o5ASRESCMnGty83h7n7OZZOa5WvjOo7jfBWz1mBX1Hn19vMgQ8edjE0//gs3++nzfY6BXIwkas9JGB4wqRNfnoEWzSxmoCY6lOdCJHBladTqphFU38IPookXPGk3TaK2/onI1OQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by DU2PR10MB7816.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:49e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.15; Fri, 16 Dec 2022 14:49:10 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79%3]) with mapi id 15.20.5924.012; Fri, 16 Dec 2022 14:49:10 +0000 Date: Fri, 16 Dec 2022 15:49:01 +0100 From: Henning Schild To: Anton Mikanovich Cc: isar-users@googlegroups.com Subject: Re: [PATCH v6 10/21] meta: mark network and sudo tasks Message-ID: <20221216154901.34c1c2bd@md1za8fc.ad001.siemens.net> In-Reply-To: <20221213125305.10984-11-amikan@ilbers.de> References: <20221213125305.10984-1-amikan@ilbers.de> <20221213125305.10984-11-amikan@ilbers.de> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0444.namprd03.prod.outlook.com (2603:10b6:610:10e::12) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|DU2PR10MB7816:EE_ X-MS-Office365-Filtering-Correlation-Id: 370675d2-9f0a-4d6c-247c-08dadf74b0a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qVuTtmf/HzjPEPY3CnpgOFnBMjn37g2xfBnv1THTr1MCyLjFp2B7jBSDsXxoecLBma/bjhWI1phFAspgK/MinTTryLXIbd67LgGq2Fgj/Cs0/ME717gpKUYdDJCRCoPtckrn0DXF/imp8QUr+tTO+21R/mnKXtwdk2Nox9YkKTxFX2OpTLLBMtzhV6Gh3Psv9RpQjWZVuqTwWm1xYAePjmMsXJ2VoH0XuxUzx/LBDIXF1hMGnB2HRzn+U9pfs+4WelwCoFIVBkgwEDva9DEnVknDoS8UkXLi/8jDHYkowAb1uWB9nicVdjYQer2PjTqvYGLoVDmKYAiz4Zkjf+p1QcMZuw1iZcytiI9AzmHp/Ik/Qz9GHdmOniuEFHCUVDA/EDK6xjdYFUgtfszqheOfn2s9jFNpoupFFJf4ak43FMPzVUdVhLu+WgsfLQ7LaqFBVug7e06CA9a3VMZJttBx0s69qwmdZix9mHTdurEWfiUW6K9PW9K0HtEy0lJFVnqf7d9ILisyHQTPw55AaAunk6FSil3P2ulJtdrapoWl5DrKe6x/WNVbAHyc3QEqqJ2CcPjp+Ynk6xAlVVQfeC9MsTs6twSVSSnW0DIwOKevB9/NtkSLZMR9Sawkg/7xrabjXos0Ydkxy639bFgIvoU0RztFba/1E0sA8pvzBoAVlmlN6vSrVXn5FEeGHdUOOcyj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(396003)(376002)(39860400002)(136003)(366004)(451199015)(83380400001)(1076003)(478600001)(6486002)(186003)(6512007)(9686003)(6666004)(6506007)(86362001)(82960400001)(38100700002)(8676002)(66556008)(66476007)(8936002)(5660300002)(41300700001)(4326008)(66946007)(6916009)(316002)(44832011)(2906002)(30864003)(66899015)(403724002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Q0eV4iBvo8SOd14pOIPXTwo4l1Pa1OLwIlV9IvT9xAyR5e23be6FjG9ES8YP?= =?us-ascii?Q?rOWwT3UqAJSNsJXXjYxe1YCPFxdp3Xg4baYOAg53w4YwT+6rhzWA2QIQD8yN?= =?us-ascii?Q?CdKhuZeiaZh0vMxDge22egruAwTb5EuABGgdvaST6446EkQka62zda2xbPzL?= =?us-ascii?Q?BjlIvmbW5sv2kjA4giduz5zukseZA3f/PaFqUKW6kNWD70udWpfN7lJ2c7gw?= =?us-ascii?Q?ivkZckmHby3lrv+L4B9xaVdC4EDFgJqbV/EmwmY+7GZJ2zlYwU2u90I4BOTp?= =?us-ascii?Q?LF2n9RMYfJSYX+f+CrmS+19XKW+COhEm4XJSN9TeP1rrTV/NR6RWaJGaBOdN?= =?us-ascii?Q?oNx/e9h+w+TxblF76Q0N/+4lr6T1xE0OSho6+R6VqvqX6pBAKhHe5XlSbelU?= =?us-ascii?Q?PzIesaOfeq7U8thyaYCdRsTbExI+rPyC8+/YvELGCeOAx0UPCC4I+n1RrjC4?= =?us-ascii?Q?aJWn2Y2NCZlWVU9TwOo3SoRxjRIblOGSN5XHz/UBxHYYC7uvGLNATYR59wAm?= =?us-ascii?Q?q6kjQQBkAV8g3NfBUz2tRPPQwUkBo561Bfwt9PNr18mD/2p1W6sMHxijHDKG?= =?us-ascii?Q?O7lUyYTItYsrTGKhiLOoREKfY679J6Y/AzElAcDXNQB/Yk4EwSXEQp4nB4h/?= =?us-ascii?Q?t21HYxvLQOb7qqm5RsucWEYfFMx/xf3p0t7Drhfd95cDuVKGP85ms6N81KsN?= =?us-ascii?Q?9uxHz0tOaszFJdxgULvyvLjthiNwO8ADP8bQLFEehirQYcskEs13eeWrBMw9?= =?us-ascii?Q?dRNcVRh90ItmV3weLWbL4DAOpxyJKlR2+vDtgSqpRAT5Go1LD8ui0xTttDRB?= =?us-ascii?Q?fzB6HaKjSbp9+FCMbhhwgrwihVUVclj9QcJwePv1IT7BRi4jLHBTb91WuPuO?= =?us-ascii?Q?tQDrTnUvRaTITY3frzmatYJet4sriuLZN00dveCDLC0+UnocLqQl6VPJPMqi?= =?us-ascii?Q?VEGZmYrdRji+ggu7jmN1kiUYoFZEt7bCgdnUrK7FRD8Tk5qbNFAeKoTj9E2q?= =?us-ascii?Q?sVJCCRdyCsks+LRTKaYFCsnVv3eCl/yQgpxzB+FYhuqEFy4gYK+FRzehSlZz?= =?us-ascii?Q?VaBuR12WzeIyC2VGhAQV3Pygl81ouxqQcZX8UEdDdn/hnCTdZNp7jT6Sp38h?= =?us-ascii?Q?0wFBnX2Xs92fB6dtk53CUY8W4huXzUlekxpIqXUNWkEHRGWvvT31BBR/q9xk?= =?us-ascii?Q?llpszLPZS22igyIuj3uotCU0ckRNJZDMNc4fcmIadm41RLgh/pyzBMxKoEdQ?= =?us-ascii?Q?Jov2gDPGINj+Q6Jbjvp/7sIZf/gP0OaTN0FEKgmK3XyddgJOsjLoDrBVQ1xn?= =?us-ascii?Q?siFyMFuk94HQZtosrVDLTO8al0IKyMCV1jXtg0iuho9XxYwZTyEystQTATD7?= =?us-ascii?Q?+6i1eIbXT3dWmTVssCxgxSzJFjfcZaPBDRxBrQQSWNghMOXSW88E0jpGIl4S?= =?us-ascii?Q?+0Wf/Qv0kc1eYhZVxhDwxhrZcHCwICdALG5ut77U/wrDZp/ga4RiKkE0fAks?= =?us-ascii?Q?AQIIknXw+l1Pic7VE13jrVyNLz69iQIk2kE27mdf6mvn7TQGzPOTguJeOrl6?= =?us-ascii?Q?gkNCAW+PI6nbbiHiRxvyMSfzYP63haNhH0kEO6Ym2LoQOn+viPAyCJbCmXhd?= =?us-ascii?Q?S0P2fqSQXCys3LJdG33LemPoaBPNOnK/+VUvJqH4nnr/lwpChpJNGW38H4WO?= =?us-ascii?Q?JZue7w=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 370675d2-9f0a-4d6c-247c-08dadf74b0a6 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2022 14:49:10.2037 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lvO1nBlHoyAJKFelQv7zed3RYwxpd9bV1sE6CqAjZVhV2G/wLyVPsMQarEi2LW/BgPsySAxH8qD0LLiKyQBccyzzCwlTQaythNh/2wOQwJ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR10MB7816 X-TUID: eZaBqOc0LvXl Am Tue, 13 Dec 2022 15:52:54 +0300 schrieb Anton Mikanovich : > Network access from tasks is now disabled by default. This means that > tasks accessing the network need to be marked as such with the network > flag. Will these tasks really somehow be blocked from the network? We do use BB_NO_NETWORK in several places. Especially in isar_export_proxies we use it to block network with a deadend_proxy. That might not be needed any longer. Any maybe we find a way to automatically call isar_export_proxies when we set [network] = 1 in any given task. Otherwise we kind of have two lines marking a task as network user, and it is easy to forget the proxies since not everyone has to deal with them. Henning > > The same marking is also required for the tasks used sudo. > > Signed-off-by: Anton Mikanovich > --- > meta/classes/base.bbclass | 1 + > meta/classes/dpkg-base.bbclass | 6 ++++++ > meta/classes/image-locales-extension.bbclass | 2 ++ > meta/classes/image-tools-extension.bbclass | 1 + > meta/classes/image.bbclass | 4 ++++ > meta/classes/imagetypes_container.bbclass | 1 + > meta/classes/imagetypes_wic.bbclass | 1 + > meta/classes/rootfs.bbclass | 5 +++++ > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 ++ > 9 files changed, 23 insertions(+) > > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > index 8c874f31..109029b9 100644 > --- a/meta/classes/base.bbclass > +++ b/meta/classes/base.bbclass > @@ -183,6 +183,7 @@ def isar_export_ccache(d): > do_fetch[dirs] = "${DL_DIR}" > do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" > do_fetch[vardeps] += "SRCREV" > +do_fetch[network] = "1" > > # Fetch package from the source link > python do_fetch() { > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass index 260aa73e..4bb71617 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -122,6 +122,7 @@ do_apt_fetch() { > > addtask apt_fetch > do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" > +do_apt_fetch[network] = "1" > > # Add dependency from the correct buildchroot: host or target > do_apt_fetch[depends] += "${BUILDCHROOT_DEP}" > @@ -129,6 +130,7 @@ do_apt_fetch[depends] += "${BUILDCHROOT_DEP}" > # Add dependency from the correct schroot: host or target > do_apt_fetch[depends] += "${SCHROOT_DEP}" > > +do_apt_unpack[network] = "1" > do_apt_unpack() { > rm -rf ${S} > schroot_create_configs > @@ -242,6 +244,7 @@ def isar_export_build_settings(d): > os.environ['DEB_BUILD_OPTIONS'] = isar_deb_build_options(d) > os.environ['DEB_BUILD_PROFILES'] = isar_deb_build_profiles(d) > > +do_dpkg_build[network] = "1" > python do_dpkg_build() { > bb.build.exec_func('schroot_create_configs', d) > try: > @@ -292,6 +295,7 @@ deb_clean() { > } > # the clean function modifies isar-apt > do_clean[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" > +do_clean[network] = "1" > > do_deploy_deb() { > deb_clean > @@ -343,6 +347,7 @@ addtask devshell after do_prepare_build > DEVSHELL_STARTDIR ?= "${S}" > do_devshell[dirs] = "${DEVSHELL_STARTDIR}" > do_devshell[nostamp] = "1" > +do_devshell[network] = "1" > > python do_devshell_nodeps() { > bb.build.exec_func('do_devshell', d) > @@ -353,3 +358,4 @@ python do_devshell_nodeps() { > addtask devshell_nodeps after do_prepare_build > do_devshell_nodeps[dirs] = "${DEVSHELL_STARTDIR}" > do_devshell_nodeps[nostamp] = "1" > +do_devshell_nodeps[network] = "1" > diff --git a/meta/classes/image-locales-extension.bbclass > b/meta/classes/image-locales-extension.bbclass index > 0932630f..d5f66ec2 100644 --- > a/meta/classes/image-locales-extension.bbclass +++ > b/meta/classes/image-locales-extension.bbclass @@ -27,6 +27,7 @@ def > get_nopurge(d): > ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT += > "image_install_localepurge_download" > image_install_localepurge_download[weight] = "40" > +image_install_localepurge_download[network] = "1" > image_install_localepurge_download() { sudo -E chroot '${ROOTFSDIR}' \ > /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only > localepurge @@ -34,6 +35,7 @@ image_install_localepurge_download() { > > ROOTFS_INSTALL_COMMAND += "image_install_localepurge_install" > image_install_localepurge_install[weight] = "700" > +image_install_localepurge_install[network] = "1" > image_install_localepurge_install() { > > # Generate locale and localepurge configuration: > diff --git a/meta/classes/image-tools-extension.bbclass > b/meta/classes/image-tools-extension.bbclass index 101704d0..70c6eb2a > 100644 --- a/meta/classes/image-tools-extension.bbclass > +++ b/meta/classes/image-tools-extension.bbclass > @@ -14,6 +14,7 @@ DEPENDS += "${IMAGER_BUILD_DEPS}" > do_install_imager_deps[depends] = "${BUILDCHROOT_DEP} > isar-apt:do_cache_config" do_install_imager_deps[deptask] = > "do_deploy_deb" do_install_imager_deps[lockfiles] += > "${REPO_ISAR_DIR}/isar.lock" +do_install_imager_deps[network] = "1" > do_install_imager_deps() { > if [ -z "${@d.getVar("IMAGER_INSTALL", True).strip()}" ]; then > exit > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 813e1f34..e15b9f74 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -291,6 +291,7 @@ python() { > task = 'do_image_%s' % bt_clean > d.setVar(task, '\n'.join(cmds)) > d.setVarFlag(task, 'func', '1') > + d.setVarFlag(task, 'network', '1') > d.appendVarFlag(task, 'prefuncs', ' set_image_size') > d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) > d.appendVarFlag(task, 'vardepsexclude', ' ' + ' > '.join(vardepsexclude)) @@ -345,6 +346,7 @@ DTB_IMG = > "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" > do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" > do_copy_boot_files[lockfiles] += "${DEPLOY_DIR_IMAGE}/isar.lock" > +do_copy_boot_files[network] = "1" > do_copy_boot_files() { > kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz])" > if [ ! -f "$kernel" ]; then > @@ -393,6 +395,7 @@ python do_deploy() { > } > addtask deploy before do_build after do_image > > +do_rootfs_finalize[network] = "1" > do_rootfs_finalize() { > sudo -s <<'EOSUDO' > set -e > @@ -436,6 +439,7 @@ addtask rootfs_finalize before do_rootfs after > do_rootfs_postprocess > ROOTFS_QA_FIND_ARGS ?= "" > > +do_rootfs_quality_check[network] = "1" > do_rootfs_quality_check() { > rootfs_install_stamp=$( ls -1 "${STAMP}".do_rootfs_install* | > head -1 ) test -f "$rootfs_install_stamp" > diff --git a/meta/classes/imagetypes_container.bbclass > b/meta/classes/imagetypes_container.bbclass index 436a0051..ba09bebf > 100644 --- a/meta/classes/imagetypes_container.bbclass > +++ b/meta/classes/imagetypes_container.bbclass > @@ -19,6 +19,7 @@ python() { > t_clean = t.replace('-', '_').replace('.', '_') > d.setVar('IMAGE_CMD_' + t_clean, 'convert_container %s > "${CONTAINER_IMAGE_NAME}" "${IMAGE_FILE_HOST}"' % t) > d.setVar('IMAGE_FULLNAME_' + t_clean, > '${PN}-${DISTRO}-${DISTRO_ARCH}') > + d.appendVarFlag('do_containerize', 'network', '1') > bb.build.addtask('containerize', 'do_image_' + t_clean, > 'do_image_tools', d) } > > diff --git a/meta/classes/imagetypes_wic.bbclass > b/meta/classes/imagetypes_wic.bbclass index 3869525b..cb4917a2 100644 > --- a/meta/classes/imagetypes_wic.bbclass > +++ b/meta/classes/imagetypes_wic.bbclass > @@ -134,6 +134,7 @@ python do_rootfs_wicenv () { > addtask do_rootfs_wicenv after do_rootfs before do_image_wic > do_rootfs_wicenv[vardeps] += "${WICVARS}" > do_rootfs_wicenv[prefuncs] = 'set_image_size' > +do_rootfs_wicenv[network] = "1" > > check_for_wic_warnings() { > WARN="$(grep -e '^WARNING' ${T}/log.do_image_wic || true)" > diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass > index 786682d9..3f30bc2e 100644 > --- a/meta/classes/rootfs.bbclass > +++ b/meta/classes/rootfs.bbclass > @@ -119,6 +119,7 @@ EOSUDO > ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update" > rootfs_install_pkgs_update[weight] = "5" > rootfs_install_pkgs_update[isar-apt-lock] = "acquire-before" > +rootfs_install_pkgs_update[network] = "1" > rootfs_install_pkgs_update() { > sudo -E chroot '${ROOTFSDIR}' /usr/bin/apt-get update \ > -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ > @@ -144,6 +145,7 @@ rootfs_import_package_cache() { > ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" > rootfs_install_pkgs_download[weight] = "600" > rootfs_install_pkgs_download[isar-apt-lock] = "release-after" > +rootfs_install_pkgs_download[network] = "1" > rootfs_install_pkgs_download() { > sudo -E chroot '${ROOTFSDIR}' \ > /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only > ${ROOTFS_PACKAGES} @@ -167,6 +169,7 @@ rootfs_install_clean_files() { > > ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_install" > rootfs_install_pkgs_install[weight] = "8000" > +rootfs_install_pkgs_install[network] = "1" > rootfs_install_pkgs_install() { > sudo -E chroot "${ROOTFSDIR}" \ > /usr/bin/apt-get ${ROOTFS_APT_ARGS} ${ROOTFS_PACKAGES} > @@ -177,6 +180,7 @@ do_rootfs_install[vardeps] += > "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMM > do_rootfs_install[vardepsexclude] += "IMAGE_ROOTFS" > do_rootfs_install[depends] = "isar-bootstrap-${@'target' if > d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else > 'host'}:do_build" do_rootfs_install[recrdeptask] = "do_deploy_deb" > +do_rootfs_install[network] = "1" python do_rootfs_install() { > configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND", True) or > "").split() install_cmds = (d.getVar("ROOTFS_INSTALL_COMMAND", True) > or "").split() @@ -269,6 +273,7 @@ rootfs_export_dpkg_status() { } > > do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}" > +do_rootfs_postprocess[network] = "1" > python do_rootfs_postprocess() { > # Take care that its correctly mounted: > bb.build.exec_func('rootfs_do_mounts', d) > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index > b9ae16cd..aba5e996 100644 --- > a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -223,6 > +223,7 @@ DISTRO_BOOTSTRAP_KEYRING = "${WORKDIR}/distro-keyring.gpg" > do_generate_keyrings[cleandirs] = "${APT_KEYS_DIR}" > do_generate_keyrings[dirs] = "${DL_DIR}" > do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS > THIRD_PARTY_APT_KEYS" +do_generate_keyrings[network] = "1" > do_generate_keyrings() { if [ -n > "${@d.getVar("THIRD_PARTY_APT_KEYFILES", True) or ""}" ]; then chmod > 777 "${APT_KEYS_DIR}" @@ -278,6 +279,7 @@ do_bootstrap[vardeps] += " \ > " > do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" > do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" > +do_bootstrap[network] = "1" > > do_bootstrap() { > if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then