From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a25:e092:: with SMTP id x140mr2766506ybg.476.1606291409411; Wed, 25 Nov 2020 00:03:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:3806:: with SMTP id f6ls809695yba.4.gmail; Wed, 25 Nov 2020 00:03:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWHXoeDNIFylJZTA5hL/c04TZNZefN52J9jik0YLyzr0D2Rk2Ea+cC8OemDTmFlioWD04R X-Received: by 2002:a25:dc8d:: with SMTP id y135mr2892973ybe.175.1606291408975; Wed, 25 Nov 2020 00:03:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606291408; cv=none; d=google.com; s=arc-20160816; b=WzOp4LxeVA363+rceJACNCsGIjmx3DBoXjg8O2ZrCXx/ehrHCxgVBGMDlEqK+fcRXJ WaMsnpPcS10UtxEtD8PPrE7cHBr/GGRCBrO0i7sNG4rTSBkqX9FbGCNVo2Sa4WaouisI kHxGdOiFj3bMhelCyb4KPHNYlV28KG1jWxxWV2HH34PbRDlSqIyuN1LqDE2Xq+Eevnea ds++iDNnoRaaH/6njbJQ1uv5X9mDq//jG/lN0VNrGYoUwz6Vz0gu7Wed8pnK4Cw79RId sky2M9UQPM65znumBudmvpUYYuRvkWoCEKtH8LXQ3lDl7JhrOwzFP5e57D9K6JJKuBRi ma1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=H8niWxM5BKPb6fWXtTy1dn2jxNvuJlJ1fTRLh0T9ZqE=; b=bSQnzKIXfNNJPrzhvrPNaEWDHHVeoVshi77k0XjWGSR5ebrvh7J6MQvJayzLDqDq7y KLzFd+Pm1YklUpEDEJ6O4CrXC75hUkf2WtGf+Z/0qfHHB3gk7ikJBvduwpwZWhghByQx Sjru9Fa49NY0ohcLSIxZHU16iZsScmi9TcY53SHfufPuvwz+vKlPXihH0Trp21J7VtAO gwr0G+U8NXwHB1775Hns25OeIirvumj3Lze5HTUsTPcvxAqEfzL0YCaymkW+RGStbBtJ OybmBbY4ERTmBvcBohhf5Lp1XVGniE+EME8Nb2vpjRWLxhIArDT0VxVgMkGRPqFGvica +TRQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 199si77218ybd.5.2020.11.25.00.03.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 00:03:28 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: yFCtwREYGGzAzalRICRXsBH9xUeIjEcCG3sGfJcgiH2xsL3ehG7Rr05V5lofDqGXkgfO+Y2qoV ioTA2xC3AaN+4C9dwA8EIVLgAputHUv0lAUmzBdMPK1RiUDw1sM2qq6k7JNFy/e9IPAAw1Bwek ZiUJm1RkBp19syrWMGHC9/a6IeS0tpCWEEdTk1q5ryp2KuzIm+1SN3ynvV5y4syweuZ2+ATI96 34sTNIeAY6Sj2QCTSPg8QcfC1CrcwiETK3Kv2JK0LnEMboML72wgw7XBS2XIZA11VkEhBdH+mw LiI= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="57762468" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 25 Nov 2020 00:03:28 -0800 IronPort-SDR: cVpVxa7gLW4P9pL6ITk2nmcMOGfIBFRH8J4YfyHfVE7ZJuhegjSVX3ukLHQ6fff/HxYwieBKQd qytpt03PMfK3JYX1VXOQ5b6C6whuvL3D53N38/q/4BeiXUss2BuyldwUxInS0LyRD8kaQfdwrI PnjyOR1OL6zQVcPSqcdJlvNvqEmOhidNtOg/L7YtaTSu7QKFUjPF1eGgG8axERli+OSJ5JcF4m IhKjCZ1/2E4I1Vzlcz+ZX4K/Ps7RxzVX56WrhElPS4z8WmqALyA49EObtxbXAewhbIkcEQeZcO z74= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v7 01/14] rootfs: Make rootfs finalize a separate task Date: Wed, 25 Nov 2020 13:32:48 +0530 Message-ID: <20201125080301.15818-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125080301.15818-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125080301.15818-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: g3hkr3X5J5rs With the current implementation it is difficult to append a postprocess function which requires a chroot environment. For example, to add a postprocess function which runs apt-get to download all source of packages installed in the target. rootfs_postprocess_finalize is not actually an optional feature but instead a necessary cleanup function for image class. So, move the implementation to image class and make it as a task. Signed-off-by: Vijai Kumar K --- meta/classes/image.bbclass | 41 ++++++++++++++++++++++++++++++++++++- meta/classes/rootfs.bbclass | 39 ----------------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index a296cc0..2391529 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -63,7 +63,7 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache finalize-rootfs generate-manifest" +ROOTFS_FEATURES += "clean-package-cache generate-manifest" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" @@ -173,5 +173,44 @@ python do_deploy() { } addtask deploy before do_build after do_image +do_rootfs_finalize() { + sudo -s <<'EOSUDO' + test -e "${ROOTFSDIR}/chroot-setup.sh" && \ + "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}" + rm -f "${ROOTFSDIR}/chroot-setup.sh" + + test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \ + find "${ROOTFSDIR}/usr/bin" \ + -maxdepth 1 -name 'qemu-*-static' -type f -delete + + mountpoint -q '${ROOTFSDIR}/isar-apt' && \ + umount -l ${ROOTFSDIR}/isar-apt + rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt + + mountpoint -q '${ROOTFSDIR}/base-apt' && \ + umount -l ${ROOTFSDIR}/base-apt + rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt + + mountpoint -q '${ROOTFSDIR}/dev' && \ + umount -l ${ROOTFSDIR}/dev + mountpoint -q '${ROOTFSDIR}/sys' && \ + umount -l ${ROOTFSDIR}/proc + mountpoint -q '${ROOTFSDIR}/sys' && \ + umount -l ${ROOTFSDIR}/sys + + rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" + + 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" + + mv "${ROOTFSDIR}/etc/apt/sources-list" \ + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" + + rm -f "${ROOTFSDIR}/etc/apt/sources-list" +EOSUDO +} +addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess + # Last so that the image type can overwrite tasks if needed inherit ${IMAGE_TYPE} diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index afec1cb..eae14d5 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -201,45 +201,6 @@ rootfs_generate_manifest () { ${ROOTFS_MANIFEST_DEPLOY_DIR}/"${PF}".manifest } -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'finalize-rootfs', 'rootfs_postprocess_finalize', '', d)}" -rootfs_postprocess_finalize() { - sudo -s <<'EOSUDO' - test -e "${ROOTFSDIR}/chroot-setup.sh" && \ - "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}" - rm -f "${ROOTFSDIR}/chroot-setup.sh" - - test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \ - find "${ROOTFSDIR}/usr/bin" \ - -maxdepth 1 -name 'qemu-*-static' -type f -delete - - mountpoint -q '${ROOTFSDIR}/isar-apt' && \ - umount -l ${ROOTFSDIR}/isar-apt - rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt - - mountpoint -q '${ROOTFSDIR}/base-apt' && \ - umount -l ${ROOTFSDIR}/base-apt - rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt - - mountpoint -q '${ROOTFSDIR}/dev' && \ - umount -l ${ROOTFSDIR}/dev - mountpoint -q '${ROOTFSDIR}/sys' && \ - umount -l ${ROOTFSDIR}/proc - mountpoint -q '${ROOTFSDIR}/sys' && \ - umount -l ${ROOTFSDIR}/sys - - rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" - - 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" - - mv "${ROOTFSDIR}/etc/apt/sources-list" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - - rm -f "${ROOTFSDIR}/etc/apt/sources-list" -EOSUDO -} - do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}" python do_rootfs_postprocess() { # Take care that its correctly mounted: -- 2.17.1