From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a17:90a:ec05:: with SMTP id l5mr1193579pjy.172.1601445836993; Tue, 29 Sep 2020 23:03:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:2154:: with SMTP id kt20ls313991pjb.1.gmail; Tue, 29 Sep 2020 23:03:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+Nc4yxe4CPmkgb4QVLMibkf4VjLk3A5aIotRGRYyMRWJTaT3kBxhFS7SdyXub9uFP32et X-Received: by 2002:a17:90b:a51:: with SMTP id gw17mr1155483pjb.118.1601445836328; Tue, 29 Sep 2020 23:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601445836; cv=none; d=google.com; s=arc-20160816; b=sOdf/HnVkx4kemCJb22XRXLl/mi7ELaIRV/ZzxYLEw7p686jPHtXUcx044COXgnAtm QDTm0YBusgAjJnoacY4JbwSKxoBL3ADO43g5DSxdCiqT5Bonz/vWsdl7tlspOykGOfrj x7SyYKYYf6R+Y+0tinEQfUdO3HcmItgF8xLR8atHAIkQkx9mYx6zG7nmay2r1kRYxH78 yCf1o79vJWo2OBbwMlXIUp5BVrRxp1/eJ1G1hT0cTcPLVGB/HBU4CGk2b+Ak/1QI6I7W qw9ENYtUW7lNlfWwKrXuagIvV0x4JCAD/btfVRhLA3IxsY8+Z+e2xbLwUn7lKRBEEGte GaAg== 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=wb3hy764DpTj015lDmGR4zEGHQOGm4Yuz8Immab8M9Ne5ob1Tnsx2W46HnLHfunxQ1 EF7cqHpq2ACULgyWjnuqICM4ZHAC7eNLzo/u7c3VzbXiyxq4AbCiUEOAIvnQJ8iqPw4r cv9P+VJn+w4WhaGjiGXZ5C2Jll+t6jDklAR9+dwsmWHTHu3lTp+XfTp6Z1JCt4ucoAIV EFljIo27iiRB5SVPvvP4Gdnvz60pZl0eh1FvdgaRHXyScy2M+SEjIdzMhqad8cJJ2CID sf+5ZJemQAPwYAi4Xm8bdSqniu1HFEAFku2ljP+HGrjwnhZh9OamI+jr1VNWLxfmjqoX vctA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id mm16si51246pjb.2.2020.09.29.23.03.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:03:56 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: 2ZuaqvZzUXNAQYpW1aHojMGlaLuKYv91hkL2VtNnV+NT5aigmMVarkpqBuR/NGfKzihKZHF8S5 s/m9UIfFUlXfhB6dtCWgCdM9SqKL9uJ0vEbIW3NYKUh5jn4LyZleBxSCtWF+hD3FYeZShKE7oA hEFa1GgzCRI8MD9Ke9HRv3kv6ScH5HIrlUuBV31vL4gFUj/ohF588PnTPguxqA5wgJe4/hd7LM owYoaVFlhWrv3CHIVGhYgYwmKRRx0JfbWfW0yYc6gdLeK0n5+HqhV1+Uk+I4xpzvdzlAqRHvWb D9A= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53461959" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:03:56 -0800 IronPort-SDR: XbkNUtt2HJoE+IWt73KG/gx6MBrU+6AnMxOicPp7FA/vfi1Pk+tifFhQOrD0SwRBE1VtCWPEsQ S79Kt/dcTol5BZ2nJuaoXXDfAp5jjr+jkADXBG1vz7aBatJQmIoco3c8ZoVD02O2ROo7OU5Eve rpy7YyLJ8Gnh7h37/8/NrycdV5vVUMnGAoLjEfmnHfujxOlbBwp62iQFhfnIquf4uSvqMdM1Qo +Zp01qMCrYmQRrmBp5q2EJGVkWUhsxqGOaxFS1ZZQhYsiL0BU3nLQ9xBDZ+lnbh2roUhUqX1v0 zs8= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 01/13] rootfs: Make rootfs finalize a separate task Date: Wed, 30 Sep 2020 11:32:47 +0530 Message-ID: <20200930060259.12422-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: 918ZvMNOus0E 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