From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041881252872323072 X-Received: by 2002:a17:902:9697:b0:148:a2f7:9d82 with SMTP id n23-20020a170902969700b00148a2f79d82mr2333254plp.161.1639732257760; Fri, 17 Dec 2021 01:10:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:6f4b:: with SMTP id k72ls2954468pgc.9.gmail; Fri, 17 Dec 2021 01:10:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzccEbCukRxlyEufa26xBokwAYV/Es1t73yQnzAdQruOTiydtM9Kr5OFOs3bO8BIkTGj9DU X-Received: by 2002:a62:6497:0:b0:4ba:737c:8021 with SMTP id y145-20020a626497000000b004ba737c8021mr2105674pfb.18.1639732257099; Fri, 17 Dec 2021 01:10:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639732257; cv=pass; d=google.com; s=arc-20160816; b=MLe+OM3LwlOh+zlxDF4nk9qGfILicvi5hypP4MotydRo52Zyc/FMHbobwDtNi1eDf5 Z+GfodZhXkTMkswWpY+4YIcm1gHBN8W61Dw5cguhmHgo1qYbUi52+yDaFOCzgYMe13Cc ONfwgyhv9S4HXdsdgOXipGvO17h6djsVzOwZRg6oy9XiqGqjNxakLQ+hMWzenQX/EbSZ Wer6NUjHDBabjXH2etkUORISMMaNUdRdcLL9INbXfOeLC20jsUUEzAJrN77QeMUuJx4q 5KWNyjhTWkuhquLuPHYrEmZF380qCkTx5ZjE1gYZXA9WInL9xF+G+et6QX+7LUhPF8Pu H7Rw== 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=nNhhARRbRGOxmOgIIOdjKu354xZAYAPeb4gw5m6bvK8=; b=SPnk1GIsMIk76gRNkBNQ5e98nq7CIsc18OviVK8RaNzGnohcYbRqxPQfQOmFdzursU T6r5rGd3/teR9FXx9LSlm6ncwSMOI5jFGnfeo4tUK/tBw0BHujhSwi4/EwPKKjDNzyND 3gjOOkB2EssOsF9OjUTxuoMjb9N50b1YQLAFfLnU3iNTHqt8RxG8APP6qFdHHrWpSkUT tWjWjp7AMu4ACC68wWx1JbxvBDU6vp1quihqPtxXvdfzHVvNt69UcNC8ix/l84ZOGwxi 9py4xI9DzshugmhB67ncA/T77pYeC6UCXtsO954cxFvQzeN6ZT6AxlCOJ6+wyDpXHdL4 2HPA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=egfiA3dN; 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 40.107.22.53 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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2053.outbound.protection.outlook.com. [40.107.22.53]) by gmr-mx.google.com with ESMTPS id v7si469124pfm.6.2021.12.17.01.10.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Dec 2021 01:10:57 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.22.53 as permitted sender) client-ip=40.107.22.53; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=egfiA3dN; 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 40.107.22.53 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=UDTriFp53MFOztufGLM9+UJ9xTxsbcg8dLQO+jNP3UdZS9/05HVbk8dwVtClSzMGZirGNQksm7X/u/oIg6IOUO/TSohGeAkj0ndLLVitUDk+jWL6+of544OUPGWklHgMpvl5QmiHdgTsxe7askBSg+5YW9u36ezSQviXnMAabJPYWUjfekikGR+ppSQQfrRflSA7f9bC4tWlwnhsi2r98KXBpokdhfE6YYy2JLqQm167ih+0E4fEwNjkC2tj6U4vpnyTLi4X5oZ5lktVVWjsJMGurHClXq9SPONgFHlr8Zqe4UnFbmfYuIemhr7avddosvDprWKwTCZcIqieatxDEw== 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=nNhhARRbRGOxmOgIIOdjKu354xZAYAPeb4gw5m6bvK8=; b=P69VFIgfV216cPYf9hjiLqVwfMLbPWLMSpeJLWHWwuSmC93IyMSE+nx/BHPeFiKzytIGBTPOlRuF6rUcboHRaDtlfHCKWm1fEX3WNvWyA34pmGrphmZgkPchfPWn3VzxJuowMSw8bWMkZronFRiu+qIhCpDCPmMvcziGP2oro+GQP54gkMWYmsGGLYA6IturT/eqOdhlBqpN/Vjo4T6+6lf9Mz83TkRUHrIgrX3MMr3SVnZxi90C5DDFpiZgO5K3Dc3gKaY5MiKYmOtxcuR1rHbaxt6jlNGabZeBGt2B0v5veJSey/hqjPDXTc01QAJylzTS3VHn874n04Hk+NqmBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=nNhhARRbRGOxmOgIIOdjKu354xZAYAPeb4gw5m6bvK8=; b=egfiA3dN2jIZjrg1ghLEr7MbN9pWfDVntR/aiuHwgEkf/cFgrkHWWDSc3WTXe2PyYsGeWDm4WL7FH5r+EHWIcWQeMcr5SXruazdP1RECrt2AwGZWmkmjcALsn/fYyhO5OeKMKuuuPs4u7D4gL4F8XJwv2u2e6mb22NCTanRSmxR9WtcCN9UjcpZrs4K56L01+TWOjzTMTLHvU23DXHYVC3FnZ//BO7JmwbrG5haCcmwqoqgRkMHx26IZcDMs7SoHcN85dLFtmrmniVxIo4l9LNtoW00DPzprgRYlicCUVRmZSm2GjiMqrXKX71BQYHrdnRvbLzeQr/pUv/XjMt4MCw== Received: from DB6PR0802CA0044.eurprd08.prod.outlook.com (2603:10a6:4:a3::30) by AS8PR10MB4744.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:332::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Fri, 17 Dec 2021 09:10:54 +0000 Received: from DB5EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:a3:cafe::28) by DB6PR0802CA0044.outlook.office365.com (2603:10a6:4:a3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 09:10:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) 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.4801.14 via Frontend Transport; Fri, 17 Dec 2021 09:10:52 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 17 Dec 2021 10:10:51 +0100 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 17 Dec 2021 10:10:50 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 3/3] image: include all types and add tasks on demand Date: Fri, 17 Dec 2021 10:10:30 +0100 Message-ID: <20211217091030.474380-4-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211217091030.474380-1-adriaan.schmidt@siemens.com> References: <20211217091030.474380-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: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26594.006 X-TM-AS-Result: No-10--12.777400-8.000000 X-TMASE-MatchedRID: fA0uK3mMYCQQwVtkLIfLLeFUsSbDdNGgh3UT0LEKUqw4hD0Y/Y/a70KJ 5iyNYGPpFBQ5IKls/A7ag/2R2wkK6W2uLDJ7ppBSOGAkJoqkwkG/IzNBuOxEO1kxnoxnQfVSvj5 VWb6CNmXozDhGeQC9EpGz2dedjjqcoTgtuNfrx+eigsTRCb00fCwrJd4fYI9TPwKTD1v8YV5MkO X0UoduubyHfHx9J6LSK3Lgc3CG0SOBwOiAXd70LCK6Szbd/6HJgoTNcgEj13iEwZM25BMdswygh FX0lxFwq+AfqlbGRtOaIhqy/Mzq130tCKdnhB589yM15V5aWpj6C0ePs7A07RD7Pzr2apMza7le oU/OMhNYsCaawSIuKfrBV14S+ArffPq9jnb5lweVpZ9HepC7h7VCdOPD2sgoftwZ3X11IV0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.777400-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26594.006 X-TM-SNTS-SMTP: 369A8C7105EB1A365AF407700721E986B3F2A98BA849FD094CBB0D68A0B30AA22000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f72e575-6575-4656-621c-08d9c13d2038 X-MS-TrafficTypeDiagnostic: AS8PR10MB4744:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T3euuf+MeHAFQjCXH6jKzx7WODNCEZ2nZa9qaWhZjOSJ3n7xPlCxlyufvSxvqG3tLid9M2/PLQxrZfjHxxWAM8L78uzPCwpqec1lHR66q5+x+Obnn5dBROCvN0Qob707YpwjnVrEKgusSywYmDHEUXpBTUBBMYDsrbdM9YjLTqf194+LKyWYwjiWuBMgWViSK2eYgv0sbhLAGiANGd7E7Yg//6mwOg11l9852mfOOJDRhWO2ZeFvYMVYqhO4TYkB1shluzEU6uP+zRKX4a5z03VR7kntncbp3ttUk5zXO8NdXTvTDCkFsBespIbsEEu8vsOqQ7yO5BbPbixJwgIJSRg1Mr3Ez7LTIuBdj4+cfLDGKEEZdGxZb889GcaDgApcY9Ob+oM8ch7uW4pGIsZUHrJ9EwtumrV1mjVvXJhPcaPJ6V/k+jhq2zni3ZpZFKIhIcAU5TOTHpUqKMVdwupwmlwfueNN+MxPdsz10l8e3ABifvh5yhA5/i3eHIcDGKmF0Fy7sVcHds1TMcvKtmOVo75SJXJBbkaE8FWky/H1L7D76HffBTOnv7mkzxw/9npCCaxdVuwOyAQNKLBkBBJdtcTiWJMuRSwfSujAPDqIxi8qBiuKlSGrl4pZI4gsKCsqlWWQEdTc73m7XR6tkoTL2WsQEVu3bU3k+JwJikIaqnVrLih8YI506O0eBj8lK83K7+2tbnddTSN/VY6Tua09o7nlgLi++psyp3J0cjmzWl0N43tr26jHVo4u6IaAUA40KaBE+Dq5SyN/G5DpyggB3g== X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(6666004)(356005)(26005)(86362001)(6916009)(36860700001)(83380400001)(956004)(36756003)(70206006)(1076003)(2616005)(5660300002)(316002)(8936002)(7596003)(4326008)(16526019)(82310400004)(107886003)(336012)(186003)(82960400001)(508600001)(7636003)(2906002)(70586007)(44832011)(8676002)(47076005)(40460700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 09:10:52.6586 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f72e575-6575-4656-621c-08d9c13d2038 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.70];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: AS8PR10MB4744 X-TUID: S3pb4eJ2QH/r To make the new SDK generation scheme work, we need to change the way image tasks are added. Because IMAGE_FSTYPES can change during recipe parsing when building the -sdk variant, image type classes must not automatically add their do_*_image tasks. Instead, we now always include all image types, and only enable the tasks dynamically. NOTE: This should NOT be merged. It is just to demo the new SDK extension. Signed-off-by: Adriaan Schmidt --- meta/classes/container-img.bbclass | 2 -- meta/classes/cpiogz-img.bbclass | 1 - meta/classes/ext4-img.bbclass | 1 - meta/classes/fit-img.bbclass | 2 +- meta/classes/image.bbclass | 22 +++++++++++++++++++++- meta/classes/targz-img.bbclass | 1 - meta/classes/ubi-img.bbclass | 4 ++-- meta/classes/ubifs-img.bbclass | 3 +-- meta/classes/wic-img.bbclass | 1 - 9 files changed, 25 insertions(+), 12 deletions(-) diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 8fef52a..70cecf4 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -15,5 +15,3 @@ do_container_image(){ bbdebug 1 "Generate container image in these formats: ${CONTAINER_FORMATS}" containerize_rootfs "${IMAGE_ROOTFS}" "${rootfs_id}" "${CONTAINER_FORMATS}" } - -addtask container_image before do_image after do_image_tools diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass index 2a49456..cacde0a 100644 --- a/meta/classes/cpiogz-img.bbclass +++ b/meta/classes/cpiogz-img.bbclass @@ -18,5 +18,4 @@ do_cpiogz_image() { sudo chown $(id -u):$(id -g) ${CPIOGZ_IMAGE_FILE} } -addtask cpiogz_image before do_image after do_image_tools do_cpiogz_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 5085afc..4b4f26e 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -19,6 +19,5 @@ do_ext4_image() { -F -d '${PP_ROOTFS}' '${PP_DEPLOY}/${EXT4_IMAGE_FILE}' } -addtask ext4_image before do_image after do_image_tools do_ext4_image[prefuncs] = 'set_image_size' do_ext4_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass index 1ad0c5b..2c91153 100644 --- a/meta/classes/fit-img.bbclass +++ b/meta/classes/fit-img.bbclass @@ -25,5 +25,5 @@ do_fit_image() { -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${PP_DEPLOY}/${FIT_IMAGE_FILE}' sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${FIT_IMAGE_FILE}' } -addtask fit_image before do_image after do_image_tools do_transform_template +addtask fit_image after do_transform_template do_fit_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d2512d3..c21de30 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -225,4 +225,24 @@ EOSUDO addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess # Last so that the image type can overwrite tasks if needed -inherit ${IMAGE_FSTYPES} +inherit container-img cpiogz-img ext4-img fit-img targz-img ubi-img ubifs-img wic-img + +python() { + fstypes = d.getVar('IMAGE_FSTYPES').split() + if 'container-img' in fstypes: + bb.build.addtask('container_image', 'do_image', 'do_image_tools', d) + if 'cpiogz-img' in fstypes: + bb.build.addtask('cpiogz_image', 'do_image', 'do_image_tools', d) + if 'ext4-img' in fstypes: + bb.build.addtask('ext4_image', 'do_image', 'do_image_tools', d) + if 'fit-img' in fstypes: + bb.build.addtask('fit_image', 'do_image', 'do_image_tools', d) + if 'targz-img' in fstypes: + bb.build.addtask('targz_image', 'do_image', 'do_image_tools', d) + if 'ubi-img' in fstypes: + bb.build.addtask('ubi_image', 'do_image', 'do_image_tools', d) + if 'unifs-img' in fstypes: + bb.build.addtask('ubifs_image', 'do_image', 'do_image_tools', d) + if 'wic-img' in fstypes: + bb.build.addtask('wic_image', 'do_image', 'do_image_tools', d) +} diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass index bf94af0..d96304f 100644 --- a/meta/classes/targz-img.bbclass +++ b/meta/classes/targz-img.bbclass @@ -11,5 +11,4 @@ do_targz_image() { sudo chown $(id -u):$(id -g) ${TARGZ_IMAGE_FILE} } -addtask targz_image before do_image after do_image_tools do_targz_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass index efaf058..db2bf18 100644 --- a/meta/classes/ubi-img.bbclass +++ b/meta/classes/ubi-img.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT python() { - if not d.getVar("UBINIZE_ARGS"): + if "ubi-img" in d.getVar("IMAGE_FSTYPES").split() and not d.getVar("UBINIZE_ARGS"): raise bb.parse.SkipRecipe("UBINIZE_ARGS must be set") } @@ -28,5 +28,5 @@ do_ubi_image() { -o '${PP_DEPLOY}/${UBI_IMAGE_FILE}' '${PP_WORK}/${UBINIZE_CFG}' sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${UBI_IMAGE_FILE}' } -addtask ubi_image before do_image after do_image_tools do_transform_template +addtask ubi_image after do_transform_template do_ubi_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass index 229eb3e..8488e7c 100644 --- a/meta/classes/ubifs-img.bbclass +++ b/meta/classes/ubifs-img.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT python() { - if not d.getVar("MKUBIFS_ARGS"): + if "ubifs-img" in d.getVar("IMAGE_FSTYPES").split() and not d.getVar("MKUBIFS_ARGS"): raise bb.parse.SkipRecipe("mkubifs_args must be set") } @@ -28,5 +28,4 @@ do_ubifs_image() { sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE}' } -addtask ubifs_image before do_image after do_image_tools do_ubifs_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index 80ca5f7..c12d880 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -150,7 +150,6 @@ python do_wic_image() { bb.build.exec_func(cmd, d) progress_reporter.finish() } -addtask wic_image before do_image after do_image_tools wic_do_mounts() { buildchroot_do_mounts -- 2.30.2