From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:adf:c7c8:: with SMTP id y8mr6081020wrg.305.1585919167819; Fri, 03 Apr 2020 06:06:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:61c8:: with SMTP id q8ls878848wrv.10.gmail; Fri, 03 Apr 2020 06:06:07 -0700 (PDT) X-Google-Smtp-Source: APiQypL5iNeZuD+H8v/N+AUTXF6/KO3SO5Fdrz2aL5NUwBEdxmrd2lPC55b5j7fPMZTc5I1R7M+8 X-Received: by 2002:adf:f646:: with SMTP id x6mr9009086wrp.19.1585919167051; Fri, 03 Apr 2020 06:06:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585919167; cv=none; d=google.com; s=arc-20160816; b=Gi9lHLwfy4/RZPFu53SA9Afq7QUAi6YTBJMhR8e/DEpmqcq7b3++Nk4mwOyKSxFFeg SG/38F+Mi6p3wtPwQJrBLkj+vs0mrHSugKHAcBMy5i5rBY6SHDFvv4TYiR4fKLZ9/asq GpuvWRlCbDGmvuRinHYI2nShpYQef509OIzICK18z4eDRoQrVjmAmylyzcscaTv0osbJ Xw3W40EwEDdWdV7v5czX52YiV9TdhW/h9wqf6WczvSBg17Dhfjj3kSt9F118pEgE2v8e DGUUI75+4OOScIgL0T2j/JgwgOtE8fVaJa95E1NIsGqfuvVUbHQc1Nv2yF4jTBaUDu7V v/IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XUZFBshmEsDKKTdLygrJFwvCp+s93SwcIBUMTv2Ns6Y=; b=fHifo8JTSX/uG+oDu2ZrCor8Rav6V314OV0ffBJxqeVbrASsrmmRLf040kPIeGdnDp DAEJ5m5FJ7PgczTZYXOaP9Di+ZzAwWKZD9yR+mwOfNzUbXxXQmRD7xG4wzHGzYWMj7C6 UgLNGRHdk3XPT5TzyFkpueFuaQ4SI8izVxrzJxIL2U3tO9bSEQ3tfe0rVkRtZ6UHbwL5 hWd8ZO7U2xUOMlhzzWKe5hxHA7sNQ9JbM6jKzBd0Xu3hVr9pU5Jqg1Mr8L+YV03ZH6sZ yWXvrEE6I4NVvqSpUk779BTbQX4ZdhZ2k2V49miVEKVH6cjS2hykDXvyD8ChlLQIt080 hh8w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QFftqi8b; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42a as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com. [2a00:1450:4864:20::42a]) by gmr-mx.google.com with ESMTPS id v11si95564wrq.4.2020.04.03.06.06.07 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 03 Apr 2020 06:06:07 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42a as permitted sender) client-ip=2a00:1450:4864:20::42a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QFftqi8b; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42a as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x42a.google.com with SMTP id h9so8443527wrc.8 for ; Fri, 03 Apr 2020 06:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XUZFBshmEsDKKTdLygrJFwvCp+s93SwcIBUMTv2Ns6Y=; b=QFftqi8blQgrvvHbsT6kjHkkUAbTRbRf2DTX/InJqZgCn+Os2dgPmZUIVTDfcpbi3I veRB0Lm59jGjUaAm8uC21HRI5Vf+UiM/RIsf3jAOJyTqKUhvvT/9ihR7S9nYzm88npcY GwZFhcU7EcXL1mLhce4qYgsLt7tsDI/TVlAqguiEExgulX1VO3wQ4NEOdFZkfRLfuOff 7OEqVWDljQIeD2PJVjz0CmGYIWqZr9O9TUT7YS7yPJdFSWYQL5OReFN7hT8TyMF7Xp3A n8rfd5XBXmwWkJhJuPGpXpsIUzHCvtw2FO5JMlwuV+QYjUEFFk6esGt1Ju5zmhuw7snh pbEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XUZFBshmEsDKKTdLygrJFwvCp+s93SwcIBUMTv2Ns6Y=; b=iuZXMfUQllpxQ/b1MyD7wklHN8ewHp71/UAtGK+7NFce0RFHO5KxDuwJVwcSquaR6y NejWIW/PNWybgoyneh2hCEgXroZl2+CYuPoJXfTaHw/3GUB7kO/G6wM4PxaF8uA92uS8 bPZ6QvbxD+/lH5odlerwIG5OUr1ZAtqb2XnDsJn4nbBEB26rtWE4ZdT0lo0leCZavuXl D3j1iPjkIazXhyiYADaoyhdEsbaosGQBTOqLTNPWo78zYUZvainaXO+/KthDFZ0klCyI EEQsDcCeTVctp0dMTs6lhYYBU7rnu9KitvuVnJf8U8GVTWTxMlDIw9NeLmZa2uRddopw u/KA== X-Gm-Message-State: AGi0Pub9lHVU9fXaPZHGhNhG0pbT6NKuKdFXKB/QCPPfCxxbbknYLXDL CPpc8hgBblyy47foL9s7/RopW1lqgGk= X-Received: by 2002:a5d:470b:: with SMTP id y11mr8766420wrq.282.1585919166166; Fri, 03 Apr 2020 06:06:06 -0700 (PDT) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id f62sm11017737wmf.44.2020.04.03.06.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 06:06:05 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Vijai Kumar K Subject: [PATCH v4 1/2] rootfs: Make rootfs finalize a separate task Date: Fri, 3 Apr 2020 18:35:50 +0530 Message-Id: <20200403130551.2158-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-TUID: NW/AjZzMnW9p 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 --- Changes in v4: - Use = format instead of just using to download the right version of source package. 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 96ba863..9fa58f8 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -60,7 +60,7 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache finalize-rootfs generate-manifest" +ROOTFS_FEATURES += "copy-package-cache clean-package-cache generate-manifest" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" @@ -171,5 +171,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 806e824..8bb003d 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