From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a19:7413:: with SMTP id v19mr4155673lfe.250.1644474329822; Wed, 09 Feb 2022 22:25:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e11:: with SMTP id e17ls2333910lfr.1.gmail; Wed, 09 Feb 2022 22:25:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyiBP++5ZX5mVtGHKsA/x4gWqGHTlURQxPwERZuHjJrVws3tYSD4eoa8tZFSWd4ei0scp3F X-Received: by 2002:ac2:4e0b:: with SMTP id e11mr4256491lfr.57.1644474328716; Wed, 09 Feb 2022 22:25:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644474328; cv=pass; d=google.com; s=arc-20160816; b=fk2os+Pz6aJrn9vEWtvQvDmoP+QT0qIijQ2zmRsLuW8Sb8Rnv1msPSd/aGsaHgoE1w lg7fIrT2vjXVn65Yfcvyel52/sLRvmeFMcrXGyUS5IK3jwPrq8I76yZYq2DKLMCjC2+p eXo+2TlYodJcrFDZBvgwmP9IAttL09dfJPEh5o/N8j51ph/ObGepLfK1sVD4o3DYH82+ WiKoKfM+DIWwu6cFa2pU+uFNGxG47wNptJoMAJVqcphj5RfGlonqUDGlA+lp7a4Z9cle OMz5Y6f+iClvDgOhod6/AC5Z3TPVk+Knn6R0BKPrce7x3VcuecoMKFGUhgghlqQtpvLD cYuw== 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=LD0Pf6QSGLYlUayQkDcsR0TM3dO7+NyotvjstMM5SG8=; b=cUtmvTa7stSx7MGK/2oSPyt6XJl1FvIqx0m9WowFbOwPbHV/Nzhvh0R4Yc8e9M2V8e MWAhJDVSHriUrlKbYNWW5BoOGJZdTcMPquIP1z1Ruod+Gj6LwLx1JUepH0dNsoku5jDd iXdq3DpQ87AshLxVp8hHSTWSKmQarJOjUf7SzGy3sQNuuGsasH2H3zvraJSPwrbf44om anPiVZW38sTS7w21CISWp1ABelWX0Qk/ogBBVNfz7fHbGa0/frJIol/FsPsPyYk8vG7J nXz6wvTGZ8mDwZpwq74PwcDqyqPjIaYYRECF5bl5pxeeq8c99HQ1vZLUe/wapW8vMBvo IgrQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=d1b1kRVM; 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:fe0d::611 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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0611.outbound.protection.outlook.com. [2a01:111:f400:fe0d::611]) by gmr-mx.google.com with ESMTPS id o24si1096018lfb.1.2022.02.09.22.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:25:28 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0d::611 as permitted sender) client-ip=2a01:111:f400:fe0d::611; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=d1b1kRVM; 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:fe0d::611 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=OFF16ZduviOkZNdLP+4a6eqTaHOpqr3rXlyOAyoKu67HoIuBtDGdG2WL/OFu5dsHMkebkcfFEk5Gf644qVtWAClx+XyP7DaNHr72lOp1E9hE/C/krDu5nJ0OdWvj8hBtrsroAkfhbjDs2TQa1H+NalCSZ+T6HnCS+OfXIzouLQlB58u57ppFppXeIkGvFt5tn2MxsJzhexwZqGiC/hpKc0g1l3/0pcmHlR8hP0R1ERijoetjBRjXzAC8HM8knIAUc+jMo8PZoENZgI2qfTit9NP+bgFb2aFDwkjoaA16zJgF1BKLzUnutfM15FkFLFNKNHEMGCbT9KoCV4J+YtmEMg== 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=LD0Pf6QSGLYlUayQkDcsR0TM3dO7+NyotvjstMM5SG8=; b=Yh1Nu+SnjmCMypqzxt9QqPLNb7Y4CxqBkD2NI2iqcJuY4QMYBvkm3OPugG4L0OZwVyQOmzZnUxhLodpsFAerP4wRg9tGru+5ajKF5oGC5ksce6vIKmyujSWwRu3MqjLTjwhRAZJFrb6jgx8CaQo+oDjKT3blEEWanP4ilW+S2LKxt0jx8RTlpGO4q/qn3a5A/aqP/y8f+PrEfD+Nh7MF/u0mo/6XUUGEevKCAvKMEexkKzgt9W6E+L5G3u53lOGMiWpXDG4ewdyUDW6lPiXZDqxV567M8WACXauXSxskTQblQ/tORCNJ+bYVqG2h7Val+SLxSCxC6/vIkWLLHee50Q== 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=LD0Pf6QSGLYlUayQkDcsR0TM3dO7+NyotvjstMM5SG8=; b=d1b1kRVMcrbLwdY7m+sc+PUn+W1+JucYj9eYYjQ26Fsf4m8lIQtdcVcOyT7XhB1P/XKy5B2+SJDVvSyCzBonMDFdu/pLEbd8/6Hp9/+NYuHVCJp8QgJllFN8mBMZvyi0MdhpJMaPJBT2I6J7zde8xqIzhoENaeQd+6V4EhN2mGGWO1O8gDiRWLEyBe0F0Zi1Ty/T+sbFy57Dm7qWhYA0aj7VExZuBll8FaPO7u3rH6DOM5zj/fUmF/cJbKgjtixAWnQVI1C6I9NZDF5TKmovf14iF/ZfQwNY4xar7BD5QS4pDTcpFk0VnanND6w8sWXqP/yKwW9z+kDqG7HmzwVuCQ== Received: from AS9PR06CA0211.eurprd06.prod.outlook.com (2603:10a6:20b:45e::15) by VI1PR10MB2493.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:8a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 10 Feb 2022 06:25:26 +0000 Received: from VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45e:cafe::52) by AS9PR06CA0211.outlook.office365.com (2603:10a6:20b:45e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14 via Frontend Transport; Thu, 10 Feb 2022 06:25:25 +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 VE1EUR01FT031.mail.protection.outlook.com (10.152.2.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4975.11 via Frontend Transport; Thu, 10 Feb 2022 06:25:25 +0000 Received: from DEMCHDC89YA.ad011.siemens.net (139.25.226.104) 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.18; Thu, 10 Feb 2022 07:25:21 +0100 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89YA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Feb 2022 07:25:21 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH 5/6] imagetypes: switch meta-isar to the new scheme Date: Thu, 10 Feb 2022 07:24:45 +0100 Message-ID: <20220210062446.4145565-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220210062446.4145565-1-adriaan.schmidt@siemens.com> References: <20220210062446.4145565-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 DEMCHDC89YA.ad011.siemens.net (139.25.226.104) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--8.567900-8.000000 X-TMASE-MatchedRID: X6Cr2Tm2GnAQwVtkLIfLLRmYnxcmyg73NtWTJI2Df5JrIu4+N99FEdoK fgOoKJc2TJDyHMXec/aDnmxD/gIAeHb9uKwttSVV1klR/VbdVY2plEyHVtAnRZxVZzZr7+O769x ONVZSrH2pTkI0HK8zpeVxgOk6+5RROk98DipUSB2jF5LJBw36j28bkgtdEYRBgd/NYmefR6hULR Rq00o2mdSVUkz9BPXekPbLu86vTdBFnZ9289K/ggwFAWQVHGZ0uB2uihz22vmAV0TDtn/o5He5j VG6a6tKj9WErUhfhR8uwnJ+4IjHcNZZql6z7DnEmyiLZetSf8mfop0ytGwvXiq2rl3dzGQ1PHrU BzETlGapygCGKFPC+LuvxtXrzIP+Jy9k5aDEUS/E/hBf12dEXB7WNxYmhFNy7m3ZdfbltNhWXGv UUmKP2w== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--8.567900-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: C4DC7202D5983442299E083E922913922DE9C46F40029943EE2FC508AD4388ED2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8cc16a3b-8c08-484b-eac5-08d9ec5e200b X-MS-TrafficTypeDiagnostic: VI1PR10MB2493:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2399; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VSeCuSg5qEpmf/9C0i5EPuAMPIgQtDIVp2nM8nUcHIwDcRFo+aSnENna8/+PNQoQSaUBamglO/if8qU/UpcPtbddwLXlIPFySAfJnO/cmtG7vjmnAwh99h2eFVpggW2HtIYdNFrT1B0oF90pt90ghR8KfoVKda+w9cjLWV48wcRF9F/wTM7v93lES4dEDJ92FaM9/SOlZOVKBQSoIMKADHnrtBbgO4GBTrbx17zZJ2SMARnJNOf6ixMhI+++k5yMGlTqkttBjJVO3zverr1LhwKulkasufr6Q7pLin4a8S2L+9T1hmGl0U4LMIV1ez+USWDPDVZ4iwnJtzheku7+px/9YerIQu5SWV1Rx3MjJKlhfOOHkMF34CD18Z3SygTSyxWMHjVYjYEzUw8fvOdvIHNmhNYHtrKU8WnJTX2MKuXXCX6nTzikNcNLm6uWvq9HesQYiaHBERL+SIVi+wCe+DQ7HK4qSxcvJvAAkyWKL3/Yixl6cM0nIn/TZ7pETkqece7SGktPXy0uMFZWqDJNzJgx0UGGPmU76hRF1VVPMNejOp0QNUYzNg4u89GzKA9UdDsdv6UlRaFWD9eCTNI9B/evWaXtPYnA0swQpbIDgonlRxcCmsDf4ePmAZSvpjEUESX6i1VJoCseHT48MYrLJ+jFkthThT3Dmpo5rTpuVKGUIdcqrd8X9RSnqTB4UZqW7HxSWi67dcf+z2PHGAAzVQ== 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:(13230001)(4636009)(40470700004)(36840700001)(46966006)(86362001)(336012)(36756003)(83380400001)(36860700001)(16526019)(26005)(1076003)(186003)(5660300002)(47076005)(107886003)(44832011)(956004)(2616005)(8936002)(40460700003)(82310400004)(4326008)(316002)(70586007)(8676002)(70206006)(6666004)(30864003)(6916009)(7596003)(7636003)(82960400001)(2906002)(356005)(508600001)(403724002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:25:25.7743 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8cc16a3b-8c08-484b-eac5-08d9ec5e200b 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: VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2493 X-TUID: 0v8k/DMwsKHk - new image type names, basically replacing wic-img with wic, etc. - adapt custom image type rpi-sdimg to the new scheme Signed-off-by: Adriaan Schmidt --- meta-isar/classes/rpi-sdimg.bbclass | 10 ++++------ meta-isar/classes/ubi-ubifs-img.bbclass | 11 ++++++++--- meta-isar/conf/machine/bananapi.conf | 2 +- meta-isar/conf/machine/container-amd64.conf | 2 +- meta-isar/conf/machine/de0-nano-soc.conf | 2 +- meta-isar/conf/machine/hikey.conf | 2 +- meta-isar/conf/machine/imx6-sabrelite.conf | 3 ++- meta-isar/conf/machine/nanopi-neo.conf | 2 +- meta-isar/conf/machine/phyboard-mira.conf | 3 ++- meta-isar/conf/machine/qemuamd64.conf | 2 +- meta-isar/conf/machine/qemuarm.conf | 2 +- meta-isar/conf/machine/qemuarm64.conf | 2 +- meta-isar/conf/machine/qemui386.conf | 2 +- meta-isar/conf/machine/qemumipsel.conf | 2 +- meta-isar/conf/machine/qemuriscv64.conf | 2 +- meta-isar/conf/machine/rpi-common.conf | 1 + meta-isar/conf/machine/rpi.conf | 1 + meta-isar/conf/machine/sifive-fu540.conf | 2 +- meta-isar/conf/machine/stm32mp15x.conf | 2 +- meta-isar/conf/machine/virtualbox.conf | 2 +- meta-isar/conf/machine/vmware.conf | 2 +- .../conf/multiconfig/qemuamd64-buster-cpiogz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 +- meta-isar/recipes-core/images/isar-image-ubi.bb | 4 ++-- 25 files changed, 38 insertions(+), 31 deletions(-) diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index 1efc1c40..747b78de 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -3,7 +3,7 @@ # # Based on SD class from meta-raspberrypi -inherit ext4-img +IMAGE_TYPEDEP_rpi_sdimg = "ext4" # Boot partition volume id BOOTDD_VOLUME_ID ?= "${MACHINE}" @@ -14,10 +14,10 @@ BOOT_SPACE ?= "40960" # Set alignment to 4MB [in KiB] IMAGE_ROOTFS_ALIGNMENT = "4096" -SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.sdimg" -SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}" +SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.rpi-sdimg" +SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ext4" -do_rpi_sdimg () { +IMAGE_CMD_rpi_sdimg () { # Align partitions ROOTFS_SIZE=$(du -b ${SDIMG_ROOTFS} | cut -f 1) ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} + 1) @@ -53,5 +53,3 @@ do_rpi_sdimg () { dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync } - -addtask rpi_sdimg before do_build after do_ext4_image diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass index 095719aa..7a917b47 100644 --- a/meta-isar/classes/ubi-ubifs-img.bbclass +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -5,6 +5,11 @@ # # SPDX-License-Identifier: MIT -inherit ubi-img ubifs-img fit-img -addtask do_ubi_image after do_ubifs_image -addtask do_ubi_image after do_fit_image +IMAGE_TYPEDEP_ubi_ubifs = "ubi" +IMAGE_TYPEDEP_ubi += "ubifs fit" + +IMAGE_CMD_ubi_ubifs() { + # we need to produce output (with extension .ubi-ubifs), + # so just create a symlink + ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs +} diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf index dd3a0667..36cda28a 100644 --- a/meta-isar/conf/machine/bananapi.conf +++ b/meta-isar/conf/machine/bananapi.conf @@ -9,6 +9,6 @@ KERNEL_NAME ?= "armmp" IMAGE_INSTALL += "u-boot-script" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "bananapi" IMAGER_INSTALL += "u-boot-sunxi" diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf index 1f7669ad..e24729ff 100644 --- a/meta-isar/conf/machine/container-amd64.conf +++ b/meta-isar/conf/machine/container-amd64.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: MIT DISTRO_ARCH ?= "amd64" -IMAGE_FSTYPES ?= "container-img" +IMAGE_FSTYPES ?= "docker-archive.gz" diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf index f822e24b..55343e9f 100644 --- a/meta-isar/conf/machine/de0-nano-soc.conf +++ b/meta-isar/conf/machine/de0-nano-soc.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-de0-nano-soc = "u-boot-de0-nano-soc" U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig" U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "de0-nano-soc.wks.in" IMAGER_INSTALL += "u-boot-de0-nano-soc" IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc" diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf index 615d6749..7f9cccb2 100644 --- a/meta-isar/conf/machine/hikey.conf +++ b/meta-isar/conf/machine/hikey.conf @@ -7,7 +7,7 @@ DISTRO_ARCH = "arm64" KERNEL_NAME ?= "mainline" -IMAGE_FSTYPES = "wic-img" +IMAGE_FSTYPES = "wic" WKS_FILE ?= "hikey" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf index 5be337f9..bbc2b505 100644 --- a/meta-isar/conf/machine/imx6-sabrelite.conf +++ b/meta-isar/conf/machine/imx6-sabrelite.conf @@ -6,8 +6,9 @@ MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" +INHERIT += "ubi-ubifs-img" MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500" UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000" -IMAGE_FSTYPES ?= "ubi-ubifs-img" +IMAGE_FSTYPES ?= "ubi-ubifs" DTB_FILES = "imx6q-sabrelite.dtb" diff --git a/meta-isar/conf/machine/nanopi-neo.conf b/meta-isar/conf/machine/nanopi-neo.conf index 2475ce9d..5aa717e5 100644 --- a/meta-isar/conf/machine/nanopi-neo.conf +++ b/meta-isar/conf/machine/nanopi-neo.conf @@ -7,7 +7,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "nanopi-neo.wks.in" IMAGE_INSTALL += "u-boot-script" diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf index 2d052d0c..65382630 100644 --- a/meta-isar/conf/machine/phyboard-mira.conf +++ b/meta-isar/conf/machine/phyboard-mira.conf @@ -6,8 +6,9 @@ MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" +INHERIT += "ubi-ubifs-img" MKUBIFS_ARGS := "-m 0x1000 -e 0x7e000 -c 8083" UBINIZE_ARGS = "-vv -m 0x1000 -p 0x80000" -IMAGE_FSTYPES ?= "ubi-ubifs-img" +IMAGE_FSTYPES ?= "ubi-ubifs" DTB_FILES = "imx6q-phytec-mira-rdk-nand.dtb" diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index ccfde391..eca2628c 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" KERNEL_NAME_ubuntu-focal ?= "generic" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf index 20a71ea4..06d4b34d 100644 --- a/meta-isar/conf/machine/qemuarm.conf +++ b/meta-isar/conf/machine/qemuarm.conf @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index ca23cef5..b30fad47 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" KERNEL_NAME_ubuntu-focal ?= "generic" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf index 17cff1eb..ddfc077b 100644 --- a/meta-isar/conf/machine/qemui386.conf +++ b/meta-isar/conf/machine/qemui386.conf @@ -4,7 +4,7 @@ DISTRO_ARCH ?= "i386" KERNEL_NAME ?= "686-pae" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "directdisk-isar" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf index b34e46de..40f5e744 100644 --- a/meta-isar/conf/machine/qemumipsel.conf +++ b/meta-isar/conf/machine/qemumipsel.conf @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "mipsel" KERNEL_NAME ?= "4kc-malta" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "sda" diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf index 5c687a03..cd04d873 100644 --- a/meta-isar/conf/machine/qemuriscv64.conf +++ b/meta-isar/conf/machine/qemuriscv64.conf @@ -8,7 +8,7 @@ DISTRO_ARCH ?= "riscv64" KERNEL_NAME ?= "riscv64" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf index bb0b939c..e4652340 100644 --- a/meta-isar/conf/machine/rpi-common.conf +++ b/meta-isar/conf/machine/rpi-common.conf @@ -5,6 +5,7 @@ BOOT_SPACE ?= "81920" MACHINE_SERIAL ?= "serial0" BAUDRATE_TTY ?= "115200" +IMAGE_CLASSES += "rpi-sdimg" IMAGE_FSTYPES ?= "rpi-sdimg" KERNEL_TYPE = "raspios" diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf index 61852a9b..0a980926 100644 --- a/meta-isar/conf/machine/rpi.conf +++ b/meta-isar/conf/machine/rpi.conf @@ -4,4 +4,5 @@ MACHINE_SERIAL ?= "ttyAMA0" BAUDRATE_TTY ?= "9600" +IMAGE_CLASSES += "rpi-sdimg" IMAGE_FSTYPES ?= "rpi-sdimg" diff --git a/meta-isar/conf/machine/sifive-fu540.conf b/meta-isar/conf/machine/sifive-fu540.conf index d73f0475..1eb58db1 100644 --- a/meta-isar/conf/machine/sifive-fu540.conf +++ b/meta-isar/conf/machine/sifive-fu540.conf @@ -7,7 +7,7 @@ DISTRO_ARCH = "riscv64" KERNEL_NAME ?= "mainline" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sifive-fu540" IMAGER_INSTALL += "opensbi-sifive-fu540" IMAGER_BUILD_DEPS += "opensbi-sifive-fu540" diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index 22e88ea9..62de7dd1 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x" U_BOOT_CONFIG_stm32mp15x = "stm32mp15_trusted_defconfig" U_BOOT_BIN_stm32mp15x = "u-boot.stm32" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "stm32mp15x.wks.in" IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf index c0f65842..de3d04c3 100644 --- a/meta-isar/conf/machine/virtualbox.conf +++ b/meta-isar/conf/machine/virtualbox.conf @@ -12,4 +12,4 @@ WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" VMDK_SUBFORMAT = "monolithicSparse" -IMAGE_FSTYPES ?= "vm-img" +IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index 9bf1fd96..fba639b1 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -14,4 +14,4 @@ IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" VMDK_SUBFORMAT = "streamOptimized" -IMAGE_FSTYPES ?= "vm-img" +IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf index 37f89581..675d934a 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf @@ -6,4 +6,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES = "cpiogz-img" +IMAGE_FSTYPES = "cpio.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf index e3992e60..b48b0a6c 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf @@ -6,4 +6,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES ?= "targz-img" +IMAGE_FSTYPES ?= "tar.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 5615198d..1765d602 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -3,4 +3,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES ?= "wic-img ext4-img" +IMAGE_FSTYPES ?= "wic ext4" diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb index ef2cf1c3..8c70c1f7 100644 --- a/meta-isar/recipes-core/images/isar-image-ubi.bb +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -23,5 +23,5 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" -UBIFS_IMG = "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}" -FIT_IMG = "${PP_DEPLOY}/${FIT_IMAGE_FILE}" +UBIFS_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" +FIT_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.fit" -- 2.30.2