From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:adf:a549:: with SMTP id j9mr4273124wrb.199.1606311789472; Wed, 25 Nov 2020 05:43:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c3cf:: with SMTP id t15ls67896wmj.0.experimental-gmail; Wed, 25 Nov 2020 05:43:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHV0HIxpwyGOCBNsj+xAT+091a7rUopDAn+NNRHJqcrunhYBNsYAwvhIebCLTf8VFNIKUC X-Received: by 2002:a1c:23cf:: with SMTP id j198mr3983673wmj.6.1606311788385; Wed, 25 Nov 2020 05:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311788; cv=none; d=google.com; s=arc-20160816; b=QhBUD5UEvaoMEzX69v1Y1DJNKAwHzjfgAbvSr9L6IY0dlz1ei+CGcanxuj2pzELyyQ 31t++L5jwEk3JqBnvxZhzGWMY6EvUJ9SpVVX1aBUHDjHsz9xWeFPJlntY1sOc0lZl+qp VVvPHxNU06p7d10UleKt0sk0F1V3KLs3Yjtdki/ZWM7V6tCigpOHGwaTpw0G8PWQy7zJ vMB8veO9ClFKtB2no73RShZEFj9aDNsWxssFqEwZUPzCIPmeZBpSItuQSsd6nGm2DtCn M6LyvuRKP44vub1xIwolsbrMbkxKRRaMXjhnjMDKMRuT8qx8aknXLoicbNsPYbNthqdr 7VTA== 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=Ui2dAxbnFgvnyt2u3cY1bp3ZRaIEy9B9MfFLtvf7JNR/XV3ohbljijq3r6OQC13kEU It+xPG4kM7M3V8lgrNL/l5c0JYPJqUlgQFhgLmJ0XVsquTTSYxomBaV24oOrqu7Qcr5J r5kAwcUj1ipKg16jbbw+qnxqyYUSkWFWSR6sSkDTaD+jMKJJT8ITZuenaosDyc4xOIBI Ke68d/5a9ZucUftT1TRLXnPVZcFfppvSZNWn44aa4yQxhwD5LxPoMGh0woqqJj9aRmjU wXkZKKDSTsczL/AHys910zzbKNqTvwO6SNmaocvvmBN0O6xR90IuQi1/OJDUiByRlep0 sahg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id c20si60917wmd.2.2020.11.25.05.43.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:43:08 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: XMEcdsaDsirtCcaxn60XsIkN+GEtfYk3fHA/VEDHQ0nTBe1l2NobfrjUc3i/8hfFTB7Gj0ERiN UOG0NuCs3tYmUfkx+C+O+KmceY56m0zwSTTpC8von7N8nDCt7Ie0nBCEBiAkFUuMQbw3UtM/RL uFpKwBwIykErEkpyitJtkNM+rSrZI/aX6JAFxRtTci+gg4ErZ77x0qgurKbINPNjdlKnX+BwYb qpQ7rw50f+Hft1wvyg30rJyTd+zHhj++aZ9WD/s4BHVl+21b/p1eCxAim+VONCF9GWD+Zyb8V1 Vb0= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597745" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:43:07 -0800 IronPort-SDR: qUsJ4YnE92ruTXC1bQZkPNg8m4cAmbYV7Zmxc9qXwRT0+o9cDGmI8IE8dJ7H3ASpz/UD5L4ZdK reRxFbRBy3jgIrhefQ14kqw/tOgfdFh/D+GgA94HtnzLGbOFMSPUj5O6MxcVuXlIVh3oNWiXHK 7P6C6MNfAmT/mnGJPFwtEGYINgJ4uopPoMQ7zI8Sm79vajrTo5HWm6e4DBMjqSmsx/tXyhuuaU kN4Pfvs4S31XjzSBrHZa4tz1ePV1zp6b5L09MNp91Uz4TbUiZFomlmY3J/bbtsget6S2Xqv+EG hbk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 01/14] rootfs: Make rootfs finalize a separate task Date: Wed, 25 Nov 2020 19:12:23 +0530 Message-ID: <20201125134236.25878-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: 8HK7Xc5gjyYZ 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