From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7018164937970155520 X-Received: by 2002:a05:6512:1303:: with SMTP id x3mr33520508lfu.291.1634043859810; Tue, 12 Oct 2021 06:04:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:4a1a:: with SMTP id x26ls449698lja.11.gmail; Tue, 12 Oct 2021 06:04:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/xmTKmxNlJtXDU5QLFVNlCYLQWivl+XMzh3lj2h0NhGCOCB4wBHqcvFq0MBrKLYh/0/A/ X-Received: by 2002:a2e:a5c8:: with SMTP id n8mr28556732ljp.307.1634043858757; Tue, 12 Oct 2021 06:04:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634043858; cv=none; d=google.com; s=arc-20160816; b=fxADm7gda7oB5Ru+ZO8XBMX3sfhv7KuxGaqI0+5BiOQ4el0D294EcRddIKl32WgwpO yk7a6rXXA1vViakJUg2S9F7XCpQQUIM69nW35PQLpuFPufudDt73tS3/QBdVkJc7KVL+ 5mYlutzn1fAOLEc22PVAS/xUBhSFGRdC5IuWERBq88IB6bZsfQQwy7qduIE6KyUTB0GV EckU5DNCyHhaZ9ozB7zRQh0v8medTWUSYgODiHCT9kW8GOSpnpJbLuZfgI3NzqqfUVwZ lEVDmwsTbiFFIPFVW3FAUxAaf6Vsc6dX7N3NXGMaUb7YUjUKn+sqarTnVYe1CKl2q+AA i62A== ARC-Message-Signature: i=1; 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; bh=g9lAWd7m5tHGPioO1nr+EZ1MiwtCYPRtD27r6DfdJzU=; b=YDmuAOjqqe8GFxfBOgOZrOi5BLHDt/B4IYPZ+pZcTm3e+4Yp8LAWKLF5IdjGBGVl83 XZ5etSXYUBBsUYJVyNZuUx+o8q4CxRM1IICHJWxuwfV6axrLjnYJZ6BzilVykWLw1mZD GlfxZXvRBUM3dyTKNOfKfP7PXhSPPb434fPjfrqECnEx3Ie9WxO4xOyyaGNsGXO1SNFp CJxURuqU1uHqlcs9amCcZwRXNr9XWlXIf7lcA1zc1HaXi3OFjsr1oJw71vuKMyIU0DLD 6OGXDS+5SCTdYJhjCXBKiAGWPZVXeDNV0u0mqTgx2/C9hjJWh6HgQcGFrnRYb40PW0yA Q5Lw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id a19si634298lfb.10.2021.10.12.06.04.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Oct 2021 06:04:18 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=adriaan.schmidt@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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 19CD4I1Z028765 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 12 Oct 2021 15:04:18 +0200 Received: from random.ppmd.siemens.net (random.ppmd.siemens.net [139.25.68.25]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 19CD4HmK009739; Tue, 12 Oct 2021 15:04:17 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [RFC PATCH 2/5] meta: refactor containerization Date: Tue, 12 Oct 2021 15:04:10 +0200 Message-Id: <20211012130413.1719424-3-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012130413.1719424-1-adriaan.schmidt@siemens.com> References: <20211012130413.1719424-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: FLKla0w4Wso+ Don't unmount, but instead use "stay on one filesystem" options 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 -- 2.30.2