From patchwork Tue Oct 12 04:04:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 925 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 12 Oct 2021 15:04:27 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 19CD4PBS003859 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Oct 2021 15:04:25 +0200 Received: by mail-lf1-f64.google.com with SMTP id bt36-20020a056512262400b003fd7e6a96e8sf6520503lfb.19 for ; Tue, 12 Oct 2021 06:04:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634043860; cv=pass; d=google.com; s=arc-20160816; b=PXFBUJsFKyVE47rZ3wQ2qkCWsuuinyZ1M6Ec2eJsMZtQ5EKSEYKnyrVoxc//kefkaE pb2EXjua5oZUosOX9Az5mgG8OtDIZDou7xngit1qydbXoKr/Mwqm75hcywvCaHyVZFIu qOSWNeCOtq+6vFH75+mrCkRn1XprXkBHZRUCFmT8cBe4BbXFG851qWrIMu5mURUtcrzN pmEKFfljkytJ8WZ4TSzJ1Bwc2YfOYIO2ta3t1Rc+WZRyW+dA/WxulHaoHCqmLLWFh6Rl Hb9B810k15Epg6BIhfWI+H+C2XwF8C+2XLytDezQvIWsXabBz1WhNPT34rfM4Pm7Hi6n rFfw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=FlWAKb/I6SeE08jbq0Q4qaqZTb6w1spmsBhgk++fPVg=; b=ahsHhVLb+q7aObYn/TIDcUL9Vjly7rUFtz8oQ+tZ0KBR5iLhUMO6R7N0w+Zs8oAo50 1IWWAWgggAAnc1Wadhus6sLETDzp5FByYuA51u64DFJNUdwkG0AOe/RH09TLfykm+n4f oXNFrDccLuiAlRL7Ix+B6duCMkQPnRb9t4LsFsgVLc44uMYokWXBSl0ABI71zh+zeH/x i2ViUDAOJwLrW0ggclwx3wpr0m+68aF1j12M48TxmAnB2hFcFCFK1glIhUf0EbVTIx1D 3wypzozSuARMOp2kvQNmdkuoUwYjqvK5XWc9Mje0HRoEeNIniGVP46TjMnL0JEGjYhFq wpsQ== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=FlWAKb/I6SeE08jbq0Q4qaqZTb6w1spmsBhgk++fPVg=; b=V7Q/m035HoanSAikDgOlLej8U/ftWfeP9EwTdj7+H+O8/kbq+2Y58va29+Mhmlk9P7 1XdYK4h5M5FCnKbGGAtR7xbT8vJ1B+9M+cXMpiXgcxSxp/I+xnfcAnO0nnqPN5v+EIKb JpgyvRSois8krKbgFjxxxlsoj2uUNenO/+dJ/tgwUfLe7hoyoe3Acd/056mT8pqp9R+4 PiZgfODNklZfaqa7e3lO0Rx8cyXG4f2QQuRUEfsPN6Fzji2HYlICIeoO69RMqFoQ/ToA ATdhRaCqGXQV0e7VCJiRGyyF5BpCU1UPtTHT6bcjdVSlsRSXOp951SB9NWVc5obJlrfS 1R6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=FlWAKb/I6SeE08jbq0Q4qaqZTb6w1spmsBhgk++fPVg=; b=AX/J82NVMarrBWCjISbI1gB06FkkHE9AvCyDuB4CidwLcJuEuKUuplgB4PzlF1eP0Y p7dbNbkqI5MZuxHEeIdR6Fs64jJqnqz6EXXVN1CRGsc4/TLenFddBGrMQKt/WqHWMpMm p87B6cujZktjDiOMGG7EW5eDVkVfcSR43lUjjUWYoNKjxHaTS1SN5YrnixNPW/zpsBT1 prAhPjOc9TAIgAQuFK9cbJBhUhcR7Wx8ls/eEpRsQTUj6yjCN99DVpe91ImXkkxHk9Ob bXUU7+i1gMyvfDEcrWBfTAWHhZXIRhBTUdV17aJnOTpIwgaHeHnCGSVHFesqNUn2QV1l U7PA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532KpV3zzBD7J7hLb+thWcJVzVPgQbhNnRGZD8U2lb995prISI13 Ar0Lve5H8pdq1k+R/w065ts= X-Google-Smtp-Source: ABdhPJxeMj6WEH5HWdiYrlBLH6o8Q3tLi9KRmN6Ta/FzmtdpIVqNmKhZVU0ZJJzcq90lcXq4Ide9MA== X-Received: by 2002:a05:6512:11cc:: with SMTP id h12mr34374493lfr.110.1634043859735; 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-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 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; 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 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX 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