From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899390751905415168 X-Received: by 2002:a17:906:7f19:: with SMTP id d25mr2222601ejr.0.1606389591523; Thu, 26 Nov 2020 03:19:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d151:: with SMTP id r17ls1870382edo.1.gmail; Thu, 26 Nov 2020 03:19:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJzg8gvz55K/VptS4Vg+9pX93+nbfTZJgxyViaJ2DXhuIR21NNHl/hASMpczewFLSa+jx+8w X-Received: by 2002:a05:6402:1389:: with SMTP id b9mr2068360edv.178.1606389590710; Thu, 26 Nov 2020 03:19:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606389590; cv=none; d=google.com; s=arc-20160816; b=XMwimPBzTRHQUme8OXae/YteHvXRXDXVmbVcYv/G4qOEfU3MYl7z2pQjLjMm9U/CdP HLem/PWRS3b5qR8yvC/UIpP5GAypGuyE+772DQoSUaRTL+6VP18mRBEFQhTKt38pd5M/ GpBCCQn+JdsAT8AYrdf0v/rufWC9o8MIRY/a1BWmjYYTrZAn0WlpVxxxn+VycgYdjMy2 piYbUBxjiXPVjp/X/XVJQR6/1T9ut9aI7jJ36xr9yZb7EhbD8rXhs7DKgU8mS6A4d8tk j1nAecMaoVfW9SlmQrNks16i9epd7oiu4wECvTQDXqIPECK2asd6/SolA3re+usSHgDS WQrg== 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=QHFCHUmPGHWW5osEMamzNyvoEWfE15MWae75uWEOCK4=; b=zvAyP7DX+fkvFGO181X/hpAMOJqH1li3eh6FU+1jsZZrKKGTwSkJBI2e3Da55mGVFO vIEtQu4dLA5nLcAlWFxbIyxJkIPXshYysOM3rh4GsmjrNtZXJe7Kj/tMpUcf6CA1PV6g fI3C6HiYfr090I6X47/IO4m+lJuopXTnVZNER67BIo53XS8LKJpH32ZX26RAm04Jyi97 rIlQ4sH2sPIPlMSRx6PGYxir9tgQ39ukEYDI3OxI1nffnm4eM1mCpbt9/79DXQEupiY7 c/ZrNej3/eUMRcuX1QVEVYJEW7yU+1HwFdK/Y5JPQBR28VC1V5itzyBbpzIJr+O/lD2m 1yoQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id v7si292239edj.5.2020.11.26.03.19.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 03:19:50 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: T/hNxYWhk3apbPrEEb1xzqR9Rl/OzN9EkRvFNsC8uIr/7wMwrEB2bDLmchuHsNfWrU2pFlW1Mj Q4Sdr5ZZ7ukVoyh/5OyLN0M9OWvvnumalkvreOOhr/syHGdwGUsTNZNMug/SluYQ7Rxv/20ovh JihlKpgalB6aQ6ppOATsNb+7nUlIx7L0ybWCOleE/DlkMMfNhRGl19daCLTHgjGVuo/23zYPdw vWzIvwmyupiOeWAixNczm9Zw69ZADxZOMZk7kKexqzOFt3Hpbxl/fOlXK0lMKrv+Zfi73rIqCU mPI= X-IronPort-AV: E=Sophos;i="5.78,371,1599552000"; d="scan'208";a="55500399" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 26 Nov 2020 03:19:49 -0800 IronPort-SDR: OznMM5H96U5t+yrNntm/qIidxE87UEMqh4H+PpPzWpO6g5M398aMDGLbumFD7vP9fsEbSmzCvp Z/YKwWRSL1Rbgq2KhnjvKAS+TPCbOwJmHuAvEpNsM/ZPEjRfDC8NxsHvUrIOSVPxoaV10jiaQW NR212Qc80nReLJyDO0r/Q/55OYDK0k5c4pu2JsixPBj3HVWduVTWi9Y1bfdZBaF8dIQ1ui3myj f7W3nRs3knZbB2S+RONWhaen3hNo0mY+h93MrtR9sx9Bfhd2aryjcHOi79FAh2btzPt3pKpDSW yvE= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v9 01/14] rootfs: Make rootfs finalize a separate task Date: Thu, 26 Nov 2020 16:48:59 +0530 Message-ID: <20201126111912.3037-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: Ybb+9P5E52Iq 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 | 40 ------------------------------------ 2 files changed, 40 insertions(+), 41 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 2c5d0dc..f9c8995 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -11,7 +11,6 @@ ROOTFS_PACKAGES ?= "" # available features are: # 'clean-package-cache' - delete package cache from rootfs # 'generate-manifest' - generate a package manifest of the rootfs into ${ROOTFS_MANIFEST_DEPLOY_DIR} -# 'finalize-rootfs' - delete files needed to chroot into the rootfs ROOTFS_FEATURES ?= "" ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes" @@ -201,45 +200,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