From patchwork Fri Jun 3 11:56:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 12869010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1152ACCA473 for ; Fri, 3 Jun 2022 11:56:27 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web11.6323.1654257383605680113 for ; Fri, 03 Jun 2022 04:56:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=AALOABhy; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-51332-20220603115620ebafc4b94a9cd1cb9b-v82hsu@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20220603115620ebafc4b94a9cd1cb9b for ; Fri, 03 Jun 2022 13:56:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=77OYMZ23qq+F1c8MkQU6KqAqO+J+BNdkmkGlO2Rp5Qk=; b=AALOABhyOcO5qpqy1a6T05YiXLBYlu5GHn5y85qEm2F/oeBdKXYeYosOYQAZYX7lqot148 /hD6ErAD7AK5SBW0hWzOMgt0/HYscha1aBNmJsEpq8KWLZDUxLEtr3rILVoEyJf9SynMIG5x FJMK1nCtAoc0Mg6RlAX16/v68i4AY=; From: Quirin Gylstorff To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com, adriaan.schmidt@siemens.com Subject: [cip-dev][isar-cip-core][RFC 1/4] ISAR update Date: Fri, 3 Jun 2022 13:56:15 +0200 Message-Id: <20220603115618.985568-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220603115618.985568-1-Quirin.Gylstorff@siemens.com> References: <20220603115618.985568-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jun 2022 11:56:27 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8488 From: Quirin Gylstorff This update introduces the new IMAGE_CMD_*. Signed-off-by: Quirin Gylstorff --- classes/wic-targz-img.bbclass | 15 --------------- conf/machine/bbb.conf | 2 +- conf/machine/hihope-rzg2m.conf | 2 +- conf/machine/iwg20m.conf | 2 +- conf/machine/qemu-amd64.conf | 2 +- conf/machine/qemu-arm.conf | 2 +- conf/machine/qemu-arm64.conf | 2 +- conf/machine/simatic-ipc227e.conf | 2 +- kas-cip.yml | 2 +- kas/opt/efibootguard.yml | 2 +- kas/opt/swupdate.yml | 2 +- kas/opt/targz-img.yml | 2 +- 12 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 classes/wic-targz-img.bbclass diff --git a/classes/wic-targz-img.bbclass b/classes/wic-targz-img.bbclass deleted file mode 100644 index 1327840..0000000 --- a/classes/wic-targz-img.bbclass +++ /dev/null @@ -1,15 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2019 -# -# Authors: -# Quirin Gylstorff -# -# SPDX-License-Identifier: MIT -# - -inherit wic-img -inherit targz-img - -addtask do_targz_image after do_wic_image diff --git a/conf/machine/bbb.conf b/conf/machine/bbb.conf index 81e624e..b592f4d 100644 --- a/conf/machine/bbb.conf +++ b/conf/machine/bbb.conf @@ -8,7 +8,7 @@ DISTRO_ARCH = "armhf" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" IMAGER_INSTALL += "u-boot-omap" IMAGE_INSTALL += "u-boot-script" diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf index bc80ddd..0b3acf4 100644 --- a/conf/machine/hihope-rzg2m.conf +++ b/conf/machine/hihope-rzg2m.conf @@ -11,7 +11,7 @@ DISTRO_ARCH = "arm64" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig" USE_CIP_KERNEL_CONFIG = "1" diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf index a26f7fe..d997a02 100644 --- a/conf/machine/iwg20m.conf +++ b/conf/machine/iwg20m.conf @@ -8,7 +8,7 @@ DISTRO_ARCH = "armhf" # see wic/iwg20m.wks -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" # sets serial login getty MACHINE_SERIAL = "ttySC0" diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf index a60f818..da7e59c 100644 --- a/conf/machine/qemu-amd64.conf +++ b/conf/machine/qemu-amd64.conf @@ -8,6 +8,6 @@ DISTRO_ARCH = "amd64" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf index aca6d7d..1937c4c 100644 --- a/conf/machine/qemu-arm.conf +++ b/conf/machine/qemu-arm.conf @@ -9,6 +9,6 @@ DISTRO_ARCH = "armhf" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf index 4e12cdb..b5c1e1c 100644 --- a/conf/machine/qemu-arm64.conf +++ b/conf/machine/qemu-arm64.conf @@ -8,7 +8,7 @@ DISTRO_ARCH = "arm64" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig" diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf index 50d1f8a..a624fcd 100644 --- a/conf/machine/simatic-ipc227e.conf +++ b/conf/machine/simatic-ipc227e.conf @@ -8,7 +8,7 @@ DISTRO_ARCH = "amd64" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" diff --git a/kas-cip.yml b/kas-cip.yml index fce176b..90582bf 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: cf3f18a649ff42726677a58b224b9bb58ea4ba46 + refspec: 0cf9bc5d996e19e9e31857dd48d069fd69114376 layers: meta: patches: diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml index d85aed7..4282932 100644 --- a/kas/opt/efibootguard.yml +++ b/kas/opt/efibootguard.yml @@ -24,7 +24,7 @@ local_conf_header: WIC_IMAGER_INSTALL_append = " efibootguard" WDOG_TIMEOUT ?= "60" WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES" - IMAGE_FSTYPES ?= "wic-img" + IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "${MACHINE}-efibootguard.wks.in" firmware-binaries: | diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index 31cd0d1..72429c6 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -23,5 +23,5 @@ local_conf_header: CIP_IMAGE_OPTIONS_append = " swupdate.inc" wic-swu: | - IMAGE_FSTYPES = "wic-swu-img" + IMAGE_FSTYPES = "wic" WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks.in" diff --git a/kas/opt/targz-img.yml b/kas/opt/targz-img.yml index d555a8a..afe2e07 100644 --- a/kas/opt/targz-img.yml +++ b/kas/opt/targz-img.yml @@ -14,4 +14,4 @@ header: local_conf_header: image-type: | - IMAGE_FSTYPES = "targz-img" + IMAGE_FSTYPES = "tar.gz"