From patchwork Fri May 17 16:07:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13667165 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 293D6C04FFE for ; Fri, 17 May 2024 16:07:36 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.81]) by mx.groups.io with SMTP id smtpd.web11.44554.1715962053293380890 for ; Fri, 17 May 2024 09:07:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=t7gW6Wvp; spf=pass (domain: siemens.com, ip: 40.107.15.81, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fhLXP0zn18M8OjbsUdY/CJPfiEdQyj7H/WNH2MYq2e8ABy8DIhzW0XPfAm4k0eDxVMAWJ0MAB+BA67Bx8R9CpXS+sHaRBMtPqxI82pFbyqqJzZChDN2Efkf1hq8xagJD+R71r1Mn039Xo3FT4o6rdByHyUtnrqRs/P8pfozsd8pbW8CQNNUEp0uuDpVRqFAlzoqCU716OLP1UShhNiy+xF1vgx/orjMXCUehWcLR0eDNw9/2LNLrLUbTmmw7OsTb443E+M9lT1tbEwe0Gj7E1lSznQZ8LBOR30pnGrCJtnL7ledX2N1FIxcaWcxetH9mzxaQUNoxumtrxWWtZq8EEw== 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=HBmRXYZdA33IdyPU66XP5YJpH36mrLIbvDM0fS5hj78=; b=H0aoI41aUzbFfsM4kJyjOLAFCuZGEC+8DlrMyxw6jC/dp9EUUsE32irN98khujNBb8ttxyPIuw5i9BGYTMOZrN/dZ517FsYF1+RgFhEbYkelZp20jlynh8YIqwC3h16CMRIMXgU7nrAP/JqNwi6DhLnEGTsV/8L7/eDmOSj+oeJQDHdFqH6JXkzUWOrEUdhlW2VB1FCkeWhpUtd6gPAwVkMValGSGDJ/B5JmgfYniEiLSGGm+eontoD94jBNEfFiD/47nHgJ+QuptNPnvVf4Dix3VW2Ngr3iYyEgcyE7P/OmbzHr9+xjcxC6DxIEGj1GzX2cWrBoMmhti846hlhuzg== 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=HBmRXYZdA33IdyPU66XP5YJpH36mrLIbvDM0fS5hj78=; b=t7gW6WvpAgpmPwFmzosfp30AGyF3vbhmzokQz9w4bCySKDugqqkqVbSimhjwSRtw2ac6WLx+ikYoF28DfLcDNMRf6GI9KwkBuVmdrDNgz/cgIUlUntP6ntVQnvBOtE65jhaaTyC3qfMR/2TO7j6ymeaXtPjt2gWN4Nuz1Y8EvCR7aPrSL+ShXtkD8bz3YYbKtBg5jA8u1GU4IL4FkCohgSIOFinGjOJIUXCCukz6tG1rrGRj7MwinFP49tK2NjSFzCJFTch9foGZPnpFYquTFpsW9BnbrgPxY70SJ+jqQ3zhDXt3hg2CuB+TUO2LOl5ZHbwcYOC2DiWQxghTi6tNUQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by DB9PR10MB7930.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:301::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.28; Fri, 17 May 2024 16:07:30 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%7]) with mapi id 15.20.7587.026; Fri, 17 May 2024 16:07:29 +0000 Message-ID: <075ca777-ce0f-44aa-bbb5-4c5645fdb02d@siemens.com> Date: Fri, 17 May 2024 18:07:23 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: cip-dev Subject: [isar-cip-core v2][PATCH] Refactor tar.gz image option Content-Language: en-US Cc: Nobuhiro Iwamatsu , Chris Paterson , Quirin Gylstorff X-ClientProxiedBy: CH2PR18CA0053.namprd18.prod.outlook.com (2603:10b6:610:55::33) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|DB9PR10MB7930:EE_ X-MS-Office365-Filtering-Correlation-Id: fa7617a9-9778-4dff-e422-08dc768b738d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|366007|376005; X-Microsoft-Antispam-Message-Info: =?utf-8?q?IL69XJG8uzVyfgTu4Jj+EcjLYvo7bfM?= =?utf-8?q?wz838bNT2XUH8ViCOArQ1X1l9JW7WEwt55VnunmbjPzdo6jVPxIJ2BWF3Vl6EVWeO?= =?utf-8?q?rzpbjjaJE9QVHQZE6WVYIHoiuDwsyVhVoduHORmBH0LxWbK8/db/zcFhf/kmtAl3Y?= =?utf-8?q?pO7+jjumXeJhPO0vJazSfG1s9T39LN7tgrPQpSBIDUw0DtsXwdN7iL8ylCMscMJRa?= =?utf-8?q?MFSUSfxX/FA1W+IFyxy4F6yiVHpojnB324sI9JTIUrXDmqocwmxatW+f/0esLWpA1?= =?utf-8?q?t+DcyCBA6s8cVcueznmE05FkfJGJpgfKsPnV2p5ffM6L6ydY99vW7RkwGMM6n5GhA?= =?utf-8?q?3PNpVKwSxt3HFIk+Jf434jxbMDEp56jBE0W7U441Ln47yoVaGqnLs/Kcpnunna0V6?= =?utf-8?q?WgES6iWq+O7NJqY9Fao5sgqn9yjmhEV91u4836hncZyYpivIVq+gNzd7MK/hm5IFX?= =?utf-8?q?csMWXmdLyE3xwEHmkSV7Eatpdt8Z2F4qqE+WIAhd4y1w96KQ2Osxitt1qgx+X30LR?= =?utf-8?q?VcUnHNMSgMIKtqxkz5qaAGmmdqyS4KKGYELQ+28mRNgwYaGi+a9YF++OY32Q/kcEn?= =?utf-8?q?76xjAz2WjR9pnQbbTwwqA7xNf6EebPRCwT/awB8fptT2Di+ujVnv5PB1+LkUdPnwr?= =?utf-8?q?qmh0ynnBX8MSYeCERtI/J6NwrT03+79EJqW6OzrKEwMyrsfenjgGb6tCiGhf+Ko83?= =?utf-8?q?u/WHTDedcUb9lBWPc6ZlkijNDEunKQh8WDRlgsUH1JsyALzGLhl7moXiNHAg0Y9gz?= =?utf-8?q?euR+2OzSbIT3v6qpUWTk7LzTF1xZiK0KzmHGbOBy8Cz8/xt88lw+e1OLgdAG8VlNo?= =?utf-8?q?0+91Xveu7hs6XsvbZ+CJmJvD1ejCRUCFAvImHh/6m6Q1Pklfo/bh6uTH5W6Uc9BPC?= =?utf-8?q?XKgjNZ+jexUuaunPI1X+ijCOWyjvUht9q082hqwx+WrZe0c9f6YX48qvHeXYESwYy?= =?utf-8?q?RzsYLMQIx2xcKnZ6tt8Y30Dg2Sw1wGMK7FERTu7s1STWCNQJFoHWLLtwxFFAswgUX?= =?utf-8?q?ByVwKXBprgjPoEWnD7ibiqxYqedUByWybdUSHPK81b/NiGBFYiIxiwbv3eui6SnNK?= =?utf-8?q?z6YaFoLQoby5ODQR+08+T63+w3+pIS+acYPOILuyC75n+T7Q43a6e6eAwoAMblJBm?= =?utf-8?q?AA1IXfDHxmCknl6H2VCiZDzF6/aC74ZdoDUCvO97ysbU8EuT4zia74CdsUTKCl3oV?= =?utf-8?q?21ih1lMrGRbhJOtg6Y3QxPEU4Agzw7ZX3GnA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(366007)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?MnjNEwJ7rE10Tpcxo+4DRuO0Y8G9?= =?utf-8?q?urkaySvoWyxCmzEWDWMtOF5R9YUh+qnOs6RQnncYcDWZWksyj01bzbZwZiJucXi19?= =?utf-8?q?G9JOWgbhZr5DD8MM8RLo/ogEsujxdUBiEZx+OV7awt2MZK6FNJOCRVolHSneFW3sc?= =?utf-8?q?MCeFDzFnkxnVBfXclYT4eUgf/TPvqx7Uj2wVOSXBWyXbyYRskxh4Inc8R9iKwz1TV?= =?utf-8?q?DpgxUI+8cvtGXgBbE6cjT65G1vzpMUh+85sVbh2TN2OhTWgCWquWbG1m+lCx2rtyp?= =?utf-8?q?dUc6FVpqFtClsQBdoOkRr2FtmyfD4Cksi6orS4tl7pjOSWZzZGZ4qWNPPZzDzkadc?= =?utf-8?q?O8PsuYkt7pfp9geK2hbjefcMa+Xl7MFSBuUmx+TMGvWfhtm+Ps1I4gRpu2F3FZ832?= =?utf-8?q?25662aCd18QLssTY4tBbdtz895dfaYK2NxCJ58XRNXR//8H8lzyTr74IKfgnOrCEJ?= =?utf-8?q?SuK5q0rtcYfsAskiwwYpkBPUGPUosQCMVlzQ0xcOwcLgsTnc3T7VtXeMFAPKLd44F?= =?utf-8?q?qhs1OEL8+a++2xmVIPdN66Y4u2jc2n4WfSi009K6I53ThMNJP+iGWTVBgAfz/oCV9?= =?utf-8?q?9GzRqFBqS5CUXENLKTW+HmdO3ESVG0MGxD9vvNvFxkSLk9rcLAjANQtjRuw5jFZ/u?= =?utf-8?q?h/yN7lUBE55Cev7/E7gZIa7QwGN6aiH53WPYFC0LiyKXS5pNfu3W4+3XprO6Nqlgd?= =?utf-8?q?MxmrkqizFAVF6ZTuThKsKNhrIcenZ35SovdKyow0DuiDhlcqL9HJcb8ItOxbsVUxt?= =?utf-8?q?jrLjjRTEpNLXE8SZr4dyyyfpChryWzbEk3F9nBnEWyLVFPm8eLm0Tka2ZUik8vU5X?= =?utf-8?q?1oU97qJ9Kw5dtXL+kmT5Bf9MiqcjKZ7dy+ie6nzsjx7eM9h2Bsbnw/lcSaS63F0To?= =?utf-8?q?cIQ/WQlXm7fmhGYhiQBMlMH5o6nqmRAPXOoe5+M3lfGQOnQpTqiA46sZTWLnJUulY?= =?utf-8?q?mGSKIVN9bIVUtfsqlyzMnKZVogc9rRhMqjHHntYjJxB/gc8kDkDNNwL5j9RfW0y/v?= =?utf-8?q?pZCJrhOaIiIVbhFgO1ZIhfFnrrJWmOc8MshjlZi0RGFHawtVV1b+NBBDQfbhXOtt3?= =?utf-8?q?XmX2HdOQNSusCOGjnD7dhCLOKQ7moTAzH7rQDVit36zWu8P3jIFQhl/hKeNkZylPP?= =?utf-8?q?EWINUB8Rdy48xdqogriGpZP1yomXu1usuQoFvlteBco20ScLwFIjEteQuapUu0Nrl?= =?utf-8?q?2P9hdKTN5sgd55vF7Uhzrz/ESDI52RCAaWvwW/WHKkoQIDR+XFUCW0byOSCpLiy9K?= =?utf-8?q?8cE5hP5hJQ8wnwU6HeiUeqI6oIk36+e15zzLZz/UuujOg/K9jsAC7bHkon2VACEy+?= =?utf-8?q?/qksMyd9LY9HNZpmJWCOHpRNu+yc+nfdeXmeacLYPMfb+UHvxjUdE+0wyS7P1WY4O?= =?utf-8?q?7VeYpo7w32YiIb5QZN3eYv3YR7efQeOp+lKl15Zd/VUUtUKdImDaAnEw5px3Q4QHx?= =?utf-8?q?U6h1DuvyWTRTKOvjC5K3NVfWxwF04VUB3u/ZyS0iLicm9VJuojLodnrcs5bs8vGuf?= =?utf-8?q?IAzLtiCXzcr59WeaMjdvjQC+Dm7ATunt4A=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa7617a9-9778-4dff-e422-08dc768b738d X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 16:07:29.1843 (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: Xz+NEEqOYOcW0BM5b514VeKYVln9VoMNo88U5t98cGRhiblrTllQ0L6kXEGtRumK7Ww2tga5zn8iJNb3CbfdFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB7930 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, 17 May 2024 16:07:36 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/15912 From: Jan Kiszka We have wic-targz.img, we have targz-img - that'c confusion. What we need is a way to say "generate (also) tarball of the image" so that we can feed LAVA specifically. If the normal target image is wic or already a raw partition (simple QEMU targets) should not matter. So, consolidate the kas options and the kconfig menu. Furthermore, simplify the CI options so that tarballs are by default on and turn it off actively in case that format has no user or cannot work in the first place. Signed-off-by: Jan Kiszka --- Changes in v2: - fix kconfig menu, making targz now depend on the absence of swupdate .gitlab-ci.yml | 40 +++++++--------------------- Kconfig | 27 +++++++------------ kas/opt/{targz-img.yml => targz.yml} | 4 +-- kas/opt/wic-targz-img.yml | 20 -------------- 4 files changed, 21 insertions(+), 70 deletions(-) rename kas/opt/{targz-img.yml => targz.yml} (71%) delete mode 100644 kas/opt/wic-targz-img.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72084f33..b4291d0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,7 @@ variables: extension: none use_rt: enable encrypt: disable - wic_targz: enable - targz: disable + targz: enable dtb: none deploy: enable deploy_kernelci: disable @@ -58,8 +57,7 @@ default: script: - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi - if [ "${extension}" != "none" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.yml"; fi - - if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi - - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi + - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz.yml"; fi - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi @@ -111,8 +109,6 @@ build:qemu-amd64-base: target: qemu-amd64 extension: security use_rt: disable - wic_targz: disable - targz: enable build_swu_v2: enable build:qemu-amd64-base-kernelci: @@ -122,8 +118,6 @@ build:qemu-amd64-base-kernelci: target: qemu-amd64 extension: kernelci use_rt: disable - wic_targz: disable - targz: enable deploy: disable deploy_kernelci: enable @@ -134,8 +128,6 @@ build:qemu-arm64-base: target: qemu-arm64 extension: security use_rt: disable - wic_targz: disable - targz: enable build_swu_v2: enable build:qemu-arm64-base-kernelci: @@ -145,8 +137,6 @@ build:qemu-arm64-base-kernelci: target: qemu-arm64 extension: kernelci use_rt: disable - wic_targz: disable - targz: enable deploy: disable deploy_kernelci: enable @@ -157,8 +147,6 @@ build:qemu-arm-base: target: qemu-arm extension: security use_rt: disable - wic_targz: disable - targz: enable build_swu_v2: enable build:qemu-arm-base-kernelci: @@ -168,8 +156,6 @@ build:qemu-arm-base-kernelci: target: qemu-arm extension: kernelci use_rt: disable - wic_targz: disable - targz: enable deploy: disable deploy_kernelci: enable @@ -211,8 +197,6 @@ build:qemu-amd64-test: variables: target: qemu-amd64 extension: test - wic_targz: disable - targz: enable build:qemu-arm64-test: extends: @@ -220,8 +204,6 @@ build:qemu-arm64-test: variables: target: qemu-arm64 extension: test - wic_targz: disable - targz: enable build:qemu-arm-test: extends: @@ -229,8 +211,6 @@ build:qemu-arm-test: variables: target: qemu-arm extension: test - wic_targz: disable - targz: enable # secure boot images build:qemu-amd64-secure-boot: @@ -240,7 +220,7 @@ build:qemu-amd64-secure-boot: target: qemu-amd64 extension: ebg-secure-boot-snakeoil use_rt: disable - wic_targz: disable + targz: disable deploy: disable build:qemu-amd64-secure-boot-encrypt: @@ -250,7 +230,7 @@ build:qemu-amd64-secure-boot-encrypt: target: qemu-amd64 extension: ebg-secure-boot-snakeoil use_rt: disable - wic_targz: disable + targz: disable deploy: disable encrypt: enable @@ -261,7 +241,7 @@ build:qemu-amd64-swupdate: target: qemu-amd64 extension: ebg-swu use_rt: disable - wic_targz: disable + targz: disable deploy: disable # secure boot images arm64 @@ -272,7 +252,7 @@ build:qemu-arm64-secure-boot: target: qemu-arm64 extension: ebg-secure-boot-snakeoil use_rt: disable - wic_targz: disable + targz: disable deploy: disable # secure boot images arm @@ -283,7 +263,7 @@ build:qemu-arm-secure-boot: target: qemu-arm extension: ebg-secure-boot-snakeoil use_rt: disable - wic_targz: disable + targz: disable deploy: disable # bullseye images @@ -312,7 +292,7 @@ build:qemu-amd64-secure-boot-bullseye: target: qemu-amd64 extension: ebg-secure-boot-snakeoil use_rt: disable - wic_targz: disable + targz: disable deploy: disable swupdate_version: "2022.12" @@ -342,7 +322,7 @@ build:qemu-amd64-secure-boot-buster: target: qemu-amd64 extension: ebg-secure-boot-snakeoil use_rt: disable - wic_targz: disable + targz: disable deploy: disable encrypt: enable @@ -354,7 +334,7 @@ build:qemu-riscv64: target: qemu-riscv64 release: sid use_rt: disable - wic_targz: disable + targz: disable deploy: disable cve-checks: diff --git a/Kconfig b/Kconfig index 600e568a..62be071f 100644 --- a/Kconfig +++ b/Kconfig @@ -151,23 +151,6 @@ config KAS_INCLUDE_DEBIAN comment "Image features" -choice - prompt "Image formats" - default IMAGE_FLASH - -config IMAGE_FLASH - bool "Flashable image" - -config IMAGE_ARTIFACTS - bool "Separate artifacts for NFS boot" - -endchoice - -config KAS_INCLUDE_IMAGE_FORMAT - string - default "kas/opt/targz-img.yml" if IMAGE_ARTIFACTS && (TARGET_QEMU_AMD64 || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM) - default "kas/opt/wic-targz-img.yml" if IMAGE_ARTIFACTS && !(TARGET_QEMU_AMD64 || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM) - config IMAGE_SECURITY bool "Security extensions" select IMAGE_DATA_ENCRYPTION @@ -186,7 +169,7 @@ config KAS_INCLUDE_TESTING string default "kas/opt/test.yml" if IMAGE_TESTING -if IMAGE_FLASH && !KERNEL_4_4 && !KERNEL_4_19 +if !KERNEL_4_4 && !KERNEL_4_19 config IMAGE_SWUPDATE bool "SWUpdate support for root partition" @@ -242,3 +225,11 @@ config KAS_INCLUDE_FULL_ENCRYPTION default "kas/opt/encrypt-all.yml" if IMAGE_FULL_ENCRYPTION endif + +config IMAGE_TAR_FORMAT + bool "Separate artifacts for NFS boot" + depends on !IMAGE_SWUPDATE + +config KAS_INCLUDE_TAR_FORMAT + string + default "kas/opt/targz.yml" if IMAGE_TAR_FORMAT diff --git a/kas/opt/targz-img.yml b/kas/opt/targz.yml similarity index 71% rename from kas/opt/targz-img.yml rename to kas/opt/targz.yml index fd8303e4..5c0b87bf 100644 --- a/kas/opt/targz-img.yml +++ b/kas/opt/targz.yml @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2024 # # Authors: # Quirin Gylstorff @@ -14,4 +14,4 @@ header: local_conf_header: image-type: | - IMAGE_FSTYPES = "tar.gz" + IMAGE_FSTYPES:append = " tar.gz" diff --git a/kas/opt/wic-targz-img.yml b/kas/opt/wic-targz-img.yml deleted file mode 100644 index 74053f52..00000000 --- a/kas/opt/wic-targz-img.yml +++ /dev/null @@ -1,20 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2019 -# -# Authors: -# Quirin Gylstorff -# -# SPDX-License-Identifier: MIT -# - -header: - version: 14 - -# lava uses nfs to deploy the image. For this we need a tarball instead of -# full image - -local_conf_header: - image-type: | - IMAGE_FSTYPES = "wic tar.gz"