From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6945105578761912320 X-Received: by 2002:a2e:8e28:: with SMTP id r8mr18082480ljk.156.1618215637170; Mon, 12 Apr 2021 01:20:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:507:: with SMTP id o7ls395907ljp.6.gmail; Mon, 12 Apr 2021 01:20:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydOv4G45WgL7ImEIQ2Z2jQn0miLxLPTo63IF/3IzLkETgoi9CRNL207nTfOa35NhFds9Dm X-Received: by 2002:a2e:8159:: with SMTP id t25mr17287935ljg.84.1618215635976; Mon, 12 Apr 2021 01:20:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1618215635; cv=pass; d=google.com; s=arc-20160816; b=FBav4HqDkALVllmk/+bnIW10oggIRza8lPizFv0DTO+gppdIc+DsvIAVilx8YFINxi 1uGQGYSIHugihSws5zqUeQdsBBwMdtTOQOc8UexeqOa46BD8QldPxZoL2ManwOcPoGCs xYgfXccbJQrs1pZ+KgZTNljz+I69/k66XSSKVXadK23z27WI6Gdr4MD9NZrfXrzKkD+Y H3Nfw7nNggNmMTlfwpR7ikLCvz0L+FiIGBt/GyPiZfcH0hFYNowwGf+d/wd8CgVNO0xn +50NYW1cQq7yT29ZHV4+9gSsp1IRDjxIhZsn2pBTVsKFojco0N0UmrKp2Zf6BrLmmBU1 fi3Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language:in-reply-to :user-agent:date:message-id:from:references:to:subject :dkim-signature; bh=vSsEyZaD76JoVzGYtLT57rrLIDXtFRqq0qS7ygMxzfw=; b=n103Fs5lntnHSUQSse3ZXuqcjy7BZHLQ4/KOzZ4PdvFjIfLaJY3qlhSZzCPL4TrisM IEtDV/69Syc+vtrXoS6I+30cc5Wt8OKIfgIk5cdW3gf8tP6+xHQN9W/e2J3ZTTZ6Y2Ok CxVDzEyfIt3vUNUNBPdeWybvoGN7G3BC/K5zbzgo/ov8X1mzskfou/lQdRae1q4H/zmL 1oiiKEk7v8n0ljCs/qJsl+2QDluBM6uui94dEvNpzlg9vI7R/b13orj1IE3Mv000+fHs XqY9oh4GdIKxJ2vPZstlAKDbw2MpyjQOLJGfMQgQjWGBqbH4OGoEbIJHTUyGbRPcYl1x R6Tg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=M9OYjOia; 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 silvano.cirujano-cuesta@siemens.com designates 40.107.5.85 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50085.outbound.protection.outlook.com. [40.107.5.85]) by gmr-mx.google.com with ESMTPS id v203si709837lfa.10.2021.04.12.01.20.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Apr 2021 01:20:35 -0700 (PDT) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 40.107.5.85 as permitted sender) client-ip=40.107.5.85; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=M9OYjOia; 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 silvano.cirujano-cuesta@siemens.com designates 40.107.5.85 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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=j9hsMNuXxOTKagzrb0r0us3NqNzMlrW+OEbNFAhZcMFGPRAqnxIMKJx3h+yEw0JvY8Vk3rpZ43XwmyoP3m5yRrEoaZtUf5T+0dlls0zkiMompobpz1jwrD/34p37K56MOjDDaCpbfOE1zoHZCOmddX2aJHNX49WAWq8JREZPvKDHFXgrPET2QtnAtAWjM7LrC5xlNGpEmItmtJoDnZufpQLmrvQ88yubnGTF9rT7C1cFtcevNQy7ngWTcQYVy0TiliiWid54fkJH/koB0qu62OKWKKxsQ6GM4MU07KbvysaXeo9ndpyrOC1e/afX0AWrLaWdrLCeaKR81BDKdqjFfw== 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-SenderADCheck; bh=vSsEyZaD76JoVzGYtLT57rrLIDXtFRqq0qS7ygMxzfw=; b=PXtQ605FMUtl1K4CVpQMqoaP3LkAuHlYUxD9HfOmhhTpya0Osupi+KGBBbgTgtgbS21lT3xsyaCH3Ej5msxILfubehgTRKMwg+lnINltaVKwzqWTnu//Zrfo7lEbUseWCFDnZIjzZeBb5LfAppvDcTdquxgn2T6D56jP7CZWsGeOw4Q3JP69CnynbTKKwjVRk7vGVr7eY61+bPnc67Nad468T9O8CIvnwinQk+PKczTSpn/a6D+l35HEG6PoFH7278vnEAEt+7cvrLD3zwxTPQ3rQaHQwgFebksSA48EG8nWnBUyQM4AcntoyA9SXRSqwuyZI+jMPgSwtcROxftLew== 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.onmicrosoft.com; s=selector1-siemens-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vSsEyZaD76JoVzGYtLT57rrLIDXtFRqq0qS7ygMxzfw=; b=M9OYjOiaB1DHsL/zyvAlxJ/CVWCeZuE+8kt+F8bvmgTf21rMLtU4FCgnwg2wYMYHp/wgF1HmNViPbXn/8HtrI8NGtJnNMROZuTpjuK56EQWgy7c4eJVa96Y2G2lBklSQGqA2bTm5i6u37Lc/LxNzsMTa1PhfkxRTdswbL2Ud+lE= Authentication-Results: siemens.com; dkim=none (message not signed) header.d=none;siemens.com; dmarc=none action=none header.from=siemens.com; Received: from AM0PR10MB2708.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:12a::30) by AM0PR10MB3234.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:182::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Mon, 12 Apr 2021 08:20:34 +0000 Received: from AM0PR10MB2708.EURPRD10.PROD.OUTLOOK.COM ([fe80::4807:51a1:30ab:908b]) by AM0PR10MB2708.EURPRD10.PROD.OUTLOOK.COM ([fe80::4807:51a1:30ab:908b%7]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 08:20:34 +0000 Subject: Re: [PATCH v8 1/5] classes: add root filesystem containerizing class To: Jan Kiszka , isar-users@googlegroups.com, Quirin Gylstorff References: <20210329155640.62445-1-silvano.cirujano-cuesta@siemens.com> <20210329155640.62445-2-silvano.cirujano-cuesta@siemens.com> <24c63901-abd1-7239-0dcb-b069c5e5894e@siemens.com> From: Silvano Cirujano Cuesta Message-ID: <58bf739f-1710-d3bc-2dd9-070e977286d1@siemens.com> Date: Mon, 12 Apr 2021 10:20:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 In-Reply-To: <24c63901-abd1-7239-0dcb-b069c5e5894e@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [2001:a61:3bff:3002:8e2c:20f9:9d99:194a] X-ClientProxiedBy: AM0PR02CA0187.eurprd02.prod.outlook.com (2603:10a6:20b:28e::24) To AM0PR10MB2708.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:12a::30) Return-Path: silvano.cirujano-cuesta@siemens.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [IPv6:2001:a61:3bff:3002:8e2c:20f9:9d99:194a] (2001:a61:3bff:3002:8e2c:20f9:9d99:194a) by AM0PR02CA0187.eurprd02.prod.outlook.com (2603:10a6:20b:28e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 08:20:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42416736-1e7f-4166-0cdf-08d8fd8bd826 X-MS-TrafficTypeDiagnostic: AM0PR10MB3234: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L2+JHhK83CXNrm+Ire0kL8gGcuydgXEzTL+RJug+UJ+jmqNZiqKzXmUkTHqNZWmXsXsnfe6tRm+ZjKxJjWtnOHvkrgwMpsoQliYpM8QkwmN+Ir7AMIV1JZvVFfnXs8577luLl8PaikoFPdlnMdMlEQpLpWEdKnYXZCnZYMxGVSY/oPEw4FVfEbvgB6NbxXeLqaPJtytUFo6VK9ES7+eJACgoq7P/xsOhOhqsIlN0ka/+FosHQ+lYm1DJjfodrXkDb7RgJn0YCNQxIq/xDrBaSxjAOgmJ6CnRsbLESzSyoL4bPTq05xn4TCfnaAH9+l18wj8wVgdQovCMHnvCvfttfJM/tBcmlutV3Eryaz9XWNsUf+lK3cFevR0SvvrZRsFoDwFN9ECkTIfayXiMhgaT/CFe1CDrPfXnkKAcJI98EuVrHXUB9V8GhKwL5GPOpsXwv4XfIvBSEoVgQM1gHkCyFfyVNHCFVEhyG1fgaW1U1JIq+THOleSBfH/teCrOMo8TnfpV1BGCcvPiq/lU8SiQigok/AM+oElV6wtxbl0ddRiDdyZve6W1LaWct7A8DgJgDL/dR/vcQXgqcasLb66re6BkHEGM79nIh8XotTsk+Uq7odhkHWnHvkglnu+r4BVfudoA1ncERBA8lKEPmyzl4onuGUJCpLK/kKIbl376ruaJSUI9vYNCAP1Q0x45MLlu X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2708.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(346002)(376002)(136003)(396003)(39860400002)(53546011)(6486002)(2616005)(110136005)(8676002)(16526019)(186003)(316002)(66946007)(66476007)(66556008)(6636002)(31696002)(8936002)(478600001)(86362001)(5660300002)(38100700002)(2906002)(36756003)(83380400001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?L3psMXYrZUMvMTFEWlRubzdjRWF5Rkp6dUlycGN4SEhUc3hiQmNqblFqQkpH?= =?utf-8?B?U2RPMkgyRFRpOFVXTWxjTFplZHNnd1lDWThFa05qRDZGdVp4eWhqV3QwNjVI?= =?utf-8?B?VzVHYzMrTkJKMnV4YldaRHhzYmowY0ZhS1NtUmJuaFdYQnROZXZYdU10WnlI?= =?utf-8?B?RjZ3ZkVRUHpwazVRdWI3SkwxRzhuKzdvc2s5ZzNLc2ZaKy8wK2ptU2RRVTNz?= =?utf-8?B?UEhpZWVCNUJwNGtZeGkvMlV0cEVuOGV2WTlxUDdiMlB4UHVLQ25jcEc4YXdV?= =?utf-8?B?RkVmd1c4bWI3SVhmb1lOeXZISWxVOGpOMVJlNXRiaUhIQ2xrN1k1SmlUYnJn?= =?utf-8?B?YmsrdjMyUFJpS3dtR3dxdVdWeG1hNDd6S2VnRGJjcEQ3RXBqWWwvZ290WTdt?= =?utf-8?B?bUM3UVpKNUFTUzd3N0QybStNbjEyb2dFblVWQThTNHE3Z3dCdXp2cjEzSHBY?= =?utf-8?B?ZGxXK2VudlB2WGVrdzNWdm1VcWQyR1RZZTcxV1h0ejhjdTNPdlpQZWdBbmM0?= =?utf-8?B?UTd1SmFZQVFhaEJsd2x5ZHBGNkRDMmNhYjNBL2hBWEdKMnNqNXRCUms1SEFM?= =?utf-8?B?ZUxDZHRnRXhRSUlPRk1JSjdpMWlqQWh4SUJCRjE2amdyZ0ZBdXNzMUxwTmpI?= =?utf-8?B?SExKYWh4TWFnZHlaRndZOTUzM3hrK3dSVjBLK1dxUTlMTWorbHNhN2hJWUVL?= =?utf-8?B?UGxlbG94eE9DUHVhYWZZWi9oVjlUaWFkNWEwQ2dSWkIwalhuaWQ4R29XUEw2?= =?utf-8?B?K1l0MVY1MGlMd3pNeUxzSWxvaHJpNUkrWlhBYnVHYm16d3F2Y21jSmdYaHlP?= =?utf-8?B?WTNWbXkzYUllejBjaUJVVGZ3MDlQMnJuWFRIc1lvSW1XQTdnK25UaHgwNFpW?= =?utf-8?B?SElSMllTR1YzRFIxL2NHR281R3FGM2lEd2dWUE5JdnQvR0kyVm1rZzhmSFR6?= =?utf-8?B?bjNQWFFoM1JOSThiclF4SlYzT0NEUE9IRTEvWmhadnBRRjlNZURWK3VUZFhj?= =?utf-8?B?eVhnQ3RWMkRubTJ0SXhiS3RNNkltK0RadVJNOEJ3SExoaDM2ZXB6Sitsdkts?= =?utf-8?B?eUE5dWxRTUpFNlluSnlNbDM4Z3dyUTZLbk15WUUweTF4azU3QkhPM2dLVWg5?= =?utf-8?B?RWNONVBlVlVPTWRsWkxBV1I3SUp6K1Fvc3lyZVdsTXJVeW41dk96Smt2NXB5?= =?utf-8?B?dnNpazdjSGxyWWlGSXlBYUZPN1RVZ0w4S1FlWDhOcDVWTS9Ca3I0enN1Q1Fs?= =?utf-8?B?VWduaGVTbWdwOXdQaEZXUU5DelJyTEpmWWMzUExvTUw1WjVyYzVOVk56SXJL?= =?utf-8?B?c1pESVZGSmRFZmlvc2RncmZPUTBqbzF4R05sNTdlODk4RDl0QXh3bXhJRWFv?= =?utf-8?B?WVJFTW0rVDY3M2pKZWVDL3RQS3lQV0g0RkhjRlFqUlZ2TGpvQ0VPcFdkeURw?= =?utf-8?B?QkZSQ2t5UlBOZVp4UEZiZFpHajJTN2dOVllZNGY1SGpQVmRMRE1keVJlKy85?= =?utf-8?B?NEVubHMyMmo2cXRNc3ZUeXRpcTN0bmpEaXpIYlQzR1laWHV5OEdpczRFZnhm?= =?utf-8?B?aXhkc2t0WldHRTUxZ243ZFJoS0pjUGlmK2xUbGljNlpBT2w2aWhaUnAvckFK?= =?utf-8?B?eUVlQU0rNCs0dEhPMjIzeUUyS0NTYmpjWDVWRWx6Zm5NbDZYbFdpU09rMFRT?= =?utf-8?B?aHJRNUd6UzgrbmcvN2J2YVJkWTlXWHpWUUF0OU1nVFNZMVJWMm1iMnRDOWcw?= =?utf-8?B?QjJBRTR1ME1pb3JUVTF1QUpoVWp2bmRtSW5oWWV0Ulp6bHk4UTVFaDhadURr?= =?utf-8?B?UHUwbENpRWlGVEN4OTF5NS82MEptT0gzekxudkNjdnRKL2VkRnRCL2tsZ3lr?= =?utf-8?Q?W7YdGGdeFpiDD?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42416736-1e7f-4166-0cdf-08d8fd8bd826 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2708.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 08:20:34.5186 (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: t4+UixBgOtVQ+l3PuYduxtttwVMYQWsxeC29o6H7Re/TyX0kZW1rw+hCrD1KQ6N5YRe9B8TAeifOAJaudhv7kQgy4gTnKZJvRAS9a8QyMgKvDw2G5j+Rk4ZnX4+iZiL8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3234 X-TUID: 5cGH2ebU6RVV Apparently my mail client mangled my previous reply... :-/ Thanks to Jan for making me aware of it. This one should be readable. On 08/04/2021 19:55, Jan Kiszka wrote: > On 29.03.21 17:56, [ext] Silvano Cirujano Cuesta wrote: >> This class can be used to create container images which root filesystem >> is that generated by the do_rootfs task. >> >> Containerized root filesystems have following possible use-cases: >> - Using ISAR as a container image builder. >> - Simplify distribution of runtime rootfs (binaries, libraries, >> configurations, ...) for application development or testing. >> - Distributing SDKs. >> >> Signed-off-by: Silvano Cirujano Cuesta >> --- >> .../classes/image-container-extension.bbclass | 82 +++++++++++++++++++ >> meta/classes/image.bbclass | 1 + >> 2 files changed, 83 insertions(+) >> create mode 100644 meta/classes/image-container-extension.bbclass >> >> diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass >> new file mode 100644 >> index 0000000..f693627 >> --- /dev/null >> +++ b/meta/classes/image-container-extension.bbclass >> @@ -0,0 +1,82 @@ >> +# This software is a part of ISAR. >> +# Copyright (C) Siemens AG, 2021 >> +# >> +# SPDX-License-Identifier: MIT >> +# >> +# This class extends the image.bbclass for containerizing the root filesystem. >> + >> +CONTAINER_FORMATS ?= "docker-archive" >> +IMAGE_INSTALL += "isar-exclude-docs isar-disable-apt-cache" >> + > > Quirin tried latest Isar on meta-iot2050, and that now fails during > setup of openjdk: > > Setting up openjdk-11-jre-headless:arm64 (11.0.9.1+1-1~deb10u2) ... > > > > update-alternatives: using /usr/lib/jvm/java-11-openjdk-arm64/bin/rmid > to provide /usr/bin/rmid (rmid) in auto mode > > > update-alternatives: error: error creating symbolic link > '/usr/share/man/man1/rmid.1.gz.dpkg-tmp': No such file or directory > > > > While watching the installation, I happened to see isar-exclude-docs > suddenly being installed while not being selected explicitly, > specifically not for the target image. I bet it's coming in via this > class and its unconditional extension of the IMAGE_INSTALL list. You're right, it was a late addition and I didn't realized that I was unconditionally adding it to image.bbclass. This exclusion was only meant for container images, you don't want to have manpages and APT caches in a container image. My fault, I'll provide a fix. > > That leads to (at least) two questions: > - Why do we have isar-exclude-docs here, and also > isar-disable-apt-cache? > - Does isar-exclude-docs have some issue that prevents the usage > together with openjdk, or are those simply incompatible by design? IMO if someone wants to get rid of manpages for very small devices, the recipe isar-exclude-docs should help on that. The same applies to isar-disable-apt-cache. My error just triggered a hidden issue: the incompatibility between the implementation of the isar-exclude-docs recipe and other components (for example, openjdk). IMO this issue should get fix too (apart from the unconditional addition of the recipe). Unless such a configuration is unsupported, but I think that's the scope of the other thread that you opened ;-) > > In any case, we have a regression. Yes, we do. Silvano > > Jan > >> +containerize_rootfs() { >> + local cmd="/bin/dash" >> + local empty_tag="empty" >> + local full_tag="latest" >> + local oci_img_dir="${WORKDIR}/oci-image" >> + local rootfs="$1" >> + local rootfs_id="$2" >> + local container_formats="$3" >> + >> + # prepare OCI container image skeleton >> + bbdebug 1 "prepare OCI container image skeleton" >> + rm -rf "${oci_img_dir}" >> + sudo umoci init --layout "${oci_img_dir}" >> + sudo umoci new --image "${oci_img_dir}:${empty_tag}" >> + sudo umoci config --image "${oci_img_dir}:${empty_tag}" \ >> + --config.cmd="${cmd}" >> + sudo umoci unpack --image "${oci_img_dir}:${empty_tag}" \ >> + "${oci_img_dir}_unpacked" >> + >> + # add root filesystem as the flesh of the skeleton >> + sudo cp -a "${rootfs}"/* "${oci_img_dir}_unpacked/rootfs/" >> + # clean-up temporary files >> + sudo find "${oci_img_dir}_unpacked/rootfs/tmp" -mindepth 1 -delete >> + >> + # pack container image >> + bbdebug 1 "pack container image" >> + sudo umoci repack --image "${oci_img_dir}:${full_tag}" \ >> + "${oci_img_dir}_unpacked" >> + sudo umoci remove --image "${oci_img_dir}:${empty_tag}" >> + sudo rm -rf "${oci_img_dir}_unpacked" >> + >> + # no root needed anymore >> + sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" >> + >> + # convert the OCI container image to the desired format >> + image_name="isar-${rootfs_id}" >> + for image_type in ${CONTAINER_FORMATS} ; do >> + image_archive="${DEPLOY_DIR_IMAGE}/${rootfs_id}-${image_type}.tar" >> + bbdebug 1 "Creating container image type: ${image_type}" >> + case "${image_type}" in >> + "docker-archive" | "oci-archive") >> + if [ "${image_type}" = "oci-archive" ] ; then >> + target="${image_type}:${image_archive}:latest" >> + else >> + target="${image_type}:${image_archive}:${image_name}:latest" >> + fi >> + rm -f "${image_archive}" "${image_archive}.xz" >> + bbdebug 2 "Converting OCI image to ${image_type}" >> + skopeo --insecure-policy copy \ >> + "oci:${oci_img_dir}:${full_tag}" "${target}" >> + bbdebug 2 "Compressing image" >> + xz -T0 "${image_archive}" >> + ;; >> + "oci") >> + tar --create --xz --directory "${oci_img_dir}" \ >> + --file "${image_archive}.xz" . >> + ;; >> + "docker-daemon" | "containers-storage") >> + if [ -f /.dockerenv ] || [ -f /run/.containerenv ] ; then >> + die "Adding the container image to a container runtime (${image_type}) not supported if running from a container (e.g. 'kas-container')" >> + fi >> + skopeo --insecure-policy copy \ >> + "oci:${oci_img_dir}:${full_tag}" \ >> + "${image_type}:${image_name}:latest" >> + ;; >> + *) >> + die "Unsupported format for containerize_rootfs: ${image_type}" >> + ;; >> + esac >> + done >> +} >> + >> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass >> index eddc444..ec93cab 100644 >> --- a/meta/classes/image.bbclass >> +++ b/meta/classes/image.bbclass >> @@ -76,6 +76,7 @@ inherit image-tools-extension >> inherit image-postproc-extension >> inherit image-locales-extension >> inherit image-account-extension >> +inherit image-container-extension >> >> # Extra space for rootfs in MB >> ROOTFS_EXTRA ?= "64" >> > -- Silvano Cirujano Cuesta -- Siemens AG, T RDA IOT SES-DE Corporate Competence Center Embedded Linux