From patchwork Thu May 11 10:50:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2801 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:42 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f188.google.com (mail-pl1-f188.google.com [209.85.214.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAoeCF011894 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:41 +0200 Received: by mail-pl1-f188.google.com with SMTP id d9443c01a7336-1aaf5dcd999sf84593335ad.1; Thu, 11 May 2023 03:50:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802235; cv=pass; d=google.com; s=arc-20160816; b=HWbMbLL3/w1npJvgd/R4WrLSRT+ntKT2mThUvHr8NuK68LGEjgzCiqa5AOL3NfxqjB YYSP7O2Etl79cGv/x6+bp+P3HSMMSH6r5DjUKQgxy8v0s55BB63Go+YTyvtale7ZmHfV OlYIYevIiaZE/SnXlgm//+GzNubFDDSPCkiwVZMrgA+gkuJqIMeuoPNbsYOwF3C1QtH1 /6kRxoITWkYGDFmJQCCp316XjmrkP290VTXoIueer8KKJRwwiwaiFZdwJfOXhpe1bmSV WZkBMUWadUlphsnBoHHjtA/BPdnLVSM5JeY4nr+Dn8C3UntEmcKbDSbPu3vahK9pyAuR CK3Q== 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=I5fpxB6bEj1o+/swN0t6ZDRbxNBjRdVtqE9X2B04RiA=; b=SIBz0HLI9+6GQ4Ul4AUwe30gke7Ffxs+/wu4RzlSP+5QCTCJn6w6TFsN0VDTNpb67H U7y9os5chQuInMPpZWMAG0c6R+EviFeooL0Sc6LHCc0wrzGKFHTIAJyK3PClKjYP/lmZ 23QzdbjndPnWJtx3O4QgAOk9Sg7jnXiJZHF/QYUOXnB71jExMymLmJCDPVdI8o8bf2q8 aePfpLo2iDALCvNSNMFMtlYsW5Fi4UapemSyqSiPKevBPH4W9SAjn/4YyoaGqlYO0a49 gnfJ13MsFbU1rUxRQVdDMOACuujptZzKu0N3Ip1KxTTXq9HG9ypb3U65+8ZCWquborph jpIg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802235; x=1686394235; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=I5fpxB6bEj1o+/swN0t6ZDRbxNBjRdVtqE9X2B04RiA=; b=Apj1twGzIEcfOrGzgHRCpzuNbUaiHv6YoEW2MNIp44EJhUbJshoytQr1w7Ngw946jH kfWQu4Tt/bcTtxXgvZsO6pF5u1dVjCOPMnSY78j/A2oFIVtQhgg79v+NERDvmSUkfeRS tb2WczReFupuD7cfMkosB2CcrgIIBihs2fo1hva9M+MEyH2aLy+v/FmLU4on/DohBRE1 MyJ/weftdfKW7/PhW3yp8taSC2OvvQWsFp27RPvt1Su+yLMuhW6aPCswFZqSQxk9V9Yt ATUjvJyjVQg6hhIAYl3FAEmnZ7511fNkf4/HfBYJ9PxWTm76qxMNKnIMLBFvAH+3FWCd J94A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802235; x=1686394235; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=I5fpxB6bEj1o+/swN0t6ZDRbxNBjRdVtqE9X2B04RiA=; b=L5LjoNXsgb/O5De08gyaJvhNdGmqMf0lTZ0mer1834EWKfgv3+GjPInLSH/u/jgvjT LCFTo+KSDa15oiTs/Wmmg+ZcTz51iNL3VrSX4QLt0jXmnkRvmaYdXM5d5GSGSYltX6wn n4OR+83MH4ndrBNOqN7hXZlmSd3SuGf6l0CfQDxzJpi3wQQXbfsr3AsFGxkbxaSqfARi 8aEl83ik1XHwv3p7it+jU/ledlNbxdMkp3r9PiuBVuevTDKrkLM9Xe6FN2g0n2uySJ3a UXLdIM1YAmk+hgJ3XBPs2n7w+OX3yhn/appMbfOyH7k9zukajv5cP3zuNzAMBVx+wBSd kHug== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDwF0KM7j1GywuYIEnS5+s2HzXrcIvVT5kAJVFVuqhlv8XbDfJ0o xkEi9Iw3NVUum8G4fyEuNuU= X-Google-Smtp-Source: ACHHUZ5V9qJKaVGD71yiUk737vNoVMusk1DSU8bqNHQy2q8I6v5RCgwwToTpvoqziwV9Krf024W+vA== X-Received: by 2002:a17:903:248:b0:1ab:7b9:669a with SMTP id j8-20020a170903024800b001ab07b9669amr7674255plh.4.1683802234964; Thu, 11 May 2023 03:50:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:1347:b0:643:9bbd:703 with SMTP id k7-20020a056a00134700b006439bbd0703ls5323131pfu.10.-pod-prod-gmail; Thu, 11 May 2023 03:50:34 -0700 (PDT) X-Received: by 2002:a05:6a00:2408:b0:643:aa2:4dd9 with SMTP id z8-20020a056a00240800b006430aa24dd9mr25858825pfh.7.1683802234089; Thu, 11 May 2023 03:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802234; cv=none; d=google.com; s=arc-20160816; b=zkekIzNMe/XyLbL13VnmIKztkfYFreUkG5U/AqsQ5fQ3MRJJA3kHaIOayLZBSTJm1o FO60oI/kbhPqN4MVamYyxl6Ja9/6bgI+euzkWV+IscopUgE+YCXWf5gyyglISHpv7Jam Iv5NavjiVZP2gflQObBWVCpC+N9Nvw7boIBaCHDU66AHBJcIlAxvaWxQUigoM3Ev+zLG UkJVZv45mywMGC6u5Wq76aaXXt4r0wQ5kmxKiRomOESTEm0eHT371w6NC21tq/6LHUMj 6Jlr8HBea2I4qVZSezKrsZxIvyb8t332m3mnNwjSalwicEoLM486yPgzBUJ309SNc50v aEEA== 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=jQAs9QWiwBuQTUsNnD8rnP/6i70aW3kuhC8pKufStYU=; b=nNzcXm9QOPfNYil14Q7GENqELmf/GCyXWM8yTyitxSFKDiSEKyQchdzMeZlTrGSTBc 3Im//xb/euxwLGaJIaXC+Wt9PIeG1S34fGfJ0Yz2zh0tJy5f0/cZcJem3eoPhCL7TvwH 9qrW1+fHFkRdznCXwq1gfNyB+GKWabZjsGx1ehtkJe6Jbj1F6e9ILuE72kGZS/7qLKQE FGtqaVhbeOaQL+26WXefHnEWzNhHfb8uptuLTXphzW7b+3yRcPEmah5nXgEJl8BHMhd+ cuy0nldQJf3KrixpKFbwwnVyBycHMLFUQv5IAyJHvkhaob2mGIDaIoGYKZCvxoT1EPyg vGCw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id u18-20020a056a00099200b0063b655bf130si533367pfg.6.2023.05.11.03.50.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:33 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ01011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:28 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 1/7] isar-apt: Move cleanup to postprocessing Date: Thu, 11 May 2023 13:50:14 +0300 Message-Id: <20230511105020.1881496-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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: =?utf-8?q?INBOX?= As isar-apt now used only for packages install move its cleanup stage from finalize task to postprocessing. Signed-off-by: Anton Mikanovich --- meta/classes/image.bbclass | 5 ----- meta/classes/rootfs.bbclass | 12 ++++++++++++ .../recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 08b6d3d6..53859eb9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -450,11 +450,6 @@ do_rootfs_finalize() { mountpoint -q '${ROOTFSDIR}/sys' && \ umount -l ${ROOTFSDIR}/sys - rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list" - rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt" - rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" - rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" - if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then mv "${ROOTFSDIR}/etc/apt/sources-list" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 22449d71..7dec7b36 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -293,6 +293,18 @@ rootfs_export_dpkg_status() { '${ROOTFS_DPKGSTATUS_DEPLOY_DIR}'/'${ROOTFS_PACKAGE_SUFFIX}'.dpkg_status } +ROOTFS_POSTPROCESS_COMMAND += "rootfs_cleanup_isar_apt" +rootfs_cleanup_isar_apt[weight] = "2" +rootfs_cleanup_isar_apt() { + sudo -s <<'EOSUDO' + set -e + rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list" + rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt" + rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" +EOSUDO +} + do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}" do_rootfs_postprocess[network] = "${TASK_USE_SUDO}" python do_rootfs_postprocess() { diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index fd8bb648..49992db0 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -51,6 +51,7 @@ ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" # We don't need /etc/apt/sources.list.d/isar-apt.list' while it's handled by sbuild ROOTFS_CONFIGURE_COMMAND:remove = "rootfs_configure_isar_apt" +ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" DEPLOY_SCHROOT = "${@d.getVar('SCHROOT_' + d.getVar('SBUILD_VARIANT').upper() + '_DIR')}" From patchwork Thu May 11 10:50:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2802 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-vk1-f187.google.com (mail-vk1-f187.google.com [209.85.221.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAof3t011899 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:42 +0200 Received: by mail-vk1-f187.google.com with SMTP id 71dfb90a1353d-44fb5fd0489sf1750795e0c.1; Thu, 11 May 2023 03:50:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802236; cv=pass; d=google.com; s=arc-20160816; b=KySCqZMQokCpSmaMwzuU+kPYC8Qw74SbQdumLopqz7z5WPYnxc59kaP17XE2DYw806 Pg9htYSJJ6+yQaMpUvC2MxIZpQSalAV/AFE5wPzGmDyrSTi9kVT3iZopZmupL8uF/A0G REGhTOh8b1dKJYkIe42vOmkAG5KbAN9m/PB+2OwMy6CadW+XNWZqnYn/XUIUWZY9G6JZ GpmX7AbpXkhhwG4eBlKVpq1mJABPSnCSvy8rmNFsEhlZdJwgSqn/EvMZPILpVwig4Fjc xXNG8hX5sHQrHVweIaVbEPVmExYUCtUfEIx+1NhmCx/iqUWYruc+dasg2smaFYbba+oL Gy6Q== 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=4FIe7xtK8Rowts7pDSOT0q2tfrVmqxuBNErXvmABL4M=; b=V2hyK/QeE/i9guIsdv5iKajDgDel5UYsqcAZQTAuwxS3EzuKwiRNQdaEKZo8LYOp3E yrmHJA26VYFHtZlnfXL0v0TfligdURcPDhBmhUEagQheNB7FMs0X7wOt1YPTc1eAcSnK TFdfSsBUcMheJBZYuxP3cmhZdqn+NDVWzvetx0EKneUTBRLWG82ou4Ni+rJf55jTSl+y r5HRli7sk3ThMe7jIjlb7ixdOB7aAwqCAUW3Aawm9S/dFU6Nm4m3uBFqGW/FvSVfnQmS /1VoHb6zQrrKlh5jJA/jbd2Ni3wA/a1jx2YGTmva8ycl385AAWLsKTiEYwNAzXHHWvkS Atlg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802236; x=1686394236; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=4FIe7xtK8Rowts7pDSOT0q2tfrVmqxuBNErXvmABL4M=; b=jMDZ+mz32VPOlDrsTwiPVgwomKcp/sTRFmh0mMbgZrWaps8fu1AgUCjsa9MF+s3Kd6 Dx8DweewTxDFWStb5VsF6zflkwB/UfYQY5OZvtS/ewLobXEPdyYbfP3Xd3kLIW7KsvWU EyZGL1JY0JSRx7b3qnvHYo8ycAgajShd52vEUmWhSgH4yPTn/EDavGYGZ5OrnWTmOx/v yotupfcKqwSjuAFMk3RUry7kiljE5scMthXWw67OV9B8J38bab71mUsgJ12TdRKQlRzg If1iXfxEXacMzVVf0aQn9YCkFnCY6EYEzVZk5Sbt0DkCLHxMgucp3a4q+QNwDCmD6xgm XXHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802236; x=1686394236; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=4FIe7xtK8Rowts7pDSOT0q2tfrVmqxuBNErXvmABL4M=; b=QpMp1tjuuvctUCHbB0P5Xo15Hag5ifwG79sP1TloeQEzZxUcTMzobM/V4TQKxQXK7F KeEkxQtB933uY50JzmCSi8x9WQ4R0/iQzO0pZ5dB90DjFmZRhpUDtQoO8Ybw6BPWNBOg z5SavP/iMKRqMoxRwyq2Z76R37yn9GNsUi9bjeBBK70gQ/HwzHuTqm8zqmNdiPF8BadR Foe3cD0phcRxzKu8ZjDT/wALbjjsFlznc3j6xyIliWb6HALKKT7qSEaJXH5vjoTSqhkY 9I0NPdBrSE/pMBXVtQROjCh/JJTjjKqp8P288x7Y14A8WlxTk6d4bq2HgN6tPhQfGaGA H1xA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDx5AgqiunDYI8xZSjAI5s+lkiLZCr9TqLzj6hwpUnbVBygQbK3f jx2RfGEWnF8VCreuDgOYzy0= X-Google-Smtp-Source: ACHHUZ6Kb1KtJjxmIN03Cm42f+vrhNwdLPqSue7gFUSlotTgmgMzoCXgWrUcZWx9KUImyS5goucNxA== X-Received: by 2002:a67:e10f:0:b0:436:dc9:c409 with SMTP id d15-20020a67e10f000000b004360dc9c409mr2320164vsl.5.1683802236228; Thu, 11 May 2023 03:50:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1f:a0cf:0:b0:440:893c:91c6 with SMTP id j198-20020a1fa0cf000000b00440893c91c6ls4060298vke.7.-pod-prod-gmail; Thu, 11 May 2023 03:50:35 -0700 (PDT) X-Received: by 2002:a1f:bfc4:0:b0:44f:a955:aaa9 with SMTP id p187-20020a1fbfc4000000b0044fa955aaa9mr5536246vkf.5.1683802235603; Thu, 11 May 2023 03:50:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802235; cv=none; d=google.com; s=arc-20160816; b=j46TfgxNG4M6kFFJkz/hS461O3v6BFUlWfDjj+nic9nSkBshhBVAVbvlEDKXYBzjM5 c4Sx9z/28SD2vXjtg5x9ZVwFCNswzMHqVNUp5hIOxeTSc69Gz6y/yHdyTtmZmwaAvagw Rs7dMKOrYJisDbq5CFRuVWmuqtIsw9L1qVQco8cqZGRCFxRGdry34s+KMjhXs/OxREuE b5hhmkj0u2VNpOdd1izBZGoRdSnry9uIuFdCw34tqIuxU6ZeX1SnLjkJvviQNamswI4B tr3dTpvNDyas5kwI81M/vhXSVPaPmOy1CzsPeYSh9/sTKSqLdHRgS/HfGLoES+E71BLh FLrQ== 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=waKAq6dAsSMFYDugUljvT9lKAjOdSQAOZTiJofKDal4=; b=RMdXMLuoi+ovmEl8LrTH0HrX/WIAXfgGlzHmoLqedH2/o2taBEHrBiEFBKp6fCcZrn QgImOQfJWRqFHDIe2cBrvdtkqOieRbM96ugciIMvEzlhuiQ4Y28Cd6a8f/YXmxtgwcSw gAnxrrNzUQMNXlwIr0I5Yx0aTzdQtDh0u1bpzh9OtBP7GqsQeMa/Iciotw6QBkKYVOqM VYhmVQ5ka+3gVnvhCgVLnjg2Fvzi6g5iSfLaImj6ssAjNfzXp1lnRlzMKmjpwOBXHLKN bzQGb+8eIyOuY1y5mHbqfrxKdge7y45sZDcdodaZ87D/vex+8TryA20Htj8+m67+DnUB +kjQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id n28-20020a05612213bc00b0044f89ac0658si1076172vkp.0.2023.05.11.03.50.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:35 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ02011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:29 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 2/7] imager: Migrate from buildchroot to schroot Date: Thu, 11 May 2023 13:50:15 +0300 Message-Id: <20230511105020.1881496-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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: =?utf-8?q?INBOX?= Install dependencies and perform all imager actions using schroot instead of buildchroot. All the changes made during imager task will be lost after the finish. This requires installing imager dependencies during every run. Signed-off-by: Anton Mikanovich --- meta/classes/image-tools-extension.bbclass | 97 +++++++++++++++------- 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 7c84505f..04ed1f84 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -5,43 +5,78 @@ # # This file extends the image.bbclass to supply tools for futher imager functions -inherit buildchroot +inherit sbuild IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" DEPENDS += "${IMAGER_BUILD_DEPS}" -do_install_imager_deps[depends] = "${BUILDCHROOT_DEP} isar-apt:do_cache_config" -do_install_imager_deps[deptask] = "do_deploy_deb" -do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -do_install_imager_deps[network] = "${TASK_USE_NETWORK_AND_SUDO}" -do_install_imager_deps() { - if [ -z "${@d.getVar("IMAGER_INSTALL").strip()}" ]; then - exit - fi +SCHROOT_MOUNTS = "${WORKDIR}:${PP_WORK} ${IMAGE_ROOTFS}:${PP_ROOTFS} ${DEPLOY_DIR_IMAGE}:${PP_DEPLOY}" +SCHROOT_MOUNTS += "${REPO_ISAR_DIR}/${DISTRO}:/isar-apt" + +imager_run() { + schroot_create_configs + insert_mounts + + session_id=$(schroot -q -b -c ${SBUILD_CHROOT}) + echo "Started session: ${session_id}" + + # Schroot session mountpoint for deb downloads import/export + schroot_dir="/var/run/schroot/mount/${session_id}" + + # setting up error handler + imager_cleanup() { + set +e + schroot -q -f -e -c ${session_id} > /dev/null 2>&1 + remove_mounts > /dev/null 2>&1 + schroot_delete_configs > /dev/null 2>&1 + } + trap 'exit 1' INT HUP QUIT TERM ALRM USR1 + trap 'imager_cleanup' EXIT + + if [ -n "${@d.getVar("IMAGER_INSTALL").strip()}" ]; then + echo "Installing deps: ${IMAGER_INSTALL}" - distro="${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" - if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then - distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + distro="${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + fi + + # prepare isar-apt + schroot -r -c ${session_id} -d / -u root -- sh -c " \ + mkdir -p '/etc/apt/sources.list.d' + echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ + '/etc/apt/sources.list.d/isar-apt.list' + + mkdir -p '/etc/apt/preferences.d' + cat << EOF > '/etc/apt/preferences.d/isar-apt' +Package: * +Pin: release n=${DEBDISTRONAME} +Pin-Priority: 1000 +EOF" + + E="${@ isar_export_proxies(d)}" + deb_dl_dir_import ${schroot_dir} ${distro} + schroot -r -c ${session_id} -d / -u root -- sh -c " \ + apt-get update \ + -o Dir::Etc::SourceList='sources.list.d/isar-apt.list' \ + -o Dir::Etc::SourceParts='-' \ + -o APT::Get::List-Cleanup='0' + apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ + --allow-unauthenticated --allow-downgrades --download-only install \ + ${IMAGER_INSTALL}" + + deb_dl_dir_export ${schroot_dir} ${distro} + schroot -r -c ${session_id} -d / -u root -- sh -c " \ + apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ + --allow-unauthenticated --allow-downgrades install \ + ${IMAGER_INSTALL}" fi - buildchroot_do_mounts - - E="${@ isar_export_proxies(d)}" - deb_dl_dir_import ${BUILDCHROOT_DIR} ${distro} - sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ - apt-get update \ - -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ - -o Dir::Etc::SourceParts="-" \ - -o APT::Get::List-Cleanup="0" - apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ - --allow-unauthenticated --allow-downgrades --download-only install \ - ${IMAGER_INSTALL}' - - deb_dl_dir_export ${BUILDCHROOT_DIR} ${distro} - sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ - apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ - --allow-unauthenticated --allow-downgrades install \ - ${IMAGER_INSTALL}' + schroot -r -c ${session_id} "$@" + + schroot -e -c ${session_id} + + remove_mounts + schroot_delete_configs } -addtask install_imager_deps before do_image_tools From patchwork Thu May 11 10:50:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2803 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-vs1-f59.google.com (mail-vs1-f59.google.com [209.85.217.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAogCV011902 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:43 +0200 Received: by mail-vs1-f59.google.com with SMTP id ada2fe7eead31-4348ff5bffasf1387238137.3; Thu, 11 May 2023 03:50:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802237; cv=pass; d=google.com; s=arc-20160816; b=Hil3B+OfBa1yLK8wTdry8oUpbmZqbcW04CrsMD1X0bH7JEdNPLeYQ5kkKNoDlZKBeE a2iqmseoiZlHyPxZZXFSHCiIqVtk+y9235HA3jnAlLhIaZBPPor0vffZsuy6gB5d/k98 s48HViqidIgCzjZYVQtrkdEupveJHodFQspuHjFdxX9omB40GTzOIu6tHQSXaKh2ZMCb 5+dqHBO2BIF8hkmmHngfOsq4TzeA8TDvEfCCxVVPhurCAKO4Q8wc1L07q6aQfqSLhhCY IdSyAvYMJzRkYSkcIvpXP1NGkqnxYu3cyiLteh4SyrFGjIfVgYlO5L+n2/QLKIQFbEoW +OmA== 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=v/P/esumB6bn/B8o7wEgtRdpJ5468JOdugrHxO0fwMY=; b=p8RIl0z9sMAnXzS3sVEQ11cvO+6N873h3eo5t2KHNNZAXadxG9RPz2e3seFknwgfGl EjBRLwPTVU/q5ddKZy8pt+mYTls0hDLt5Wvd2TinCjHXB9aoWLgFNt8bm64ZFFd9lxAw V/hsDGOwCn8dH3t4vzuUJ5tGMK7boMGgOV9B8pwCJT8ciZ/L3xbdCQKaGEdVqwoL754l 1gPN4V8n3226reLxilsMeZ5lBubussmn2frsQ9LvqxyWmuXsukPaOCR+zAJog08aK4hU a8VtWSqGLxrHTBpNZWG18zzv11mqfMhBtQSYM6FwmPMtJBX/E2H5oGsgyotZI2Wt7/kA ssrw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802237; x=1686394237; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=v/P/esumB6bn/B8o7wEgtRdpJ5468JOdugrHxO0fwMY=; b=hrBMy/EmqLotK9ENgse09LMSsRsy67F0v8SRGulkxILoJKsvaj+sU9o2FxmorkfCGk V9cLqn5pkz00BeIlgpMoR1vWYNqOXZfhWQjlyjvqTWwJ7x5/vIiAAmi7B3gFXRLQB/sP EtdDoBZlsfYfuBqiaSsgK9pIjlL4i/duvhwK7JoziRjPsSD5nJMg+OhPBE1LoW9D4+Um O9NbfKwsNUWGRgGHS6TOicqQVDBsWykesMMmXGvx+tSfd5svqe9gQIxURG41TM6nHmcd YWsQ0ZX2cFegzoLcYaaVynN7fgkjMEdVt/o/BcF0ePa+IQoAN1xhnhbuu8q8emK3tHX9 4+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802237; x=1686394237; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=v/P/esumB6bn/B8o7wEgtRdpJ5468JOdugrHxO0fwMY=; b=PhV+tsfDAn4rj8gqR3ZoSzSl7mTwKWMcLAU0DdU1DnNpUJMYS9vRiNBt6S3pDufZ65 20oSXMdtli6QPBjHbGYTw8P3aL+uihPS6jpSmhOYg00e9mwkDx0wEzG3k8TGRqvBShVf bNt6wa7/pxjyssgXs3h/dXrLRHBH2ZZjLLTNGnV2yfZQKqOFN1oHhM1miyBGoSXx7ISF FlNSEgxccPMDeYbM0eMvMJnTEyCb/6/WEWiZl4W8CQ3RmxtY639JetMbHm4GirLutlQa b7IXjI6GacjazwfRmBOm3RHpSACdYDbsqgYskG4PpFzfCAZdHvdAwd/gRAp5gnazBJxI fpqQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDyub15hKwqGRHXpJbS9/OFduWa3C4Dcdtn0TkKbt93FkC1HY0pz 5SOs/HyhM1WFfU+NZ9QBBSo= X-Google-Smtp-Source: ACHHUZ635jhEkb9TVD1d21mVihJVJNXkNqC3zQ+Bw44RYR2g8GVuPImwmAUF+6tDaNQIjPJZoXVLiA== X-Received: by 2002:a67:c197:0:b0:434:6a9d:74fb with SMTP id h23-20020a67c197000000b004346a9d74fbmr12004450vsj.4.1683802236941; Thu, 11 May 2023 03:50:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:3e8c:b0:436:13b6:afb3 with SMTP id m12-20020a0561023e8c00b0043613b6afb3ls1731457vsv.5.-pod-prod-gmail; Thu, 11 May 2023 03:50:36 -0700 (PDT) X-Received: by 2002:a67:f047:0:b0:42c:761a:90ed with SMTP id q7-20020a67f047000000b0042c761a90edmr7726686vsm.6.1683802236305; Thu, 11 May 2023 03:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802236; cv=none; d=google.com; s=arc-20160816; b=HHNY99tHL9hP9RosIwKgA6HifITDT/oAEj0eqNsdyqgGqFPfP5WWhuZ1Bk4GYF5Hvk uL81LguoPPhX7AZknrfwA6vHIV3+Oalh4zuEeoC+jT5wzbMXe3RcoGE4sq8uZRCbYZz8 cYJ08Br89etIJMiDvf4w+rFv9j9NBonLxP3LRJrKPpjxkIOs32dda0Fm7XjGOb0SCAVN kTan2I0xHRQIDAiKYpCyQxkfeDHSDLfXmBV7wEvFFszFXloWZlFVpgDo9rwpvuW8qDi8 JwKw+eUaGc/DgSbIagA/ofydbWgEjN85MLLmAwF+9eNIsVs5bEKbX5LuTx9ifYjPRl5a XB/A== 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=z3toI1AqWUfahtsB5Ie4olo0XgGG2GGRGi25iDHa2eg=; b=1HGNbN5DnxZRZt42E2mpkjjebYt5e4ZGJ2hzGXad3SCt6mi1SM/kAGumrJDdVxhnwU 7mR169iNeCLb5xgVEM7XYS1YwHKkReEpGedHbTV/GwRalk5b+IFhhrCISMRqFRCmULxl KlFzGXfdORWOV0IqgW5jHo4Rcv6mdcQc7zRz6JVvQvJXcbTan3s9KUef8s/H1V1KIPMy pazB6R7lZqAFavwNem8zqXLRUU8ieLgwkpZgwvZ8ovL9VKoxhn3YJ6Ab1JqF1e1LYSqX x/R3AhAQVGtjFl50HD178sF3IOz3gSkcbrDalZV+v/HGpmaS5aSOoYb0tmRYCInFZM3g 5Rdw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bt22-20020ab03f16000000b0077d3c410308si1015055uab.2.2023.05.11.03.50.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:36 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ03011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:30 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 3/7] imager: Move image types to schroot Date: Thu, 11 May 2023 13:50:16 +0300 Message-Id: <20230511105020.1881496-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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: =?utf-8?q?INBOX?= Run imagetype-related commands inside schroot session during images prepare steps. Signed-off-by: Anton Mikanovich --- meta/classes/image.bbclass | 7 ++- meta/classes/imagetypes_vm.bbclass | 9 +-- meta/classes/imagetypes_wic.bbclass | 89 ++++++++++------------------- 3 files changed, 38 insertions(+), 67 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 53859eb9..42e4b0c9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -163,7 +163,7 @@ inherit ${IMGCLASSES} # convenience variables to be used by CMDs IMAGE_FILE_HOST = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.${type}" IMAGE_FILE_CHROOT = "${PP_DEPLOY}/${IMAGE_FULLNAME}.${type}" -SUDO_CHROOT = "sudo chroot ${BUILDCHROOT_DIR}" +SUDO_CHROOT = "imager_run -d ${PP_ROOTFS} -u root --" # hook up IMAGE_CMD_* python() { @@ -235,7 +235,6 @@ python() { imager_build_deps.add(dep) # construct image command - cmds.append('\timage_do_mounts') image_cmd = localdata.getVar('IMAGE_CMD:' + bt_clean) if image_cmd: localdata.setVar('type', bt) @@ -409,6 +408,10 @@ python do_image_tools() { } addtask image_tools before do_build after do_rootfs +# all imagetypes are depend on schroot and isar-apt +do_image_tools[depends] = "${SCHROOT_DEP} isar-apt:do_cache_config" +do_image_tools[deptask] = "do_deploy_deb" + python do_image() { """Virtual task""" pass diff --git a/meta/classes/imagetypes_vm.bbclass b/meta/classes/imagetypes_vm.bbclass index 41f2af06..782b60c1 100644 --- a/meta/classes/imagetypes_vm.bbclass +++ b/meta/classes/imagetypes_vm.bbclass @@ -4,8 +4,6 @@ # This class allows to generate images for VMware and VirtualBox # -inherit buildchroot - OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" IMAGE_SRC_URI:ova = "file://${OVF_TEMPLATE_FILE}" @@ -35,9 +33,8 @@ CONVERSION_OPTIONS = "${@set_convert_options(d)}" convert_wic() { rm -f '${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}' - image_do_mounts bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${SOURCE_IMAGE_FILE}" - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + imager_run -p -d ${PP_WORK} -- \ /usr/bin/qemu-img convert -f raw -O ${VIRTUAL_MACHINE_IMAGE_TYPE} ${CONVERSION_OPTIONS} \ '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${VIRTUAL_MACHINE_DISK}' } @@ -80,7 +77,7 @@ IMAGE_CMD:ova() { export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") export OVA_FIRMWARE_UPPERCASE=$(echo ${OVA_FIRMWARE} | tr '[a-z]' '[A-Z]') export OVF_TEMPLATE_STAGE2=$(echo ${OVF_TEMPLATE_FILE} | sed 's/.tmpl$//' ) - sudo -Es chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} <<'EOSUDO' + imager_run -p -d ${PP_WORK} <<'EOIMAGER' set -e export DISK_SIZE_BYTES=$(qemu-img info -f vmdk "${VIRTUAL_MACHINE_DISK}" \ | gawk 'match($0, /^virtual size:.*\(([0-9]+) bytes\)/, a) {print a[1]}') @@ -97,6 +94,6 @@ IMAGE_CMD:ova() { tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.mf fi tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} -EOSUDO +EOIMAGER } IMAGE_CMD:ova[depends] = "${PN}:do_transform_template" diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index 5be53f60..9a0bc2b7 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -83,8 +83,6 @@ python () { bb.build.addtask('do_transform_template', 'do_image_wic', None, d) } -inherit buildchroot - IMAGER_INSTALL:wic += "${WIC_IMAGER_INSTALL}" # wic comes with reasonable defaults, and the proper interface is the wks file ROOTFS_EXTRA ?= "0" @@ -95,7 +93,6 @@ STAGING_DIR ?= "${TMPDIR}" IMAGE_BASENAME ?= "${PN}-${DISTRO}" FAKEROOTCMD ?= "${SCRIPTSDIR}/wic_fakeroot" RECIPE_SYSROOT_NATIVE ?= "/" -BUILDCHROOT_DIR = "${BUILDCHROOT_TARGET_DIR}" WIC_CREATE_EXTRA_ARGS ?= "" WIC_DEPLOY_PARTITIONS ?= "0" @@ -145,26 +142,11 @@ check_for_wic_warnings() { do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" IMAGE_CMD:wic() { - wic_do_mounts generate_wic_image check_for_wic_warnings } -wic_do_mounts[vardepsexclude] += "BITBAKEDIR" -wic_do_mounts() { - buildchroot_do_mounts - sudo -s <<'EOSUDO' - ( flock 9 - set -e - for dir in ${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} ${BITBAKEDIR}; do - mkdir -p ${BUILDCHROOT_DIR}/$dir - if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then - mount --bind --make-private $dir ${BUILDCHROOT_DIR}/$dir - fi - done - ) 9>${MOUNT_LOCKFILE} -EOSUDO -} +SCHROOT_MOUNTS += "${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} ${BITBAKEDIR}" generate_wic_image[vardepsexclude] += "WKS_FULL_PATH BITBAKEDIR TOPDIR" generate_wic_image() { @@ -177,50 +159,39 @@ generate_wic_image() { mkdir -p ${IMAGE_ROOTFS}/../pseudo touch ${IMAGE_ROOTFS}/../pseudo/files.db - # create the temp dir in the buildchroot to ensure uniqueness - WICTMP=$(cd ${BUILDCHROOT_DIR}; mktemp -d -p tmp) - - sudo -E chroot ${BUILDCHROOT_DIR} \ - sh -c ' \ - BITBAKEDIR="$1" - SCRIPTSDIR="$2" - WKS_FULL_PATH="$3" - STAGING_DIR="$4" - MACHINE="$5" - WICTMP="$6" - IMAGE_FULLNAME="$7" - IMAGE_BASENAME="$8" - shift 8 - # The python path is hard-coded as /usr/bin/python3-native/python3 in wic. Handle that. - mkdir -p /usr/bin/python3-native/ - if [ $(head -1 $(which bmaptool) | grep python3) ];then + imager_run -p -d ${PP_WORK} -u root <<'EOIMAGER' + set -e + + # The python path is hard-coded as /usr/bin/python3-native/python3 in wic. Handle that. + mkdir -p /usr/bin/python3-native/ + if [ $(head -1 $(which bmaptool) | grep python3) ];then ln -fs /usr/bin/python3 /usr/bin/python3-native/python3 - else + else ln -fs /usr/bin/python2 /usr/bin/python3-native/python3 - fi - export PATH="$BITBAKEDIR/bin:$PATH" - "$SCRIPTSDIR"/wic create "$WKS_FULL_PATH" \ - --vars "$STAGING_DIR/$MACHINE/imgdata/" \ - -o "/$WICTMP/${IMAGE_FULLNAME}.wic/" \ + fi + + export PATH="${BITBAKEDIR}/bin:$PATH" + + "${SCRIPTSDIR}"/wic create "${WKS_FULL_PATH}" \ + --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ + -o "/tmp/${IMAGE_FULLNAME}.wic/" \ --bmap \ - -e "$IMAGE_BASENAME" $@' \ - my_script "${BITBAKEDIR}" "${SCRIPTSDIR}" "${WKS_FULL_PATH}" "${STAGING_DIR}" \ - "${MACHINE}" "${WICTMP}" "${IMAGE_FULLNAME}" "${IMAGE_BASENAME}" \ - ${WIC_CREATE_EXTRA_ARGS} + -e "${IMAGE_BASENAME}" ${WIC_CREATE_EXTRA_ARGS} + + WIC_DIRECT=$(ls -t -1 /tmp/${IMAGE_FULLNAME}.wic/*.direct | head -1) + mv -f ${WIC_DIRECT} ${PP_DEPLOY}/${IMAGE_FULLNAME}.wic + mv -f ${WIC_DIRECT}.bmap ${PP_DEPLOY}/${IMAGE_FULLNAME}.wic.bmap + # deploy partition files if requested (ending with .p) + if [ "${WIC_DEPLOY_PARTITIONS}" -eq "1" ]; then + # locate *.direct.p partition files + find "/tmp/${IMAGE_FULLNAME}.wic/" -type f -regextype sed -regex ".*\.direct.*\.p[0-9]\{1,\}" | while read f; do + suffix=$(basename $f | sed 's/.*\.direct\(.*\)/\1/') + mv -f ${f} ${PP_DEPLOY}/${IMAGE_FULLNAME}.wic${suffix} + done + fi +EOIMAGER sudo chown -R $(stat -c "%U" ${LAYERDIR_core}) ${LAYERDIR_core} ${LAYERDIR_isar} ${SCRIPTSDIR} || true - WIC_DIRECT=$(ls -t -1 ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head -1) - sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} - mv -f ${WIC_DIRECT} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic - mv -f ${WIC_DIRECT}.bmap ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.bmap - # deploy partition files if requested (ending with .p) - if [ "${WIC_DEPLOY_PARTITIONS}" -eq "1" ]; then - # locate *.direct.p partition files - find ${BUILDCHROOT_DIR}/${WICTMP} -type f -regextype sed -regex ".*\.direct.*\.p[0-9]\{1,\}" | while read f; do - suffix=$(basename $f | sed 's/.*\.direct\(.*\)/\1/') - mv -f ${f} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic${suffix} - done - fi - rm -rf ${BUILDCHROOT_DIR}/${WICTMP} + sudo chown -R $(id -u):$(id -g) "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic"* rm -rf ${IMAGE_ROOTFS}/../pseudo } From patchwork Thu May 11 10:50:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2805 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:44 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f184.google.com (mail-qk1-f184.google.com [209.85.222.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAohQM011906 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:44 +0200 Received: by mail-qk1-f184.google.com with SMTP id af79cd13be357-7578369dff3sf1652968785a.0; Thu, 11 May 2023 03:50:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802238; cv=pass; d=google.com; s=arc-20160816; b=GIogmr3VDCLesWHXZFKLih0xgu3cfSe8Vv7bYCaiTBoGtAqQyLAwAu/1v4LmxbRiTC CHhEnse/AtTcM2Yg/D/Prej4boVOGr3NbcgHVzz6hTkwI8LXOluXwgXk/ebTYjqq0W5G 034T4VibVI5S8kJHB0/riDfi0XmmQuT/mvbOA/BW0nJn4IYpu1IzI7ZB+mB1B8buTYx5 5221WczSQtdYpY32T7ZTxp1Gb53hT3slsghOrSBg8LWqrEUTAO3cGOWxwB3K65SSsmBC NNMZPW0jG7oHKXHsPbqQAImOw/4y+nSWQHJxbZonjw6RRIORoIxlFsxjgDQzFx/hgorF nehg== 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=27/Cr5Rnjs3acfnbkKnQMcPIvXejbcVoGbFIOyAyLME=; b=S5OUuPNjNudWBLWsufh+tel3YTpsMV314JNDMcLJMgtUQYInmu4rl5zkML+XGZkgWR Nzx8JWTwKA9v9rqHhc4IfVHJaki5+Cm2rj9Qxo27DGs4FA2wmDVEvc3cL9qS4c4l88kQ KWzwNLeVZI52FVjl+QMt3/9TLr0s90Fz94VQQzeHW2hqzao560GOixauWxSFyi6pfBm7 ghV/rMQvnqEyJyrhxKpmXbJudaAWW3/D9PIOIKTw+VoISl8L6sDxalk2CqA0hf92dilm 3DK0tc4LC+h6mSxkexaoWCa54L4+AoC+quVoHa09/EQZ47JOTYr7LCSNLSoBzZaVql8l dtjg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802238; x=1686394238; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=27/Cr5Rnjs3acfnbkKnQMcPIvXejbcVoGbFIOyAyLME=; b=P9/CzikSqo2bZT3ShzEYl7hRjs7JuF1a+f8c3REnSKxORi9g/adAt3aKWbLn5fwD4+ o6QlsCJ3pYEsWBDUeFksBd1azWkHkACWDXHnwm99hyt/mn62TCYy7uwlYlwM46AnJIzZ 0/+w99HbeWaJG5eKy3tAQruu/WJKpKTjzENRf18W5C2CaPbYFimGdXSdAR3i6s+usTy/ U3LCgnQ+gyJPwYEMaugD+DUodcOoPn2A2M8u+gwpduI5Mw75n2EjPOByC7ZOZRimFMTR yj3zPqaJqpBoW4qz6SCRuwMCgnDJ+HWWNUShe0UnEcoTFohlYgVzZ1ZyZ1/EEFPqrBUc T4SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802238; x=1686394238; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=27/Cr5Rnjs3acfnbkKnQMcPIvXejbcVoGbFIOyAyLME=; b=f2kPbq/2fAxKZ4/iILAkwMaP2gciiYIAHpxb1HAVpGuEWEUxjQiMzbGUokRDlgtdJm f6R045H29dq+VWl7SbYeFHdhJTV0rHsrCzk/CulV2cNKVAlQa4kQlRVNQJCow7SgybUH hnRlF6Ocm3657XMov2Gayp/ahKIANijEM1zSaA16Q95CZOGBlfsr/o4urgGM9+7lrYcZ 9qG7cM8EsSCht+1Aclt/H+hMKcavAcNarjWE/W0QtxKYaqwUd09Vxy9kAFKmsU1fKECk s0CKBcJZPFMIB7zKnAfZM8TUwygoTqISIi3Fel4jGqu0YQ8ssjhQCJOs8hZ/0LUjhSSm 3n7A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDzG1quGIMPqN5Fgjuzv5Dzt11rq25LhP3LfTbmO219ZzFa10vJY dTnV4OzW1NNbk0LScQ8Fl4c7NQ== X-Google-Smtp-Source: ACHHUZ43RBp/qsK9K4/aGA5Vag0F4vNXqHP/zTxfNdpdO3+JrHxyOS4xUV+P5Dg7wD6T+TO96rI3DQ== X-Received: by 2002:a05:622a:1e08:b0:3f3:86c7:87aa with SMTP id br8-20020a05622a1e0800b003f386c787aamr4349205qtb.2.1683802238051; Thu, 11 May 2023 03:50:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5907:0:b0:61a:86aa:41cb with SMTP id ez7-20020ad45907000000b0061a86aa41cbls17312813qvb.9.-pod-prod-gmail; Thu, 11 May 2023 03:50:37 -0700 (PDT) X-Received: by 2002:a05:6214:21aa:b0:61b:5b9f:f5fd with SMTP id t10-20020a05621421aa00b0061b5b9ff5fdmr25668296qvc.41.1683802237600; Thu, 11 May 2023 03:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802237; cv=none; d=google.com; s=arc-20160816; b=Y0UFZDowdXQzclKike0xUSKnD/Uj2+hPnJzGTJ7gEFL3h5Yd/qUUX1XrMuLo7CL2Jq +K6wSwVSFN/bVJ7rCVzsLuY6OjyKfCxaT1vXzNvOG8XYzvDNWMY5nrA98eQjAjH1/XpZ cLLqHyuM3SA72Jj+KRzjH87wv1+9cL00DCULhwuK7HdJIG6ipSupQt/YF2o1d3BMYM9L IGFHSVEMzWWIzXRyudFYKvy1NzH6jNeHY4iQcBVbCrQ3PjRx0G3Htse9CWTC/fuSggBA BzvOk3GVCr1f/855ZzTqMGwtw8V4czqWbug+ZM7USTeyUnqagj2AfNbXkbPvPgptIGbI 4NHA== 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=IhW2EXP85akoPQxK92nzuHvT9dWTr4UO7B7jVQtSvfM=; b=oWKag5951bd7wm5zOa3ls+jmyTMxECABJdtdySdNzigAq6JaLgK6Oc4vq5HoP+4zhf akIVKEf1YhQYwd+r2l4FNJs4gOK8a+FyCN4a1FOLPybRoYpt20RzTF70gtu5I8y/WbS7 L7tcG1IxJMLF1sD2c8VTS/AG0ugUcblA6oEhZDJ3Ry0GGhuq7bm/FK+dIBg4qe69uT+X fHi7saRqIPoiAdnr+O3HxnrAnRtdbf9wi+ZP947x7/cemOqgGNZAf9IAeemEpPN+oJnF kf24NPIMbJQBpFdxMnn6Ic6ko6omFCxH93ZLxsT/TDtngXH8oIiadsuMUfVBOvqC35nm O1JQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ep13-20020a05621418ed00b0061b730f2f42si580027qvb.0.2023.05.11.03.50.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:37 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ04011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:31 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 4/7] imager: Split imager deps between image types Date: Thu, 11 May 2023 13:50:17 +0300 Message-Id: <20230511105020.1881496-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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: =?utf-8?q?INBOX?= To reduce dependencies install time and disk space consumption we need to install only those imager dependencies which used in every image type prepare logic. So split variables between tasks. Signed-off-by: Anton Mikanovich --- meta/classes/image-tools-extension.bbclass | 10 ++++++---- meta/classes/image.bbclass | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 04ed1f84..58799fcf 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -15,6 +15,8 @@ SCHROOT_MOUNTS = "${WORKDIR}:${PP_WORK} ${IMAGE_ROOTFS}:${PP_ROOTFS} ${DEPLOY_DI SCHROOT_MOUNTS += "${REPO_ISAR_DIR}/${DISTRO}:/isar-apt" imager_run() { + local_install="${@(d.getVar("INSTALL_%s" % d.getVar("BB_CURRENTTASK")) or '').strip()}" + schroot_create_configs insert_mounts @@ -34,8 +36,8 @@ imager_run() { trap 'exit 1' INT HUP QUIT TERM ALRM USR1 trap 'imager_cleanup' EXIT - if [ -n "${@d.getVar("IMAGER_INSTALL").strip()}" ]; then - echo "Installing deps: ${IMAGER_INSTALL}" + if [ -n "${local_install}" ]; then + echo "Installing imager deps: ${local_install}" distro="${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then @@ -64,13 +66,13 @@ EOF" -o APT::Get::List-Cleanup='0' apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades --download-only install \ - ${IMAGER_INSTALL}" + ${local_install}" deb_dl_dir_export ${schroot_dir} ${distro} schroot -r -c ${session_id} -d / -u root -- sh -c " \ apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ - ${IMAGER_INSTALL}" + ${local_install}" fi schroot -r -c ${session_id} "$@" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 42e4b0c9..b9d3d411 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -208,6 +208,8 @@ python() { imager_build_deps = set() conversion_install = set() for bt in basetypes: + local_imager_install = set() + local_conversion_install = set() vardeps = set() cmds = [] bt_clean = bt.replace('-', '_').replace('.', '_') @@ -231,6 +233,7 @@ python() { # imager install for dep in (d.getVar('IMAGER_INSTALL:' + bt_clean) or '').split(): imager_install.add(dep) + local_imager_install.add(dep) for dep in (d.getVar('IMAGER_BUILD_DEPS:' + bt_clean) or '').split(): imager_build_deps.add(dep) @@ -273,6 +276,7 @@ python() { vardeps.add('CONVERSION_CMD:' + c) for dep in (localdata.getVar('CONVERSION_DEPS:' + c) or '').split(): conversion_install.add(dep) + local_conversion_install.add(dep) # remove temporary image files if t not in image_types: rm_images.add(localdata.expand('${IMAGE_FILE_HOST}')) @@ -305,6 +309,10 @@ python() { d.appendVarFlag(task, 'depends', task_deps) bb.build.addtask(task, 'do_image', after, d) + # set per type imager dependencies + d.setVar('INSTALL_image_%s' % bt_clean, d.getVar('IMAGER_INSTALL')) + d.appendVar('INSTALL_image_%s' % bt_clean, ' ' + ' '.join(sorted(local_imager_install | local_conversion_install))) + d.appendVar('IMAGER_INSTALL', ' ' + ' '.join(sorted(imager_install | conversion_install))) d.appendVar('IMAGER_BUILD_DEPS', ' ' + ' '.join(sorted(imager_build_deps))) } From patchwork Thu May 11 10:50:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2804 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:44 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f185.google.com (mail-pl1-f185.google.com [209.85.214.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAohZc011905 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:44 +0200 Received: by mail-pl1-f185.google.com with SMTP id d9443c01a7336-1aad9af33c1sf86257645ad.0; Thu, 11 May 2023 03:50:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802237; cv=pass; d=google.com; s=arc-20160816; b=xoe/JQ6IVnbdF2T1WWDFtm1eLMkoWsn97JomDxuNe+W475/rEjNQE5iBeM/QNEebBB fFiUA7lhjF2iNbcB1AmbAkSbR9uYBML3tjOecOGbWODN2byl+KH9uNAmxoBTx9iY01kq dJrYvSusWXkm7pIuYwLBUUI+RGX0nFyWF+QddZfjyQK7IR6hKqffDw4tSqGLjeK3nhRC TQD7KxIpYfcly1bdgxr3VnvJc9yZ1+5/ueLmU6kCarx88yXinurXkfex02ePMLz18a0h zcMwgKEL1PASH/LuaSSw9wGiQ1XcUKG2SgCug2mzbNPFqHaEaYCp5iRu7ASR4SQVBFvH kY4w== 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=DeH1Q6kmWIL+gcrWRpwmoFpGKYNdhWlzy4sKhZb+esE=; b=qVqXG5Wqp4P18PotWx79bVAf1B0gjoVtdE2t5Wrd90BATGU4YDCMW7BTQKEQAz2yxX hM2CcZq9qzMkV2IOvQsGabOfgL5Kxg9CsKPVvqjSeEgqVym247SWfv9IMKqV1CXXi2hm 6EsSu1nIdfTlB2TgH1H4NK51OHubIrGA5L4CARkuHqfzXyU1/fiDkVySfWqAX07zkw/l fy75Qk13k4HLfgTfqud1BxdGBOC1EeshDR5qVm3rDjVNQ5L6yP6c42n8SHuw5GiOvCtO HF73cAD8X2K8zUyiktdadhd3d9oTcKjJL4aY1sKvLaqXneh08fU42n6u5DpBZKMG5DUq hlAQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802237; x=1686394237; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=DeH1Q6kmWIL+gcrWRpwmoFpGKYNdhWlzy4sKhZb+esE=; b=PKwzeKkAdGwYHZpLeSyATNfi0pZZjx35VoE/L8XC6/mNZAHK1Uhb9hc9mj+1HtyF4J IigX0mDJwZHmfftcvtSBLUwGv5Ord+ln0b6zYEXmZQMw0TQqHeVJj/ztAsCWg4BaWBqo /G2u2W+dRjYZziLO8xUlIbC0Ca1sOkLfvgbfLAMaxM0fnfWSuUBzjtQIVAF0ku5ohb6j iTWTClju2AIRBoxp/RgNBBCpZ5krNqEm3Dmz2iA8XyDyLWQKyPAwOfCHMvki4NExll2Q NGGSDser8iJchwopuJ6J+tQRV92oAFXTems42FIEqaqaXc83tKY1C88lSmg/fwD2Xr3M ZYpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802237; x=1686394237; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=DeH1Q6kmWIL+gcrWRpwmoFpGKYNdhWlzy4sKhZb+esE=; b=hiNZpcmf9IJMEGJECvWS+c9QksRmKwAFF70cgwAbOWNYA9Na0Sq1H2ar5iduz/t1LI uJozFJ3eLj+HcZKZF31I6dMf5n6uhNhRz+STASXYXLGQPdaA1D2VFOuJrgPIKfDOOgHS LV9zT8OjCE0JvHpOPIW3SLbtUS6RIJABzMrUk/Ue3hD4E3mxubTS0jMqUQoIuUBNwpvi ppwKJDl5iQJ4yYsrZyGSOYtK2zJPuv5oPKUyPHOjslUc0bCisohwdKjuvGCratT8ju3w 5nyogq54/Sio5KWst+nrkxiIREwBgGrpGIEzjd8410J2nb5a7fQPaJWLlKt9Khol1lHe Eavg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDyLpKJfmATfJMUK+XgFMDZ9KYJegikNVS9KpgpRav/Z4akLElQk uN/h2CYrun1nbnRCIntjEl19Yg== X-Google-Smtp-Source: ACHHUZ5MXdkOSZkC3HGqoXYjuP12F70DXjj9GoI48/0vdfob9X/61u0M/qMF9XnA3407nAsHNb47yQ== X-Received: by 2002:a17:902:ecd2:b0:1ac:618a:6d46 with SMTP id a18-20020a170902ecd200b001ac618a6d46mr6651785plh.3.1683802237633; Thu, 11 May 2023 03:50:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:3c8f:b0:250:8ab4:e7ea with SMTP id pv15-20020a17090b3c8f00b002508ab4e7eals2368417pjb.0.-pod-prod-04-us; Thu, 11 May 2023 03:50:37 -0700 (PDT) X-Received: by 2002:a17:903:2307:b0:1ac:a61c:7a12 with SMTP id d7-20020a170903230700b001aca61c7a12mr10210119plh.57.1683802237017; Thu, 11 May 2023 03:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802237; cv=none; d=google.com; s=arc-20160816; b=Y2ME/ELQYs040rGvjzp7D5Px34qmJzGhPD+4vgrrSPi9x4DnMTiTUEHporpqxGibdd j3l5egrXCKtJvucDC/s+C14sHq6ucfMoJSMHYaO/6MPByMQG+BAOqO4UGFVmG3Z7vxEl JygI2+IF5u+GNDj2UH8LjPgQB5RrrrxTl8aWsP9jE2HMm19TCyvzycpH4kGTKkexqvQI a5vjc5K3ZsCLsitenPnO8rlvZO4JahOqUpeuJkYOwcooFyeuY44W/YVwbdFAC7G0ZCqa a34vZvN5ZcP+y9Er0oTe9a9QzwK8i5x+HkZNOnzVSgVSWM9kesToD7T98Knu7I6FG23R zfPw== 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=zkQxdmIQTXO2V7D6qw8qIe6jN9WQgToHR6pTLbWAPLQ=; b=VxQnuO/yrv3b5mF/2w+SqcwwgrfmzWJZdf15+6N7yHbIXsY5lXcVrupXEnLudUMBRM KaImq/JGMnNWwf9EXqP42ZCwreaxlRaqXjexvj2/NTPlje/eojzvPFFoJlYV5yeqlojC ZgxSIn4L2vhLpBjm2K9zQKQYe+hWdLW9BdhqRXvavyvjGAeG1kscNnttBqaSuwnnVSeP 90wVHr1d8cadPtMOjzWS26A3AluNUrOBkckNjJcfHL+ZANuYTiW76c8jv9syR7Y525Zw xGZdqMA40kgWmqL40mXVuGfgccwUIAEPY6S4vIdMpDpZqE/oRrZVcy70O5wBZMUv3Fcm TADg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id kx5-20020a170902f94500b001aaf7c46645si318054plb.11.2023.05.11.03.50.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:37 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ05011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:32 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 5/7] CI: Fix used chroot recipe name Date: Thu, 11 May 2023 13:50:18 +0300 Message-Id: <20230511105020.1881496-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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: =?utf-8?q?INBOX?= We've moved to schroot, so need to adjust recipe names for sstate test case in CI. Signed-off-by: Anton Mikanovich --- testsuite/cibase.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index d1543a9b..6b532651 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -149,7 +149,7 @@ class CIBaseTest(CIBuilder): if not all([ check_executed_tasks('isar-bootstrap-target', ['do_bootstrap_setscene', '!do_bootstrap']), - check_executed_tasks('buildchroot-target', + check_executed_tasks('sbuild-chroot-target', ['do_rootfs_install_setscene', '!do_rootfs_install']), check_executed_tasks('isar-image-base-*', ['do_rootfs_install_setscene', '!do_rootfs_install']) @@ -173,8 +173,8 @@ class CIBaseTest(CIBuilder): if not all([ check_executed_tasks('isar-bootstrap-target', ['do_bootstrap_setscene']), - check_executed_tasks('buildchroot-target', - ['!do_buildchroot_deploy']), + check_executed_tasks('sbuild-chroot-target', + ['!do_sbuildchroot_deploy']), check_executed_tasks('hello', ['do_dpkg_build_setscene', 'do_deploy_deb', '!do_dpkg_build']) ]): @@ -187,7 +187,7 @@ class CIBaseTest(CIBuilder): if not all([ check_executed_tasks('isar-bootstrap-target', ['do_bootstrap_setscene', '!do_bootstrap']), - check_executed_tasks('buildchroot-target', + check_executed_tasks('sbuild-chroot-target', ['do_rootfs_install_setscene', '!do_rootfs_install']), check_executed_tasks('hello', ['do_fetch', 'do_dpkg_build']), From patchwork Thu May 11 10:50:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2806 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f189.google.com (mail-yw1-f189.google.com [209.85.128.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAojIw011910 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:46 +0200 Received: by mail-yw1-f189.google.com with SMTP id 00721157ae682-559c416b024sf93072167b3.1; Thu, 11 May 2023 03:50:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802240; cv=pass; d=google.com; s=arc-20160816; b=T83JTnZ/Rq736didaVoyU0/2PR/wGaaGXaSS2f+JhiLmWcobIGvKuoRFCDyw7nYUA/ +lekkAJfmi++An+RzooGRtydspWWET6mCGl8I8sUvxMWM6kvRUOtq1VS0Dn51Z50V+xc t3M9CDAHue/6VsRmfsMdCeQO3JeoHGWGKJZs8JDFllJUmyQyxXpGyaDan63zWpZ+Swkw WP4uZdEx58+6kQzIHG1ffvCKjmkf1VwLqtMxkgHltDVRHHL6+XmynbWeJNUixGyCCe2P VPG4uqg/pF0kk9LAaCZzHnAl5ydAes+6urdZgTG2fkvXY8X4bm/jZrrnW6xfGYa1uHGr Kh5w== 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=5j4hklj5lvXeuj586cOpfLCWVT1nmruT944Tulec5Is=; b=EfrOLsproWClMp5qyJ3mgsKRnJoxrDvhDCykYazsWiNtybzwbwm4ylwNylqwExVm1S HfKYWvgSsEfaUvbuC5AqsVo9ivyc+957cfzyyD8yQeCK55ER5fIxBpJJse/GQJksS/to HL0YZWPy2RqTHbdwKq5hWqEuEya952TD3BPITJG7x63IXY38hYJ0vXdeKpyE1wkKTern zcygva3akmwh5QqwN5mQPyiq0CExGykBatAwIKsb34YmVIijZN2NjdbvGwwgs2fWbna8 WUFGYH/Wd+9ruBzPH3eKdTZk/Y3Ud0cahLuc5S6Ve3BYwTIU/lMxpQB9p92EzugEiI// e3yQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802240; x=1686394240; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=5j4hklj5lvXeuj586cOpfLCWVT1nmruT944Tulec5Is=; b=EZBXvyfBndLpAhS3ZS7nMiOBFXWT5HvzdCq8PFvgtr2QZk6K2QMWWJPyVu0VmITop0 jn5z+1L0s5OIcVAdasE0YFBYqsFjVDWZCGmo8HkC5OYr3epbRJBMLb5ftkOxyjMjhRNj 06UYfHIimIN6GLkzkoSCC6Ns0izQelDcF6sw7MS23ptm0zYU0bmbc4UtQTt0Dg3o993g zpEj4F9FmJw3ANOZDXG6rVTaEJ1WxdLXL4P/B/FdAJLm+Oh2oRmqCMDRE45lgL6Adzqv WOiaZyb5RlnXaAp5GT+gc4Jz73si4qt2XS6ywsIiD4M8Sk2u33EO+XhO21H5PzD18Jbz ZmOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802240; x=1686394240; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=5j4hklj5lvXeuj586cOpfLCWVT1nmruT944Tulec5Is=; b=hP70ZVlXdoP/f+wcGY1k/t92xKiU6E36Sn7/ddCn/MPhMOMKNl7ZH4aLGg1ZiKmJGs CHw2NAU3elTvREFqI8JtHFWU0epnsA6ogxEdIzmI5EH03EJQZXOTPtN0bZzIvc/6KQcn M3LfhoAthKH1tAUav/nmvfbV+P+vqsW0iw6Dp8uR9nwK3dUNhIe/GjORKoSQReunvEk+ TkcHohp4Oe7Wp3GiCdYs8IQAS9oW3IugB6mB6KlQwPhQEmS/0eM8qfBAqC/HjKsxdT3T QvfEDoTOF+gUmLAuNY26Ih7gH2KT5ZBdxL0FBO43jQOTMgQ6B2IYpOx/N7nryC2JluAu Q5Vg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDyWAbNiqV67BVaaBTAnM81q7f83iGXAcgJ53Rc0/+hYm5K+4Klc Tb/kvMi9hnG44CCUWt7TLXA= X-Google-Smtp-Source: ACHHUZ6NYMMY1M5Suo+mKIX/tdXKvbI7c7101jYtHGmIuji7VM679htlDZx51dtclDKnimoR2YPnhg== X-Received: by 2002:a25:874f:0:b0:b9d:fe66:a424 with SMTP id e15-20020a25874f000000b00b9dfe66a424mr13115185ybn.2.1683802240190; Thu, 11 May 2023 03:50:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:9a84:0:b0:b8f:4672:7434 with SMTP id s4-20020a259a84000000b00b8f46727434ls23753371ybo.10.-pod-prod-gmail; Thu, 11 May 2023 03:50:39 -0700 (PDT) X-Received: by 2002:a25:d345:0:b0:b8f:3202:4491 with SMTP id e66-20020a25d345000000b00b8f32024491mr21986464ybf.30.1683802239574; Thu, 11 May 2023 03:50:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802239; cv=none; d=google.com; s=arc-20160816; b=P76Zx4raEmKgWQVFHLTt3pOPgba86ihY1w5rULv1h66agHjq4WjMVNi0YBb43UQgZV rhOgaLyOK2v1hDN9D8NUcUNFLReoWbQIVYfl0zlmqkvgCfRpLR0cW4MTxRG286BjV+tQ oGgVwPl23oOFZsWF9x4PVsfUZvmna9Zs58DwUOVXegjKkLfjPJEeFE3OYsmwcij29rEp B5iqeqoBIW1Hrg1vNvCf3g+ZQ2b5FUtKDC+vSQIE8MW1rloDsiict5YFb98EFusXHksy u63PGoqYlMllWE/ODek3kf5QaqBBBGif774cGiNxE513Oy639A/a7htRG4qRuZenehoa Exfg== 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=+26LaFIqrqPqimKlbLbzdcbJfGXwBtOL3CDa86xBzKc=; b=sC+uQnRzNRM0Kij8HyEATcmCve9zmvyVAwwXbMbdN+WAUohK8OtwZN6STQrpj/3A7R Dw3Z/gJ0g8UL359YagfxoNADhwJjoDadFFFnNFi6htnoNiRH+rwjCAWVrv9yBqLmi/Sd mkFVeEM4UROznXOKsijrX0OqPPMwUeoE30tD4lvJqO7pMfOhA0ctwSx00CeELmZsiGuO WmbwLOFNrcebifiUoSWTuHZpJL69AhW2YycANjFpDhp20bDbjTKuA7fmzYX5Ee8CoUab sbj5idLM0rU0eTco24IpLrcx5p+SC5KB1292N/UQ3j+PkxOZkzHt25Rsd5CA6+MgapCX LQrw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id x187-20020a25e0c4000000b00b95bf79bf9dsi1274314ybg.2.2023.05.11.03.50.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:39 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ06011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:33 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 6/7] meta: Remove buildchroot Date: Thu, 11 May 2023 13:50:19 +0300 Message-Id: <20230511105020.1881496-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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: =?utf-8?q?INBOX?= Buildchroot is not used anywhere so remove it. Signed-off-by: Anton Mikanovich --- meta-isar/conf/local.conf.sample | 2 +- meta/classes/buildchroot.bbclass | 59 --------------- meta/classes/crossvars.bbclass | 6 -- meta/classes/deb-dl-dir.bbclass | 4 +- meta/classes/image.bbclass | 15 ---- meta/classes/isar-events.bbclass | 1 - meta/conf/bitbake.conf | 3 - .../buildchroot/buildchroot-host.bb | 13 ---- .../buildchroot/buildchroot-target.bb | 10 --- .../buildchroot/buildchroot.inc | 73 ------------------- .../buildchroot/files/build.sh | 17 ----- .../buildchroot/files/common.sh | 32 -------- .../buildchroot/files/configscript.sh | 15 ---- .../buildchroot/files/deps.sh | 47 ------------ scripts/contrib/convert-overrides.py | 2 +- 15 files changed, 3 insertions(+), 296 deletions(-) delete mode 100644 meta/classes/buildchroot.bbclass delete mode 100644 meta/recipes-devtools/buildchroot/buildchroot-host.bb delete mode 100644 meta/recipes-devtools/buildchroot/buildchroot-target.bb delete mode 100644 meta/recipes-devtools/buildchroot/buildchroot.inc delete mode 100644 meta/recipes-devtools/buildchroot/files/build.sh delete mode 100644 meta/recipes-devtools/buildchroot/files/common.sh delete mode 100644 meta/recipes-devtools/buildchroot/files/configscript.sh delete mode 100644 meta/recipes-devtools/buildchroot/files/deps.sh diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 7e0184e4..1c8e1562 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -24,7 +24,7 @@ MACHINE ??= "qemuarm" # Isar Configuration Selection # # You need to select a specific distribution configuration which will used for both: -# generation of buildchroot environment and target root filesystem. +# generation of schroot environment and target root filesystem. # # This sets the default distribution configuration: DISTRO ??= "debian-bullseye" diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass deleted file mode 100644 index e4a7a571..00000000 --- a/meta/classes/buildchroot.bbclass +++ /dev/null @@ -1,59 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2018 Siemens AG -# -# SPDX-License-Identifier: MIT - -inherit crossvars - -MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}.lock" - -buildchroot_do_mounts() { - if [ "${USE_CCACHE}" = "1" ]; then - mkdir -p "${CCACHE_DIR}" - if [ "${CCACHE_DEBUG}" = "1" ]; then - mkdir -p "${CCACHE_DIR}/debug" - fi - fi - - sudo -s <<'EOSUDO' - ( flock 9 - set -e - - mountpoint -q '${BUILDCHROOT_DIR}/isar-apt' || - mount --bind '${REPO_ISAR_DIR}/${DISTRO}' '${BUILDCHROOT_DIR}/isar-apt' - mountpoint -q '${BUILDCHROOT_DIR}/downloads' || - mount --bind '${DL_DIR}' '${BUILDCHROOT_DIR}/downloads' - if [ "${USE_CCACHE}" = "1" ]; then - mkdir -p '${BUILDCHROOT_DIR}/ccache' - mountpoint -q '${BUILDCHROOT_DIR}/ccache' || - mount --bind '${CCACHE_DIR}' '${BUILDCHROOT_DIR}/ccache' - fi - mountpoint -q '${BUILDCHROOT_DIR}/dev' || - ( mount -o bind,private /dev '${BUILDCHROOT_DIR}/dev' && - mount -t tmpfs none '${BUILDCHROOT_DIR}/dev/shm' && - mount --bind /dev/pts '${BUILDCHROOT_DIR}/dev/pts' ) - mountpoint -q '${BUILDCHROOT_DIR}/proc' || - mount -t proc none '${BUILDCHROOT_DIR}/proc' - mountpoint -q '${BUILDCHROOT_DIR}/sys' || - mount --rbind /sys '${BUILDCHROOT_DIR}/sys' - mount --make-rslave '${BUILDCHROOT_DIR}/sys' - - # Mount base-apt if 'ISAR_USE_CACHED_BASE_REPO' is set - if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] - then - mkdir -p '${BUILDCHROOT_DIR}/base-apt' - mountpoint -q '${BUILDCHROOT_DIR}/base-apt' || \ - mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt' - fi - - # Refresh or remove /etc/resolv.conf at this chance - if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" = 'True' ] - then - rm -rf '${BUILDCHROOT_DIR}/etc/resolv.conf' - else - cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc' - fi - - ) 9>'${MOUNT_LOCKFILE}' -EOSUDO -} diff --git a/meta/classes/crossvars.bbclass b/meta/classes/crossvars.bbclass index 201d460f..e6a085b1 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -15,20 +15,14 @@ python __anonymous() { d.setVar('BUILD_HOST_ARCH', distro_arch) schroot_dir = d.getVar('SCHROOT_TARGET_DIR', False) sbuild_dep = "sbuild-chroot-target:do_build" - buildchroot_dir = d.getVar('BUILDCHROOT_TARGET_DIR', False) - buildchroot_dep = "buildchroot-target:do_build" sdk_toolchain = "build-essential" else: d.setVar('BUILD_HOST_ARCH', d.getVar('HOST_ARCH')) schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) sbuild_dep = "sbuild-chroot-host:do_build" - buildchroot_dir = d.getVar('BUILDCHROOT_HOST_DIR', False) - buildchroot_dep = "buildchroot-host:do_build" sdk_toolchain = "crossbuild-essential-" + distro_arch d.setVar('SCHROOT_DIR', schroot_dir) d.setVar('SCHROOT_DEP', sbuild_dep) - d.setVar('BUILDCHROOT_DIR', buildchroot_dir) - d.setVar('BUILDCHROOT_DEP', buildchroot_dep) if isar_can_build_compat(d): sdk_toolchain += " crossbuild-essential-" + d.getVar('COMPAT_DISTRO_ARCH') d.setVar('SDK_TOOLCHAIN', sdk_toolchain) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index f0ab9714..d36b7190 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -17,9 +17,7 @@ is_not_part_of_current_build() { "${SCHROOT_HOST_DIR}"/var/log/dpkg.log \ "${SCHROOT_TARGET_DIR}"/var/log/dpkg.log \ "${SCHROOT_HOST_DIR}"/tmp/dpkg_common.log \ - "${SCHROOT_TARGET_DIR}"/tmp/dpkg_common.log \ - "${BUILDCHROOT_HOST_DIR}"/var/log/dpkg.log \ - "${BUILDCHROOT_TARGET_DIR}"/var/log/dpkg.log | head -1 )" + "${SCHROOT_TARGET_DIR}"/tmp/dpkg_common.log | head -1 )" [ -z "${output}" ] } diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index b9d3d411..e0c0a3cf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -35,11 +35,6 @@ PP_DEPLOY = "${PP}/deploy" PP_ROOTFS = "${PP}/rootfs" PP_WORK = "${PP}/work" -BUILDROOT = "${BUILDCHROOT_DIR}${PP}" -BUILDROOT_DEPLOY = "${BUILDCHROOT_DIR}${PP_DEPLOY}" -BUILDROOT_ROOTFS = "${BUILDCHROOT_DIR}${PP_ROOTFS}" -BUILDROOT_WORK = "${BUILDCHROOT_DIR}${PP_WORK}" - python(){ if (d.getVar('IMAGE_TRANSIENT_PACKAGES')): bb.warn("IMAGE_TRANSIENT_PACKAGES is set and no longer supported") @@ -72,16 +67,6 @@ DEPENDS += "${IMAGE_INSTALL}" ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" -image_do_mounts() { - sudo flock ${MOUNT_LOCKFILE} -c ' \ - mkdir -p "${BUILDROOT_DEPLOY}" "${BUILDROOT_ROOTFS}" "${BUILDROOT_WORK}" - mount --bind "${DEPLOY_DIR_IMAGE}" "${BUILDROOT_DEPLOY}" - mount --bind "${IMAGE_ROOTFS}" "${BUILDROOT_ROOTFS}" - mount --bind "${WORKDIR}" "${BUILDROOT_WORK}" - ' - buildchroot_do_mounts -} - inherit multiarch inherit essential diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index 4f3c87dd..a6ba0a9e 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -9,7 +9,6 @@ addhandler build_started python build_started() { bb.utils.remove(d.getVar('TMPDIR') + "/work/*/*/*/temp/once.*") bb.utils.remove(d.getVar('TMPDIR') + "/work/*/*/*/rootfs.mount") - bb.utils.remove(d.getVar('TMPDIR') + "/deploy/buildchroot-*/*.mount") } build_started[eventmask] = "bb.event.BuildStarted" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fe9d7f64..42a8fb8e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -54,14 +54,11 @@ GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" GIT_DL_LINK_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" -DEPLOY_DIR_BUILDCHROOT = "${DEPLOY_DIR}/buildchroot" DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}" -BUILDCHROOT_HOST_DIR = "${DEPLOY_DIR_BUILDCHROOT}-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" -BUILDCHROOT_TARGET_DIR = "${DEPLOY_DIR_BUILDCHROOT}-target/${DISTRO}-${DISTRO_ARCH}" SCHROOT_HOST_DIR = "${DEPLOY_DIR}/schroot-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" SCHROOT_TARGET_DIR = "${DEPLOY_DIR}/schroot-target/${DISTRO}-${DISTRO_ARCH}" SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${DISTRO}-${MACHINE}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb deleted file mode 100644 index e5ce248e..00000000 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Root filesystem for packages building -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -DESCRIPTION = "Isar development filesystem for host" - -BUILDCHROOT_VARIANT = "host" - -require buildchroot.inc -ROOTFS_ARCH = "${HOST_ARCH}" -ROOTFS_DISTRO = "${HOST_DISTRO}" -ROOTFS_BASE_DISTRO = "${HOST_BASE_DISTRO}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-target.bb b/meta/recipes-devtools/buildchroot/buildchroot-target.bb deleted file mode 100644 index 6613de63..00000000 --- a/meta/recipes-devtools/buildchroot/buildchroot-target.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Root filesystem for packages building -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -DESCRIPTION = "Isar development filesystem for target" - -BUILDCHROOT_VARIANT = "target" - -require buildchroot.inc diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc deleted file mode 100644 index f74896fb..00000000 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ /dev/null @@ -1,73 +0,0 @@ -# Common part for build chroot filesystem. -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -LICENSE = "gpl-2.0" -LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" - -FILESPATH:prepend := "${THISDIR}/files:" -SRC_URI = "file://configscript.sh \ - file://build.sh \ - file://common.sh \ - file://deps.sh" -PV = "1.0" - -inherit rootfs - -BUILDCHROOT_DIR = "${WORKDIR}/rootfs" -ROOTFSDIR = "${BUILDCHROOT_DIR}" -ROOTFS_PACKAGES = "${BUILDCHROOT_PREINSTALL}" -ROOTFS_CLEAN_FILES = "" -ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_BUILDCHROOT}" -ROOTFS_DPKGSTATUS_DEPLOY_DIR = "${DEPLOY_DIR_BUILDCHROOT}" -ROOTFS_FEATURES += "generate-manifest export-dpkg-status" - -BUILDCHROOT_PREINSTALL ?= " \ - dpkg \ - locales \ - apt \ - equivs \ - adduser" - -rootfs_do_mounts:append() { - sudo -s <<'EOSUDO' - set -e - mkdir -p '${BUILDCHROOT_DIR}/downloads' - mountpoint -q '${BUILDCHROOT_DIR}/downloads' || \ - mount --bind '${DL_DIR}' '${BUILDCHROOT_DIR}/downloads' -EOSUDO -} - -ROOTFS_POSTPROCESS_COMMAND =+ "buildchroot_install_files" -buildchroot_install_files() { - sudo mkdir -p "${BUILDCHROOT_DIR}/home/builder" - # Install package builder script - sudo chmod -R a+rw "${BUILDCHROOT_DIR}/home/builder" - sudo install -m 755 -d ${BUILDCHROOT_DIR}/isar - sudo install -m 755 ${WORKDIR}/build.sh ${BUILDCHROOT_DIR}/isar/ - sudo install -m 755 ${WORKDIR}/common.sh ${BUILDCHROOT_DIR}/isar/ - sudo install -m 755 ${WORKDIR}/deps.sh ${BUILDCHROOT_DIR}/isar/ - - sudo ln -sf /downloads/git "${BUILDCHROOT_DIR}/home/.git-downloads" - - # Configure root filesystem - sudo install -m 755 ${WORKDIR}/configscript.sh ${BUILDCHROOT_DIR} - USER_ID=$(id -u) - GROUP_ID=$(id -g) - sudo chroot ${BUILDCHROOT_DIR} /configscript.sh $USER_ID $GROUP_ID - -} - -DEPLOY_BUILDCHROOT = "${@d.getVar('BUILDCHROOT_' + d.getVar('BUILDCHROOT_VARIANT').upper() + '_DIR')}" - -do_buildchroot_deploy[dirs] = "${DEPLOY_DIR_BUILDCHROOT}-${BUILDCHROOT_VARIANT}" -do_buildchroot_deploy() { - ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_BUILDCHROOT}" -} -addtask buildchroot_deploy before do_build after do_rootfs - -CLEANFUNCS = "clean_deploy" -clean_deploy() { - rm -f "${DEPLOY_BUILDCHROOT}" -} diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh deleted file mode 100644 index d4709cf5..00000000 --- a/meta/recipes-devtools/buildchroot/files/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH -# Copyright (c) 2018 Siemens AG - -source /isar/common.sh - -# If autotools files have been created, update their timestamp to -# prevent them from being regenerated -for i in configure aclocal.m4 Makefile.am Makefile.in; do - if [ -f "${i}" ]; then - touch "${i}" - fi -done - -${GBP_PREFIX}dpkg-buildpackage -a$target_arch --source-option=-I diff --git a/meta/recipes-devtools/buildchroot/files/common.sh b/meta/recipes-devtools/buildchroot/files/common.sh deleted file mode 100644 index 73226d8d..00000000 --- a/meta/recipes-devtools/buildchroot/files/common.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH -# Copyright (c) 2018 Siemens AG - -set -e -printenv | grep -q BB_VERBOSE_LOGS && set -x - -# assert we are either "root:root" or "builder:" -if ([ "$(id -un)" != "builder" ] || [ "$(id -g)" != "$(id -g builder)" ]) && - ([ "$(id -un)" != "root" ] || [ "$(id -gn)" != "root" ]); then - echo "This script can only be run as root:root or builder:!" >&2 - echo "(Currently running as $(id -un)($(id -u)):$(id -gn)($(id -g)))" >&2 - exit 1 -fi - -# Create human-readable names -target_arch=$2 - -set_arch="--host-arch $target_arch" - -# Go to build directory -cd "$1" - -# To avoid Perl locale warnings: -export LC_ALL=C -export LANG=C -export LANGUAGE=C - -# allow for changes to the PATH variable -export PATH=$PATH_PREPEND:$PATH diff --git a/meta/recipes-devtools/buildchroot/files/configscript.sh b/meta/recipes-devtools/buildchroot/files/configscript.sh deleted file mode 100644 index c4d8cf83..00000000 --- a/meta/recipes-devtools/buildchroot/files/configscript.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -set -e - -debconf-set-selections < \ - mk-build-deps.output || true - cat mk-build-deps.output - # we assume success when we find this - grep "mk-build-deps: Unable to install all build-dep packages" mk-build-deps.output - rm -f mk-build-deps.output -else - mk-build-deps $set_arch -t "${install_cmd}" -i -r $control_file - - # Upgrade any already installed packages in case we are partially rebuilding - apt-get upgrade -y --allow-downgrades -fi diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 6551aaa8..57f166ca 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py @@ -65,7 +65,7 @@ skips = skips + ["self._removePatch", "self._removePatchFile", "self._appendPatc imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP", "CONVERSION_CMD", "COMPRESS_CMD"] imagevars = imagevars + ["TOOLCHAIN", "BOOTSTRAP_SRC", "IMAGE_FSTYPES", "IMAGE_SRC_URI", "IMAGE_TEMPLATE_FILES", "IMAGE_TEMPLATE_VARS", "IMAGE_CMD_REQUIRED_ARGS"] -imagevars = imagevars + ["IMAGE_FULLNAME", "CONVERSION_DEPS", "BUILDCHROOT_PREINSTALL", "IMAGER_BUILD_DEPS", "IMAGER_INSTALL"] +imagevars = imagevars + ["IMAGE_FULLNAME", "CONVERSION_DEPS", "IMAGER_BUILD_DEPS", "IMAGER_INSTALL"] packagevars = packagevars + imagevars vars_re = {} From patchwork Thu May 11 10:50:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2807 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f58.google.com (mail-oo1-f58.google.com [209.85.161.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAokOJ011926 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:47 +0200 Received: by mail-oo1-f58.google.com with SMTP id 006d021491bc7-5474b840a3esf4888886eaf.0; Thu, 11 May 2023 03:50:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802241; cv=pass; d=google.com; s=arc-20160816; b=n2pJlJPaKkFlR4IF1JLmxJaSYOii30I+S1y8SZWsFuACrFD/TpRV4hbhhTdik74P2P SuyJ8NrNT1D4RRsDJII7ZHqT1WZ/IRLd4qVBudMf+YKCmKi9oqbzkx99mIl5yarvkO3v 2Vpue3xByVnu0mRQs18n4sCImTytQTuFNuMBREm7qcXp5lUcLhziEmTVLDb3naU9wk8p W0IA94Egc7X5lCEtJDIbeZd8Mlc8FMTv7yI/iPcnImPJ3SMyJku8xrqtQ9cQROzrA4Az HD443+vaOghVOj78e8WXa1fVa4Vb1G8b4Nj575I8HfL58JAXG2eabD/H4hcVDjWRCT+p vD/g== 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=ZbplxSaSvMjUwMKce4jhhzMwT+uRqoRYxWE87UswvgI=; b=UvTEeEBOcTjHTm/AbGBAUYY51M9B2A+8fA7GAteTWPBULIH5GqaDKtZ9w3ClywaOYA nOgF13NhnftNHnZj2Ts77Hil9MjUShbIl06m2PAJgZLuR7EVsBESn1cULu5wP/TthpPC f82dk6fYPLxZuXHcHf7HxZXItvPD9eouXxHN7WArdS9SVN1PemyinNNT3UpRzFBTP9kf 87n8PZPFOFo/whD5Vpk1Xlr6iNejYzEonDwBkg6JNWPlBRiuH4O+tOSrJ2DfXElifu0W 8JwS7Vm3KCym9AscX3NqrlChznrN2DZ5ytxK3sybzS5MoskUxd2nffPMGurYM36OwQ0a qPHQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802241; x=1686394241; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=ZbplxSaSvMjUwMKce4jhhzMwT+uRqoRYxWE87UswvgI=; b=cYUdWebIZ5nlNAA2+SOTD9d2GIXSrrFSb0bOxHPYoTFhtchnoSwemNrBt9/Vl6+MCy 98WfNYhg3heDluGL/yc/yGK9xHnOn9nvkuDpIThA7189v5s/gebNsHXKefl7qeX2RHty QoysNyo4arwbwaqmUfsCaLbSUCYLPRVAKUdlvmBYiOfCJxr13minKE/ArjHNYYIL6v0M uSoSupuNGPV79xtfco8PiDSKde6IWb2NBrkxj0jLLpGjX8BZpko+sEpG7E9lXxqQFgj4 ojWKUxd05hak+eUmrvgm2IOQsTFyglHvnPSrnBgH+6Hw0/KEw4G4DEiCDOTO0KWinJMV v6BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802241; x=1686394241; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=ZbplxSaSvMjUwMKce4jhhzMwT+uRqoRYxWE87UswvgI=; b=f6KsFJVCCjHLzqu/JmNfwiyhwRpxdNfvZ55wDRjNp0Jb/Uar7OFVSnoTgzwP9NEZDQ TgN5M2cVVdsWfPiKfX0DbOOHcPHnqtIsUG7WiAHO60pcwhD/BgVwDvyRlEvXGkBNDWRp j6FDuZ+46a21VssSEzdiAHGuxpvCr2Xtoc4gXPjBAJ4FKlobb22GCPAXTN0J61zzBa1/ AVBM5mQLMm1w8/uepmI5qsHI+q/xRoNCCCW8lDEYli9eJIOV+p99aZdFNWMKn/SFgJyZ JOy5MD4jHUs2FvVsbMa6bwS5u4avx5RWFApPXpM5P2oKrd2tnQlAI/ciITy8oiEhVRhl aklQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDwnMhIa+weyDTbtBnHaTtfWhggVixYjE+MOL3z+2U3F+VCYl26Q feXUTyFPBt1HUJd2MiXjAbA= X-Google-Smtp-Source: ACHHUZ6o0R4eveITCoXbl0wYj6LY4WOM8/FHqoe1B2LVpejtMy6T/Kc6wpYebH83B/xbbKY3/QLvBQ== X-Received: by 2002:a05:6871:404f:b0:196:1746:108e with SMTP id ky15-20020a056871404f00b001961746108emr3408643oab.9.1683802240941; Thu, 11 May 2023 03:50:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:9d9b:b0:195:ca3e:57ec with SMTP id pv27-20020a0568709d9b00b00195ca3e57ecls4721187oab.6.-pod-prod-gmail; Thu, 11 May 2023 03:50:40 -0700 (PDT) X-Received: by 2002:a05:6870:a403:b0:196:27ad:510c with SMTP id m3-20020a056870a40300b0019627ad510cmr5325453oal.41.1683802240404; Thu, 11 May 2023 03:50:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802240; cv=none; d=google.com; s=arc-20160816; b=fCGYRSPb85HwMx09vFlE3ZtO4oYrSOHgfBUC6ORKU7sCMRGdt5FhEd2zFduiLzdI76 g5QvZKpuc31CJnpnal9E2NYKYCCO93NH+xJhzV27x9nihXNSGE9wjboUa9svgP92/zPD vL8R0tW05zjPSzmJNSQCeeA65VXmfex4R/pyJvZFccgUvLQixfgpkdJKufuAXdTH2oQ1 JQ1hkdRf+ETWkci3WV0z/A4CXDXlnLW7ifc8lUaruAAwNOFZJ8UGZF9v0qVkRG82H6v1 K9A/YstnpzXJmNqw8ZKZJWHwwg9BCUq44uXz+ooJ2pLqgnXZHvNao1zXz+IL2qmVxmCM Ka4A== 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=z7rny+gAsXkdAgFDtio3UGKmmeKyU6Pf6qsw+MP8T1Q=; b=XvDby2GlR4TCItILKXK7VLBP+EDSU9eHqvddcJjRCH5O13KEt/1X2Tuslqc4XfRE8+ bS+lDIUbr15ixlTnviLWYVO6PH62JiezDuWd75t8az5fgv8DnLr50qFMj4VMGSD5Vi2S ljp09ajpIZON8enDSdutXjcTErhpVA23x3l4we/kQ9nMuhx7aP5vBGBVlIujAqONM3PE hQbubtJDWO9DyaDlGmLpKb7KXIPjUpR8ZFTqv5e7A9Dng7FLr9uppNNEcjn0nI5rPC1Z D1XX1Q/HFvfs9v0k7LEbenhTqqe/yL1Ae3seMrMfBk6JkBmwSjGmygTdF9LTCDz7kLhV Q48A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ld24-20020a0568702b1800b00180bebe4961si1918353oab.3.2023.05.11.03.50.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:40 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ07011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:34 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 7/7] doc: Update chroot documentation Date: Thu, 11 May 2023 13:50:20 +0300 Message-Id: <20230511105020.1881496-8-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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: =?utf-8?q?INBOX?= Describe schroot rootfs instead of buildchroot. Signed-off-by: Anton Mikanovich --- doc/offline.md | 2 +- doc/technical_overview.md | 107 ++++++++++++++++++-------------------- doc/user_manual.md | 53 +++++++++++-------- 3 files changed, 84 insertions(+), 78 deletions(-) diff --git a/doc/offline.md b/doc/offline.md index cc1e4e39..f9cb479b 100644 --- a/doc/offline.md +++ b/doc/offline.md @@ -70,7 +70,7 @@ Repeat for `/etc/apache2/sites-available/default-ssl.conf`. == Set Up BIND -A DNS server is necessary to resolve `localhost` from `buildchroot-target`. +A DNS server is necessary to resolve `localhost` from `sbuild-chroot-target`. ``` sudo apt-get install bind9 diff --git a/doc/technical_overview.md b/doc/technical_overview.md index 36bfc4a6..586997ac 100644 --- a/doc/technical_overview.md +++ b/doc/technical_overview.md @@ -62,41 +62,39 @@ hello-isar demo application will be processed 3 times for each environment. Three different sets of stamps will be used to distinguish build progress between different bitbake configurations. -## 2.3 Buildchroot +## 2.3 Schroot rootfs +Also called sbuild chroot rootfs, because of the usage by sbuild tool. One of the key aspect of Debian philosophy claims the fact, that everything in Debian should be built within Debian environment. To follow this rule, Isar -introduces the new component - buildchroot. Bulidchroot is typical Debian -filesystem that is created using standard Debian tools: debootstrap, apt. The -source of packages can be either official Debian repositories or custom -repositories created by user. Buildchroot could be one of the following type: +introduces the new component - schroot rootfs. Schroot rootfs is typical Debian +filesystem that is created using standard Debian tools: debootstrap, apt-get. +The source of packages can be either official Debian repositories or custom +repositories created by user. It could be one of the following type: - - `buildchroot-host` with the host architecture for cross-compilation. + - `sbuild-chroot-host` with the host architecture for cross-compilation. - - `buildchroot-target` with the target architecture for target native + - `sbuild-chroot-target` with the target architecture for target native compilation. -Buildchroot lifecycle can be described as following: +Schroot rootfs lifecycle can be described as following: - - Buildchroot starts out with a minimal base system that was generated by the - isar-bootstrap-[host,target] recipe that uses debootstrap and apt. + - Schroot rootfs starts out with a minimal base system that was generated by + the isar-bootstrap-{host,target} recipe that uses debootstrap and apt-get. - - During building custom Debian package, list of its build dependencies is - installed to buildchroot. - - - When package has been built, it's installed to current buildchroot to - satisfy further packages build dependencies. + - Common development packages needed for packages building are installed on + top of this rootfs. ## 2.4 Target Root Filesystem -Target filesystem is quite similar to buildchroot. The only difference is that -it doesn't have development packages installed and always has target +Target filesystem is quite similar to schroot rootfs. The only difference is +that it doesn't have development packages installed and always has target architecture. Target filesystem lifecycle can be described as following: - - Target filesystem starts, like the buildchroot, with the same minimal base - system generated by the isar-bootstrap recipe. + - Target filesystem starts, like the schroot rootfs, with the same minimal + base system generated by the isar-bootstrap recipe. - According to the list of custom packages in bitbake recipes, the initial filesystem will be populated by successfully built packages from locally @@ -112,7 +110,7 @@ Whole Isar build process can be split into the following steps: apt for each configuration requested by the user (Debian distro, machine and architecture). - - Generation of initial buildchroots for each configuration. + - Generation of initial schroot rootfs for each configuration. - Generation of initial target filesystems for each configuration. @@ -157,45 +155,42 @@ This recipe implements several tasks which are executed in this order: minimal base system, that can be used by the other recipes, that depend on isar-bootstrap. -## 3.3 Initial Buildchroot Generation +## 3.3 Initial Schroot Rootfs Generation -As mentioned above, initial buildchroot is generated using the minimal base +As mentioned above, initial schroot rootfs is generated using the minimal base system generated by isar-bootstrap. The bitbake recipe which is responsible for -buildchroot can be found here: -`meta/recipes-devtools/buildchroot/buildchroot-[host,target].bb` +schroot rootfs can be found here: +`meta/recipes-devtools/sbuild-chroot/sbuild-chroot-{host,target}.bb` Section 3.8 describes when host or target architecture is used, please refer to it for more details. -This recipe implements `do_build` task which performs the following: +This recipe implements rootfs preparation for the next schroot usage and +performs the following: + +1. Calls `rootfs_prepare` helper function that copies the minimal base system + to the schroot rootfs working directory. -1. Calls the `setup_root_file_system` helper function defined in - `meta/classes/isar-bootstrap-helper.bbclass` that copies the minimal base - system to the buildchroot working directory, sets up the isar-apt repository - which will later contain all isar-build packages, calls update on just this - repository and installs all packages given via a parameter to this system. - Those are, in buildchroots case, the basic package building toolchain. +2. Sets up the isar-apt repository which will later contain all isar-build + packages. Also configure apt to retry and not install recommended packages. -2. Install script for building custom Debian packages: - `meta/recipes-devtools/buildchroot/files/build.sh`. +3. Mounts dev, proc, sys and also isar-apt, base-apt into schroot rootfs. -3. Installs and executes a configuration script, that further customizes the - buildchroot. For instance it sets the locale settings. +4. Calls apt-get update, imports package download cache and installs the + packages specified as an argument to this rootfs. Those are, in schroot + rootfs case, the basic package building toolchain. -The single stamp is created for each user buildchroot configuration. +The single stamp is created for each user schroot rootfs configuration. ## 3.4 Initial Target Filesystem Generation -Initial target filesystem generation process is very similar to buildchroot +Initial target filesystem generation process is very similar to schroot rootfs creating, the difference is only in initial packages list. Target image recipes are the part of Isar core. There is a sample of typical Isar image that can be customized according to the user requirements: `meta-isar/recipes-core/images/isar-image-base.bb`. -Like for buildchroot, the configuration files for image can be found -here: `meta-isar/recipes-core/images/files`, and it implements `do_build` task. - ## 3.5 Building Custom Packages Isar provides the possibility to build Debian packages from sources. This @@ -217,12 +212,12 @@ Both consist of the following steps: 3. Task `do_install` _only_ for `dpkg-raw`: copy all you want in your debian package to `${D}`, install hooks in `${D}/DEBIAN` -4. Task `do_prepare': perform any preparation steps to the unpacked/patched +4. Task `do_prepare`: Perform any preparation steps to the unpacked/patched sources before the build. This task calls the dpkg_prepare shell function - with the buildchroot mounts in place (`dpkg_do_mounts') + with the schroot rootfs mounts in place (`dpkg_do_mounts`). 4.1. the `dpkg_prepare` function of `dpkg.bbclass` runs `/isar/deps.sh` in - the buildchroot. That performs the following: + the chroot rootfs. That performs the following: 1. Go to `/home/build/${PN}` @@ -232,12 +227,12 @@ Both consist of the following steps: recipe meta-data into a debian/control file suitable for packaging with dpkg-deb -5. Task `do_build`: mount folder (`dpkg_do_mounts') with unpacked files to buildchroot, - execute the actual build function `dpkg_runbuild`, and finally umount again - (`dpkg_undo_mounts') +5. Task `do_build`: Mount folder (`dpkg_do_mounts`) with unpacked files to + schroot rootfs, execute the actual build function `dpkg_runbuild`, and + finally unmount again (`dpkg_undo_mounts`). 5.1. the `dpkg_runbuild` function of `dpkg.bbclass` runs `build.sh` in the - buildchroot. That performs the following: + schroot rootfs. That performs the following: 1. Go to `/home/build/${PN}` @@ -274,15 +269,15 @@ This process contains the following steps: ## 3.8 Cross-compilation -Isar provides possibility to cross-compile all or individual packages. There is -variable ISAR_CROSS_COMPILE that could be set globaly for whole Isar build, -but also it could be overwritten from the individual recipe to force specific -compilation mode for it. This variable influences on which buildchroot will be -used for recipe compilation. Isar is free from packages modification to perform -cross-compilation, this is done by the same tools as for native compilation. -Depending on ISAR_CROSS_COMPILE value, additional architecture specifiers are -passed to build tools automatically, so this is absolutely transparent from -the user point of view. +Isar provides the possibility to cross-compile all or individual packages. If +`ISAR_CROSS_COMPILE` variable is set to 0, the native toolchain will be used +(e.g., when building for arm64 on amd64, the arm64 gcc binaries will be +executed in an emulated environment). If set to 1, the cross-toolchain will be +used (the amd64 cross-gcc binaries will be executed). The default is 0. The +variable can be set globally for the whole build (e.g., in `local.conf` or +multiconfig files) or overridden in individual recipes. Cross-compilation +support must be implemented in source packages. Debian's standard +cross-toolchains are used for cross-building. ## 3.9 Additional features diff --git a/doc/user_manual.md b/doc/user_manual.md index 60b7ca92..8fa79f74 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -34,7 +34,9 @@ Isar provides: - Fast target image generation: About 10 minutes to get base system image for one machine. - Use any apt package provider, including open-source communities like `Debian`, `Raspbian`, etc. and proprietary ones created manually. - - Native compilation: Packages are compiled in a `chroot` environment using the same toolchain and libraries that will be installed to the target filesystem. + - Native compilation: Packages are compiled in a `schroot` environment using + the same toolchain and libraries that will be installed to the target + filesystem. - Cross compilation: Could be enabled, when native compilation from the sources takes a lot of time f.e. for Linux kernel. - Product templates that can be quickly re-used for real projects. @@ -111,7 +113,7 @@ unstable/bullseye included in `/etc/apt/sources.list[.d]`). Notes: -* BitBake requires Python 3.4+. +* BitBake requires Python 3.6+. * The python3 package is required for the correct `alternatives` setting. * If you'd like to run bitbake in a container (chroot, docker, etc.), install the above in the container, and also perform `sudo apt-get install @@ -322,6 +324,11 @@ docker run --rm -ti --volume "$(pwd):/build" isar-image-base-debian-buster-armhf `chroot`(8) runs a command within a specified root directory. Please refer to GNU coreutils online help: for more information. +### Schroot + +Schroot allows the user to run a command in a chroot environment specified by +root directory or previously opened session. + ### QEMU QEMU is a generic and open source machine emulator and virtualizer. Please refer to for more information. @@ -344,7 +351,7 @@ BitBake is a generic task execution engine for efficient execution of shell and Isar workflow consists of stages described below. -### Generation of Buildchroot Filesystem +### Generation of Schroot Filesystem This filesystem is used as a build environment to compile custom packages. It is generated using `apt` binaries repository, selected by the user in configuration file. Please refer to distro configuration chapter for more information. @@ -354,7 +361,9 @@ During this stage Isar processes custom packages selected by the user and genera ### Generation of Basic Target Filesystem -This filesystem is generated similarly to the `buildchroot` one using the `apt` binaries repository. Please refer to distro configuration chapter for more information. +This filesystem is generated similarly to the `schroot` one using the `apt` +binaries repository. Please refer to distro configuration chapter for more +information. ### Install Custom Packages @@ -426,7 +435,9 @@ Some other variables include: ## Isar Distro Configuration -In Isar, each machine can use its specific Linux distro to generate `buildchroot` and target filesystem. By default, Isar provides configuration files for the following distros: +In Isar, each machine can use its specific Linux distro to generate `schroot` +and target filesystem. By default, Isar provides configuration files for the +following distros: - debian-buster - debian-bullseye @@ -603,12 +614,12 @@ The IMAGE_CMD is a shell function, and the environment has some pre-set variables: - `IMAGE_FILE_HOST` and `IMAGE_FILE_CHROOT` are the paths of the output image - (including extension) in the host or buildchroot. + (including extension) in the host or schroot rootfs. - `SUDO_CHROOT` is a prefix you can use to have a command run inside the - buildchroot. + imager schroot rootfs. If the code you provide in `IMAGE_CMD` requires the building and/or installation -of additional packages in the buildchroot, you can specify this: +of additional packages in the imager schroot rootfs, you can specify this: ``` IMAGER_BULID_DEPS:my_image = "my_command" IMAGER_INSTALL:my_image = "my_command" @@ -972,7 +983,7 @@ concept. Isar can build 32-bit packages as part of a 64-bit image build and also enable the image with the necessary packages. To activate compat support, set `ISAR_ENABLE_COMPAT_ARCH = "1"` in `local.conf`. This will install necessary -build dependencies in the buildchroot. +build dependencies in the schroot rootfs. For all dpkg package recipes, Isar automatically provides a `-compat` target that builds the package for the `COMPAT_DISTRO_ARCH`. This can be @@ -985,7 +996,7 @@ scenarios, or when generating an SDK), Isar automatically provides a ### Cross Support for Imagers If `ISAR_CROSS_COMPILE = "1"`, the imager and optional compression tasks -run in the host buildchroot instead of the target buildchroot. +run in the host schroot rootfs instead of the target one. This gives a significant speedup when compressing the generated image, as the compression is not emulated. @@ -993,10 +1004,10 @@ In case your setup does not support cross-imaging, you can disable this just for the particular image by adding `ISAR_CROSS_COMPILE = "0"` to your image recipe. -## Examining and debugging package generation inside their buildchroot +## Examining and debugging package generation inside their schroot rootfs Just like OpenEmbedded, Isar supports a devshell target for all dpkg package -recipes. This target opens a terminal inside the buildchroot that runs the +recipes. This target opens a terminal inside the schroot rootfs that runs the package build. To invoke it, just call `bitbake mc:${MACHINE}-${DISTRO}: -c devshell`. @@ -1029,12 +1040,12 @@ feature known from OpenEmbedded. Isar caches * the Debian bootstrap (`isar-bootstrap` recipe) * Debian packages (built with the `dpkg` or `dpkg-raw` classes) - * root file systems (buildchroot and image rootfs) + * root file systems (schroot and image rootfs) The location of the sstate-cache is controlled by the variable `SSTATE_DIR` and defaults to `${TMPDIR}/sstate-cache`. -Note that cached rootfs artifacts (bootstrap and buildchroot) have a limited +Note that cached rootfs artifacts (bootstrap and schroot rootfs) have a limited "lifetime": Isar updates their package lists for the upstream package sources only once, when they are initially created. So as packages on the upstream mirrors change, those lists will be out-of-date and the rootfs becomes useless. @@ -1334,14 +1345,14 @@ to have Debian source packages as well. - Trigger download of Debian source packages as part of rootfs postprocess. -With the current base-apt implementation, we already cache all the binary packages that -we download and install onto the target rootfs and buildchroot. This is then used to -generate a local-apt for offline build. +With the current base-apt implementation, we already cache all the binary +packages that we download and install onto the target rootfs and schroot +rootfs. This is then used to generate a local-apt for offline build. -Use rootfs postprocessing to parse through the list of deb files in ${DEBDIR} and -download the corresponding Debian source file using "apt-get source" command. -This caches the sources of all the Debian packages that are downloaded and installed onto -the target rootfs and buildchroots. +Use rootfs postprocessing to parse through the list of deb files in ${DEBDIR} +and download the corresponding Debian source file using "apt-get source" +command. This caches the sources of all the Debian packages that are downloaded +and installed onto the target rootfs and schroot rootfs. By default, the Debian source caching is not enabled. To enable it, add the below line to your local.conf file.