From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:adf:dfc8:: with SMTP id q8mr14929076wrn.135.1581313082433; Sun, 09 Feb 2020 21:38:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cf15:: with SMTP id l21ls14141743wmg.0.canary-gmail; Sun, 09 Feb 2020 21:38:01 -0800 (PST) X-Google-Smtp-Source: APXvYqxakMiohNY6CrbyaSRH339LK6dtlQuVqtQtrYowBDySLjzzJu7nCvQIwzOo8ZntfqcnSElL X-Received: by 2002:a7b:c416:: with SMTP id k22mr13763233wmi.25.1581313081606; Sun, 09 Feb 2020 21:38:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581313081; cv=none; d=google.com; s=arc-20160816; b=b0Vo1vXizmCyq7MzgaDgka0qMB6zx4JXvq2aBEP8m/vr61+RijoN6W6jWqFtOmcqMg bLzYwonwxrtCYGMWM6a+rRbZk/qAiSvp/4tAYc1QETwjZW8Z6h+92/ykxwUHe42dk7EM 57c79A3bKQQ5n0sTuO77skszFGgDm2ax4F0bu6+k8wMiwxddpyFRo3JZhmTI1SkCEsNr 1IfbK1rkJFzozovAsR/L1p9jyKwX9gTjmpIgMdv9mzA6MSsqc++EmSDkNyLMNFAyyfnm kAZMvbYH1JqPJZKrH7viOkytn34txSYxa4wVo7MOwdnoMBwnV4IHHIHDC017Y9IhvPg8 LdfA== 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=XfPuHKBmhVUjxy2X075Utt2hBQ7YMo0FgagklE5c9m8=; b=ogTdI0rpKDUvoOpOCgMn3lModfMeMr2N7E1xtb+xo/WpLLR4VZZJqGSZlOlfPep497 QmttEz7vHBid1cUXUYJa0/VEEHsbtIqd6nNtXQd2QAm864c/qk5swJOOa55hGn/W+aqv zdjdygdKpB6Yr+Ut9JPMPJUKrJzVKDwu4YEjilNwx6frQS7ebMbO0g8YJXyI2knigOlw Dcf/ffUcTCrleIJtCYvcpacen+SYklL7BNHv9uYtB6huF4qwoT58obltyycoSRFwvzyt k+dsvkCYbvnY+2MBsGvR0R6C8ASS/x/Sw6Egcbc0XSRH2BC6GnPXXE3vQdq+zr03cdrK BhUA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iFyFvlLP; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::336 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-wm1-x336.google.com (mail-wm1-x336.google.com. [2a00:1450:4864:20::336]) by gmr-mx.google.com with ESMTPS id w11si735840wmk.0.2020.02.09.21.38.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 09 Feb 2020 21:38:01 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::336 as permitted sender) client-ip=2a00:1450:4864:20::336; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iFyFvlLP; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::336 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x336.google.com with SMTP id a6so2370529wme.2 for ; Sun, 09 Feb 2020 21:38:01 -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=XfPuHKBmhVUjxy2X075Utt2hBQ7YMo0FgagklE5c9m8=; b=iFyFvlLPhX4g0qK0JDlJdWaOr94wtV2Ns+S7WW3WN+WRnWvmGEkRTaMFNdIrwEiLV3 k8sVJirDg5HNzU3p9oNgmAvo08jEyU3GP3be5/RAbFIwv4fSDREroYlE91wZISuA4rx/ VKZa/94WUKA7g4GvqcJMtHitg0YhzwDPrKvXu7b/zS0zfs/oCzQhWO6H2roJ7nvipaHN 04cR3kev1PgjpDKcwerFCoKlcgyQW9tQH8zq12hRU+h1J3Sye14CW33h1yAYJ+gqUVVn N8XcvVtjkSeYY8I9dADdCx2LdrSZ8ZMSC3aetxTgoXN7UrMat+rbijZnc9fJCVYBVMkk AsEg== 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=XfPuHKBmhVUjxy2X075Utt2hBQ7YMo0FgagklE5c9m8=; b=ebJaLe1RyxmKi7Auhrk3wzUvXmWp30I5/xbNnJaaj02PdC36z/XakKOHkW8TLxyuU2 LBYQC1O1Xa2lJuYZ5KW8lsdxkrEVZGh8tbhK5WCIFzGWRcGXS21lE9GTxwTkBZYMan/2 /3COUv0Ls/BHiwUtCLZerTnXERO4bCPdSXksKdvyFSNxH6VK/vQv4iGSdihMQQiAO3lV 67E99m5tsUgn7lAiE6XbjSR2nfus9gdvuyiNr1G2+ywYdlJBRBb718DLoScbjsMzzbHg So4z5Qtb8gqViE9a8+rGgmvNPzBth9Xwxh1slCf9T4SDisFeqfNvy1x6Nn5qRGX5oMnj GXGQ== X-Gm-Message-State: APjAAAUZsmYoxxOCOEyWwCC2jaCcmfbcnd36iLj40rQI90KZM4fGTfUe 6w7p6CkpLQnakEx7y+2oCp+OLG/1CSQ= X-Received: by 2002:a05:600c:d7:: with SMTP id u23mr13484170wmm.145.1581313080906; Sun, 09 Feb 2020 21:38:00 -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 y6sm14768490wrl.17.2020.02.09.21.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2020 21:38:00 -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] rootfs: Make rootfs finalize a separate task Date: Mon, 10 Feb 2020 11:07:53 +0530 Message-Id: <20200210053753.32341-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-TUID: GwH7UE00xwGB 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: - The solution is changed to remove rootfs_finalize from ROOTFS_POSTPROCESS_COMMAND. 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 725bc04..98338ac 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -60,7 +60,7 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "copy-package-cache 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}" @@ -169,5 +169,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 64eaef7..153038a 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -197,45 +197,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