From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899501277566205952 X-Received: by 2002:a5d:44cf:: with SMTP id z15mr5566569wrr.353.1606415325544; Thu, 26 Nov 2020 10:28:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1fc7:: with SMTP id f190ls1359611wmf.1.gmail; Thu, 26 Nov 2020 10:28:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhSZx8X0JtZW06cLBKBY+8JcvVoqFCZyukseSmB5ywjlPP6XSqK1VtsULuriInObOuI5rV X-Received: by 2002:a1c:f311:: with SMTP id q17mr4666999wmq.28.1606415324560; Thu, 26 Nov 2020 10:28:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606415324; cv=none; d=google.com; s=arc-20160816; b=jokV42sVqet3+X4LiP9Dr+n8CGOnMS7Jz0+Xbl9sub6SjUHleOoHferYX4G6xC2Pfg xePA0OgXVa3L9KDkqS7Pov8vEcHJK6A0wxPW5KP/J3J8zENKasOB52whtHUF3UllXKG5 YWc5BhG9AavUbUlRc8B+hEQQtgigg1viTSWTtEfp0vfRzgOiUkey4q+Te/9VNPV9orNj 25Jfs1W6v+YMAef5lmVuHMJiqhWl+RQKqjSch90qmbge4Os+1ohnJe+70sC+ZS+64ZU3 KTqUzAsqUghXhQupmSbwRI4DPANyXZck7Cd5Xd30CNPGfzDcsH+MmBf+awQr5VuNzaOu uh5A== 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=+psr9IKvQzg/5QPjOWPy8KP08uOEmtcwfcP1pPeRXoM=; b=gzxvvBd6lReqT1GYyS1x7gA9qwB264R21jZ30019rVWWZnWXNLCWisCA2LI+yL1q2B zug1KU4WRv8+BurkI449X4kyPAJge2Fpz4uWp+ROZDrcX5n+KOCGUBtb6uGjzdPPTA0q yn+LVmJpIw7RRdgw5FuWVH5hpSEz6HXbNK7UDJqIgZtpnOXdjhCPk/4Io0Bq/K4OfCTT +zkbYL9j4IQLdJIBPd6OJE73Pp6+sTK5R2vq5M3nK+yUMjs8Ie3DuU6yecRvvVnfbH4h Xh4phzB6VsLSBdQ0CmiEQ1l804iVQ+y3xcHPr65tRBP4kMrsYEGeFqwtaCw+B0fRT09Q cIZg== 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 y187si226499wmd.1.2020.11.26.10.28.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 10:28:44 -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: zH+AHhU09ieikk8y0rkO3ngVxgzeC1Zp2/bRCMo/0VFWQvs2ICnbviBdWJhopMltAIPG1MmYQ/ 9bEN+bjQJREqyvMkd8oNaObeNPCdfM9WZZppGGuYfMt8KtorM2STHP5RUvMmJtB4oiwkx0PfEB hm9oaQYRKgfLhmqN3L0jpxfoN71qq6BFYVh5GYuzjR7YGF/TqnL9WPVuUc5kvZdsSQFw6zT+zY olCmi5malnJz+PcB1BDU9isWEBYV5/O86mUWviK5i8PLwlPqGAx7k1Y1cuc408uSOFQQ5TQnW6 Nyc= X-IronPort-AV: E=Sophos;i="5.78,372,1599552000"; d="scan'208";a="55644666" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 26 Nov 2020 10:28:43 -0800 IronPort-SDR: 1eJrD0b2cSmYgO6e1OueafZ5GnFnp2QciHjT6xOz3PWb7llsAV2q3RgANhdITIxuAxpo142stp ghBgYW60vq3mFm2Bb4M8o1rzVKk3ihW64FOmrGBeH14zBPj4GWgjbKUlAGa7Di8a/yzNpMkt3e FtIWyii9QKTKYQsewRwjcbvvr4XB8vcQJ2WPP6dKgVFGy2oqWq83r5q4jL6Kxk+0Klj1oWgpDM xkoAh0giPEbXgAAPVLlnTS2LHJTI1iLiD6hVj5YmDiR4D7hlpu/25LQjPATnlp7bw2ebd4DqqA Lpo= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v10 01/14] rootfs: Make rootfs finalize a separate task Date: Thu, 26 Nov 2020 23:58:05 +0530 Message-ID: <20201126182818.7261-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126182818.7261-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126182818.7261-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: WL1xKg0BeAD5 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 8e350a3..cdde195 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 export-dpkg-status" +ROOTFS_FEATURES += "clean-package-cache generate-manifest export-dpkg-status" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" @@ -174,5 +174,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 5b63ae7..94176a9 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -12,7 +12,6 @@ ROOTFS_PACKAGES ?= "" # 'clean-package-cache' - delete package cache from rootfs # 'generate-manifest' - generate a package manifest of the rootfs into ${ROOTFS_MANIFEST_DEPLOY_DIR} # 'export-dpkg-status' - exports /var/lib/dpkg/status file to ${ROOTFS_DPKGSTATUS_DEPLOY_DIR} -# 'finalize-rootfs' - delete files needed to chroot into the rootfs ROOTFS_FEATURES ?= "" ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes" @@ -209,45 +208,6 @@ rootfs_export_dpkg_status() { '${ROOTFS_DPKGSTATUS_DEPLOY_DIR}'/'${PF}'.dpkg_status } -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