From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239302955540676608 X-Received: by 2002:a2e:9e56:0:b0:2b5:9f54:e28b with SMTP id g22-20020a2e9e56000000b002b59f54e28bmr645362ljk.7.1689918847316; Thu, 20 Jul 2023 22:54:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:168f:b0:2b9:34b6:b47b with SMTP id bd15-20020a05651c168f00b002b934b6b47bls542797ljb.0.-pod-prod-01-eu; Thu, 20 Jul 2023 22:54:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlEp7HVGJZZVBnEbga8miYxqBsZOXFk63IpzFQ1HWHYXVaI2AusV4kRC3GCeTdRY5xU9fndA X-Received: by 2002:a19:ca5a:0:b0:4fd:d862:72a6 with SMTP id h26-20020a19ca5a000000b004fdd86272a6mr526212lfj.53.1689918845010; Thu, 20 Jul 2023 22:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689918844; cv=none; d=google.com; s=arc-20160816; b=IhEIabBgc31muPUvmbqJLv8aNggC4N/Z88Lf8T+J+Xo3JDz/H2DjPT4SL+Srh/kpW8 xBUib56N1PFcxQje18hJXR49NkACgwLl81lHmHLtuLPDRMU3Nqj1N4POG6sNftQrW+x/ Su7ouLVQUebo3XZ29ZtKQXKrBtOM7YQOG96m6o4a/slJAHAsDadz37zWdHHuV+RCAS9N oCvZwUyMKSxOislSCXtaLERTrNyNf6Q186B8f0CaaOlmcJ573gIYpKIxCBseMQGNTWdd CrQEfS1wo7+dQm0kHNxNt3idGbLOH3dUJzG0rO/WL2l+V2rfMRqFqEJatQ4oEMux2o0F HQqw== 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:to:from; bh=xMWOg4IgZI1uS+1p+OTZ5zGakY0STDTQRXUeG4tNqH4=; fh=swRs1+OhWjovx1IrvOlKBWsdq9manB5qdcuGoHoh5Ak=; b=VnkvhbIbOWpMPprg3TiiWQn3qelyb2T6IGJG0SLewS2RlFjW3XmH65CI3bZn9lOEOS I0xH0gwUbwjIucWm87OJoFuLYpe8C68133XzUQl2lfLq+nNm25oS+fozcPAGnnZfCmVj fgdYV9xuHa8LyZ6S/wXNDltvc7m87Kx4mWK+XT2JISb4K9U+MDdIMhEAJb3bpFOorS+f 4nuZSpeoCmY+gu9aAPasOIryzwBATbromCdB1iKVcGdz12UXwo78FFL1mbcKC7QkNAe/ 12g1MKERASM1jOcQKgWs1oOCV3T4CmMo3aGXLWqNw8saNUou1h5n9mzcAXInr2DRgIWb pXPw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id m12-20020a056512358c00b004fbaaecae45si145881lfr.5.2023.07.20.22.54.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Jul 2023 22:54:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 36L5s2TA027957 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Jul 2023 07:54:03 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 1/9] isar-apt: Move cleanup to postprocessing Date: Fri, 21 Jul 2023 07:53:54 +0200 Message-Id: <20230721055402.13764-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230721055402.13764-1-ubely@ilbers.de> References: <20230721055402.13764-1-ubely@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: ylPCBerPol9k From: Anton Mikanovich 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 c572456e..938b8334 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -58,6 +58,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')}${SBUILD_SCHROOT_SUFFIX}" -- 2.20.1