From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7018164937970155520 X-Received: by 2002:a05:6512:32c1:: with SMTP id f1mr5019459lfg.498.1634120276150; Wed, 13 Oct 2021 03:17:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3a83:: with SMTP id q3ls499321lfu.2.gmail; Wed, 13 Oct 2021 03:17:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFMRWtu20QFy46IO69/XliaoaKyiT9OGUCT740jwFzfDToEPJuq77jPzjlpdO7l5rvOAVy X-Received: by 2002:ac2:4e4f:: with SMTP id f15mr39607329lfr.323.1634120274947; Wed, 13 Oct 2021 03:17:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634120274; cv=none; d=google.com; s=arc-20160816; b=orHYXZ4FnWSbxCoB1vPQvnGuffBtXo+/xHpEcaRNiKrMhZ5KrDmu2jS0LkQFVeswWl qm67vWwHnkoHsbQGfkmqgIYTLBlvTHblYiBHgVAob4VdEr1IMMl4jxK6PPVkTaKwDr6s 64eSFkEM9MvsdKUyEEdWrxRDu5Ygn+gi6rfCXksj2gkzeyCCFKAluP+qa1Qq8UnvePWT P5hSKDYvsxATiKBF+EyGKQpnvh8PUlx+MiPsg8popipGfQla/c90KemYhKe7wnNnJ/H6 UTY+TUbwNLxuw4tVBzFwhwKvnnnj6/hpvgiKtSYI9S436T8IzjkRotWRVD8zPS0aoacR lIZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=C7S1u8SWlUAhPDYqiRXzhg8vljtFq5utRptNT1IPTGI=; b=NDicQa6bLD9uX/mnKUEpoHnPnfJgooQddvpATfXz3TWl8MD62D21j9JIg/JFh2hNxC hVZjkroVgknHBapDZAugSnD7XL7n6DfJUDD1ySqjMuAEGACkhiWRq6bdTunNEg4gU0zi HeDjQ8ozxRY8Azr+7ihXOaUxLioPURQI6cW14lUjFmUI9JSu0XuGAqj3zg7lYF9l8XmY 21zlzXBi6+6obDbAFbxYsswMNIbSNTSniAOQGMzDqP5W82lO0XLzlXBB3SzMJyzgMB2G JqPmjQrq+9FMD4w+Cx6X+pJtTMoE6IMXN2T9rjoQ8o1heJSzkEKRT0WAXkFye4HgyogM 5sHQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id o25si78562lfo.9.2021.10.13.03.17.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Oct 2021 03:17:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 19DAHsa7000313 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 13 Oct 2021 12:17:54 +0200 Received: from [167.87.72.172] ([167.87.72.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 19DAHrqm003613; Wed, 13 Oct 2021 12:17:53 +0200 Subject: Re: [RFC PATCH 2/5] meta: refactor containerization To: Adriaan Schmidt , isar-users@googlegroups.com References: <20211012130413.1719424-1-adriaan.schmidt@siemens.com> <20211012130413.1719424-3-adriaan.schmidt@siemens.com> From: Jan Kiszka Message-ID: Date: Wed, 13 Oct 2021 12:17:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20211012130413.1719424-3-adriaan.schmidt@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: G3EkPmF1rrrj On 12.10.21 15:04, Adriaan Schmidt wrote: > Don't unmount, but instead use "stay on one filesystem" options > ...which works because there are no bind mounts involved. BTW, providing a "why" (e.g. "simpler") would be good for any commit message. Jan > Signed-off-by: Adriaan Schmidt > --- > meta/classes/image-container-extension.bbclass | 3 ++- > meta/classes/image-sdk-extension.bbclass | 6 +----- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass > index e26604a..762be4a 100644 > --- a/meta/classes/image-container-extension.bbclass > +++ b/meta/classes/image-container-extension.bbclass > @@ -19,6 +19,7 @@ containerize_rootfs() { > # 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}" \ > @@ -27,7 +28,7 @@ containerize_rootfs() { > "${oci_img_dir}_unpacked" > > # add root filesystem as the flesh of the skeleton > - sudo cp -a "${rootfs}"/* "${oci_img_dir}_unpacked/rootfs/" > + sudo sh -c "tar --one-file-system -C \"${rootfs}\" -cpf - . | tar -C \"${oci_img_dir}_unpacked/rootfs\" --strip-components=1 -xpf -" > # clean-up temporary files > sudo find "${oci_img_dir}_unpacked/rootfs/tmp" -mindepth 1 -delete > > diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass > index 426b925..2cc5933 100644 > --- a/meta/classes/image-sdk-extension.bbclass > +++ b/meta/classes/image-sdk-extension.bbclass > @@ -33,15 +33,11 @@ do_populate_sdk() { > sudo rm -f ${SDKCHROOT_DIR}/etc/apt/sources.list.d/isar-apt.list > fi > > - sudo umount -R ${SDKCHROOT_DIR}/dev || true > - sudo umount ${SDKCHROOT_DIR}/proc || true > - sudo umount -R ${SDKCHROOT_DIR}/sys || true > - > # Remove setup scripts > sudo rm -f ${SDKCHROOT_DIR}/chroot-setup.sh ${SDKCHROOT_DIR}/configscript.sh > > # Make all links relative > - for link in $(find ${SDKCHROOT_DIR}/ -type l); do > + for link in $(find ${SDKCHROOT_DIR}/ -type l -xdev); do > target=$(readlink $link) > > if [ "${target#/}" != "${target}" ]; then > -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux