From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239302955540676608 X-Received: by 2002:aca:bad7:0:b0:38e:44cf:ee14 with SMTP id k206-20020acabad7000000b0038e44cfee14mr1441049oif.5.1685531567858; Wed, 31 May 2023 04:12:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:822b:b0:187:a128:fe88 with SMTP id n43-20020a056870822b00b00187a128fe88ls3550064oae.1.-pod-prod-07-us; Wed, 31 May 2023 04:12:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Bg3vX0kaD/M5K7LhmgdOQN2SeRrgMKC9/Js0D1KXAOB6Z9tjQfEMSNekXIWqII8Suq6W6 X-Received: by 2002:a05:6870:7e0c:b0:192:597c:1c17 with SMTP id wx12-20020a0568707e0c00b00192597c1c17mr5380116oab.7.1685531567188; Wed, 31 May 2023 04:12:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685531567; cv=none; d=google.com; s=arc-20160816; b=N/pdWIHXu2qul/x4VVf0AYggtxpjBYLliTfENlcHYgKA4LPbkTFxknbbKMaUeriGVO qxDX6DaxEzILuiYZye70xry5eAS6+YCeX3yIFQ31cDbKI5BVS/hAO68ZFbFEakZuvnOg 804MI6+5txqEmkURqensnut6LHzZJx9cC+S2zgcZ/4qCMm67pn53z9a98VrmDW6iL7zn Yp+nTvPWVmIgxrEbrLdnvFnP6KMzW0TJHk9PhZ2GMIdIiip5erNTgByaqiuStWfujgOF NvSHmW0OpnOjPti69vgej6qjlIPPEKuUT6QD+SCwdWMqtKBZ6fFj8uzkF5L0InlTla83 3/bA== 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=AJbsUlCR6C3hm+bIJQbae7E/I7mWPJBRag+Tt7iqvJoWnvxZ5l+k7zW0rwgrELi6Zf 8uXxCJD1n+uM/G98p4tFC/ugiUf1fa7kzmFncrINRyOL701uqnLF+uSlDjGJjRuqVNtG FcFcqJbx+VIMWAbp0JCDFVtQ8KY8JT3qpz8osbVhzVG6YeHIDQucJrv0SEYgJJU0UoRW oavxyCRF50RYgZ82sSakXmMJ0zcr+cSUKS2uvkSfGjI0yOKBCWklpLyPCREyUoxmJKuG DqOfgVuh57nKG0fNjJFdOAzax+ou1L82bRTpSLzddB232sEyUXqkb03/zXihFtQrAJoW FItg== 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 lt5-20020a05687142c500b0019a232f5a23si113447oab.4.2023.05.31.04.12.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 May 2023 04:12:46 -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.. (IN-213-226-141-203.bitemobile.lv [213.226.141.203] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34VBCcvY026932 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 31 May 2023 13:12:40 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 1/9] isar-apt: Move cleanup to postprocessing Date: Wed, 31 May 2023 14:12:28 +0300 Message-Id: <20230531111236.104373-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230531111236.104373-1-amikan@ilbers.de> References: <20230531111236.104373-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: 6Zi8aWZxaZv4 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