From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7199542182322110464 X-Received: by 2002:a37:6896:0:b0:71d:6621:be8f with SMTP id d144-20020a376896000000b0071d6621be8fmr1664819qkc.1.1676274042405; Sun, 12 Feb 2023 23:40:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:1e0d:b0:3b7:ea5e:962f with SMTP id br13-20020a05622a1e0d00b003b7ea5e962fls12624022qtb.6.-pod-prod-gmail; Sun, 12 Feb 2023 23:40:41 -0800 (PST) X-Google-Smtp-Source: AK7set9MB4NTLSch7mqUOd1gMO0Ygw8t1DGhmd1g5JRwerB+BDbT/Z7pi87N6xs3qcO55tnwRjAt X-Received: by 2002:a05:622a:190b:b0:3b0:fe24:9b89 with SMTP id w11-20020a05622a190b00b003b0fe249b89mr40595443qtc.63.1676274041828; Sun, 12 Feb 2023 23:40:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676274041; cv=none; d=google.com; s=arc-20160816; b=sBLlYP7v89BP7o+iBTSqiss19VxjFRutPvYG3MkEoUQ0aZ0tZ143BmNfCSYyZdHhgs bXqHW94KpDw5dREycKijnZkdOa8gHMlVosWWwlgx5UAxLnOsxo6tG8oR5gJ+rvFpqKFI uvfbRkgzeT8RW+G4YJYnKiroSVag6Y46NrMMR/q3HKqEJLJgYsIqjbbkRz+sXt4Dfctt NyQTyQ92+zTgwJ5oUGKhY3K4cEu0oE7WnHng4UE2YmaFC0K57xrjFWF866gGC4/9HwNT xMyLNfqB9E3KWNERbkctFoWzs5BKHGZ1woOoGVhcYAg2J35CT5OKj1wHadh3sNpg7MUQ Wm0A== 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=p3fYHMeOyN3mJeYI/xCmO4uNXvyOrLUj3nBBQe7xvi0=; b=Q1oLmvTxQzYB1SGMR7Z5hckUdNZsrrTiuCL3HTL0l9eltUTt1eA8Z/UcPnTXw8Ljgd sWXK+XGSL3+3o4rD29DJtE+0K6kjGArbR78AxnIIazJoZAImjldo6Py04nyAyJbtdWXn gCDafO16GAeV0Jw0zKnZpCwHftzWYwuUWbQZJDPtd292Sj5jUs+3rTA5slCTZQeW/jAk gPsVhg61r2b91n5urJNcD2ep9901R3OsPItaCJVFFwbDq9ySTcRGkyGDYf30R9njyKWl s6IensatAA8RCbFDwwph7RUspThn68/OkUperW9DqO1B2cW61n6lIOnJHU4KcNqnFITR rw2w== 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 o4-20020ac86984000000b003b82ce6a004si1023707qtq.4.2023.02.12.23.40.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Feb 2023 23:40:41 -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.. ([85.254.74.215]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31D7eapv003492 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Feb 2023 08:40:39 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 1/6] isar-apt: Move cleanup to postprocessing Date: Mon, 13 Feb 2023 09:40:29 +0200 Message-Id: <20230213074034.3949-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230213074034.3949-1-amikan@ilbers.de> References: <20230213074034.3949-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: W/EZFYcTHiRY 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 539ec51..f47e301 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -435,11 +435,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 0eed3d0..36e74af 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 fb061da..543522a 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -49,6 +49,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