From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7314993823371755520 X-Received: by 2002:a50:9fc9:0:b0:553:70f0:f42c with SMTP id c67-20020a509fc9000000b0055370f0f42cmr2998911edf.16.1703154722363; Thu, 21 Dec 2023 02:32:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:382:b0:553:b254:46f7 with SMTP id o2-20020a056402038200b00553b25446f7ls280197edv.2.-pod-prod-02-eu; Thu, 21 Dec 2023 02:32:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUXCRPlpDtDV/COT3ITHQd5Rru2n5fHWfVEwbkLnSAm3niToBkqP+/ivEuEhM7/fY7fFMH X-Received: by 2002:a50:d71d:0:b0:553:a566:4fa4 with SMTP id t29-20020a50d71d000000b00553a5664fa4mr1522996edi.38.1703154720281; Thu, 21 Dec 2023 02:32:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703154720; cv=none; d=google.com; s=arc-20160816; b=jqcwLB9bvtO1K/Gv6D8bjzPCJzJFyPRbW03a7v3fmjrd+bGeRD0qJVH2q97hyp4S7a 0JLcLGRBkY1708jK6A3H9G8/2z+wz+HbNmNFGklAdnfTwMQ7XNlS7HwSr6UoIIYVo6tL RM2h8iTQrdIPJGoNcVPHenUTmd8KWTXUag3wqFNi4KNrw6fdncG77/9cXL+KRFNdVize l1Tv/x4tDoEbTRLZIdy7fx0ayXlFzhxj/3etG0aZxwLjs5A3OSyXOVL6Nrwz8W0t9sdc HwkO5Wj9aoJDLTXbUPXEPphHDyGcKTqk/WVLBx2Pf/c/CDgH4jc/IR1xvMiuWO5CSqwr Vv5A== 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=TfMvZN2KNsFIyqWDQ4gmu2IYFi3BpVfzai/4WzWizWY=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=sHZ9FpLfBdQPryqaPbQ8dVZfH1yTVoUFEj2wYpySa3u6rQPXH9uN99EjWK+mGtxLt7 sHDFvRq57uazIqaVeJQW5ny05Z2zsngxMKQ4kHuxGBtWVv3WNuPJO137GCNJ0EfNupk7 Zx1NKYIqEZl7/CsATxBIMcVDUrtVRw9vnCnp/afv1FkJ5rkCaSedg8b6ZMR6HmGNAgtD IWzvt/a1dLnIyRiSK1qtI0QvqtBbHBiBVzJeriUvOk7yv6rlqb7mZzq1XqkCd/IQlHVP KjZWt4HDovfmR3jAqXvEtx7SZ2dQgSouJYvrfTrdw2Jph2ZQ7wObgyevr7O+hAj0HcX/ lL/g== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id z36-20020a509e27000000b0055410f019ccsi99368ede.2.2023.12.21.02.32.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Dec 2023 02:32:00 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; 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 Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 3BLAVuFm000349 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Dec 2023 11:31:59 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 1/4] rootfs: Split isar-apt and base-apt cleanup Date: Thu, 21 Dec 2023 12:31:39 +0200 Message-Id: <20231221103142.47089-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231221103142.47089-1-amikan@ilbers.de> References: <20231221103142.47089-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: a9qcdXbGZgSd To allow separate isar-apt and base-apt source lists cleanup control remove this files in different functions. Signed-off-by: Anton Mikanovich --- meta/classes/rootfs.bbclass | 8 ++++++++ meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 3 +++ 2 files changed, 11 insertions(+) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 1b95115a..498fbfd6 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -305,6 +305,14 @@ rootfs_cleanup_isar_apt() { set -e rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list" rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt" +EOSUDO +} + +ROOTFS_POSTPROCESS_COMMAND += "rootfs_cleanup_base_apt" +rootfs_cleanup_base_apt[weight] = "2" +rootfs_cleanup_base_apt() { + sudo -s <<'EOSUDO' + set -e rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" EOSUDO diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 938b8334..39ced80b 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -60,6 +60,9 @@ ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" ROOTFS_CONFIGURE_COMMAND:remove = "rootfs_configure_isar_apt" ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" +# Do not cleanup base-apt +ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_base_apt" + DEPLOY_SCHROOT = "${@d.getVar('SCHROOT_' + d.getVar('SBUILD_VARIANT').upper() + '_DIR')}${SBUILD_SCHROOT_SUFFIX}" do_sbuildchroot_deploy[dirs] = "${DEPLOY_DIR}/schroot-${SBUILD_VARIANT}" -- 2.34.1