From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231875531357028352 X-Received: by 2002:a05:6a00:7d6:b0:624:5886:4b4b with SMTP id n22-20020a056a0007d600b0062458864b4bmr5521592pfu.5.1683802235080; Thu, 11 May 2023 03:50:35 -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-Google-Smtp-Source: ACHHUZ4+8ZKhwhwa85wBtOedzaNV38DacpxM+q/8KRNOnuveXQz/DAWaTCeyab8pPTyMnHQI7VK2 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 Return-Path: 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; 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.. ([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 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: C/vSgKz9NxyP 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')}" -- 2.34.1