From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:a6b:6e06:: with SMTP id d6mr20272169ioh.95.1581588515516; Thu, 13 Feb 2020 02:08:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:f13:: with SMTP id x19ls4533804ilj.0.gmail; Thu, 13 Feb 2020 02:08:35 -0800 (PST) X-Google-Smtp-Source: APXvYqy/mrLe7F3VLKbYdXlHA09HeNW+UqkvVNXpMAcLt7HKzKuJng5tDx3w6N1f1G6V2rapoiEI X-Received: by 2002:a92:91cf:: with SMTP id e76mr16133143ill.197.1581588515057; Thu, 13 Feb 2020 02:08:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581588515; cv=none; d=google.com; s=arc-20160816; b=BsidGNlzkp8BJvt85DbC1N/h1LIszV0mQx693e0ay3fEL8HSMs9mun9+0G2l4Zo76W gtV+4cLk/qGqVPqL9MmzAnaMu6PwNjU9l97650duypessOBh9cVRB+JbHNOLBznAqzPV BKFMKt+2kdgTVdr3jqWGCIyg/org5cEYn5aMzk7IspNxO+HzrLLNFV6i1YAO6TL0T74M XOb5ftB7FJTF1JJswuVQHl38LlK6lqkdHU58OpDDC0Rl+Ct+ntICu8v5oUGIGff6W5lu YNEjZy+UqXf+/Z9CTVyFgAwFyaHYlV19VI7q0DHIKk24Q8fvBWJdS3Nr7rBXX6l6olAW WZ+g== 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=Wq2sYdrnHBAQPPrGV1BDTB706Jg9ROq+Kan9dAyAMcU=; b=Kz8d9LCp+JJQdh4APvIX+j4AV2e9YMkdFRPDaw+DAmyafLS1IjHWhUGu+ENIiYerXj 9a8yw1aoyv2GlV5pM+pvg0bLF/Ujs54Ek3P1f3yGbhl1TAT/CjWA0ydEtbUnIOubT1lE lCJbnoLsybyjU8DBoPkbLjk4ystY4k+YkNnJhA0gg7myy5akME+y2IVh+MUWPsrzXeTl H82LOLR3h20bjqwamEu4WymSDu8k+xiSnFP0dGSzLruxf0kaLD1Sfammw0ca+kwqXnmL 1bwCEl9XPxUlqkc2lw4ivYMlj40TIf8c4+j6Mu5Hf2Tp7t3Mmoj9al2wJzIRLO1nubfO sHHA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ilceRjqm; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::62e 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-pl1-x62e.google.com (mail-pl1-x62e.google.com. [2607:f8b0:4864:20::62e]) by gmr-mx.google.com with ESMTPS id z7si151064ilz.1.2020.02.13.02.08.35 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Feb 2020 02:08:35 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::62e as permitted sender) client-ip=2607:f8b0:4864:20::62e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ilceRjqm; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::62e as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-pl1-x62e.google.com with SMTP id c23so2157906plz.4 for ; Thu, 13 Feb 2020 02:08:35 -0800 (PST) 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=Wq2sYdrnHBAQPPrGV1BDTB706Jg9ROq+Kan9dAyAMcU=; b=ilceRjqmIjw/NQzF4l1R1WWnpuzldtL7PQQPGM+8UnvuzLE1yn6AxhFnJfr2XHe1f6 +2SmxNZukObBorQoHLXhE9zahfCVMIk99zv6UycmI/Edv3tME4N1O30uQc5abAtk6xVx 4eZS0cpRJt1W7UkTD8Elp7SWMNBARDLdmrBHqWA2kXqV31OiC2XrNiQqKkfgUdsUb+hQ KWG6STYi5pavWBnookkPr7owjnDLh1RlIHK8ghrY6EvrRpM+fXmLJH1vMMWmE4dvh6o3 99JX62Yqh0g/BbAEbgJhKDt6BD7H6TR3abC9hi7F33geNwzyhAHw1vLLg0T4dvJ+jIPt 0FFA== 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=Wq2sYdrnHBAQPPrGV1BDTB706Jg9ROq+Kan9dAyAMcU=; b=tJce6Csz9jVwaZaF5xvm+IpeH7La14cIOW/zPp8fIsjtg9/Y8qA5ZuzMePQZizcojI yj55BPjhTJtCZdKEKe0R2UEOaw2PstxNdkUtBj056lFt4MqeFKwvU5eeeZ1n9+vyQ0Q5 uf91bpu3ebdg7R3uEn7TnPD7AkEOr0q2EbJiBZNQmHf3gIqIpi1TtwSSiPRaxgxcUiRQ hZ/mTGnUWMtHu2amGKpL2VHMR4jW7I0xR+Il2X7b4N/YvKn3C8vIenf29XaIXO57MFNd p2CRNjhqg0zGrpbzJVyRqMGws3p4/EKrO0YxiWDP+zHFuOmJaqM75y8IiN5ieTDI3lS8 G3Tg== X-Gm-Message-State: APjAAAUvUUMjf3KopAahVOP9vcLUNOUA4CAi3nrUTAWLx6/2TnYLmcXW /CWGNzzp61ZuUdJq53++7ibk/GSHngQ= X-Received: by 2002:a17:90a:e2ce:: with SMTP id fr14mr4065171pjb.99.1581588514061; Thu, 13 Feb 2020 02:08:34 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id s130sm2529742pfc.62.2020.02.13.02.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 02:08:33 -0800 (PST) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Vijai Kumar K Subject: [PATCH v2 1/2] rootfs: Make rootfs finalize a separate task Date: Thu, 13 Feb 2020 15:38:19 +0530 Message-Id: <20200213100820.23444-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <25b9cca0-3fb3-14c5-f7be-c25d20b74d3e@siemens.com> References: <25b9cca0-3fb3-14c5-f7be-c25d20b74d3e@siemens.com> X-TUID: OPU+/q2QJUwY 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 v2: - Introduced additional patch to cache deb src - Rebased on top of henning/staging4 tree The git tree is available here. https://github.com/vj-kumar/isar/tree/henning/staging4 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 cfd617a..c5fddba 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}" @@ -168,5 +168,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 54b5e5c..c3af7c1 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