From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:a92:15c2:: with SMTP id 63mr1430451ilv.111.1581659291932; Thu, 13 Feb 2020 21:48:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a02:69ca:: with SMTP id e193ls124934jac.9.gmail; Thu, 13 Feb 2020 21:48:11 -0800 (PST) X-Google-Smtp-Source: APXvYqxdxmw3Y08LMe8MuvpfjHm2dYZo12gBsd+TH8pazEnUOQXP5OTwg2YUmp6z2+UVwKbU58FM X-Received: by 2002:a05:6638:38f:: with SMTP id y15mr1283361jap.17.1581659291508; Thu, 13 Feb 2020 21:48:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581659291; cv=none; d=google.com; s=arc-20160816; b=F4NTXnwqrhdWY6G4XdSOWI3s03aID1maHoAPckRwZmnNlYgRc5ka3dKNegWlpEZAF/ wEl8vJcbDqu3QuOLGcyxD9z73l8CysPgNlqBQjIQrD3JFvoG4Lv5WqF4Qq9oaijEc+73 SJAMo/D0qEw0D+wN87PwQ9P+gkncG7NRlVliRVC8KAW6BzevF6VgTk8CWFREmQ7deIM4 QNNDF6yXLg1/y4pPlbblnsXE4hw+MXwSLp8r33smEdQzx0NBt/iiwpS/uETvyOR0JtM9 KCbZXO1aJ6kbfbjElritriuH+dNOwNnjm3DWbPtsm1U5VtTgsuqz2D11+CU9kUUZf5Mj 71oA== 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=QI601XeFqRpdNYpsbD32L9J101nL5talvFIPDSL2V6M=; b=TmrOpEUOF18IT7cL+bey2CJ1lgHxc7c8T5ZLB2OUh3EecNnAx8MmqbePMvxHgkDAOg kh+GCAjj/r2qbu78lw5wlormTAMcGrPBs5j2OTaHC2dt2HJ/LLI3by/httjL07U4r1ua XAd1yREYeiG99w3mNAzpQGkrEkt0/xd+GT0kbBbrw1iRzNiz3wxf2JTfMj+VhVDB5WN/ 33I/3KElXaPhPw4ZdLVcDLJfdX1S+Qk12bBTnGxQyH+W81H7vxeR8DyMaFoYWDDYUiOa zAmAB4QQSnjEWb3mwPsNGKJ1DejVyxNs/AR38/Wk63sdjdSSPuxp69TYMajniTKoFdQd BXYg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Ag5tV9G1; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::431 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-pf1-x431.google.com (mail-pf1-x431.google.com. [2607:f8b0:4864:20::431]) by gmr-mx.google.com with ESMTPS id f85si297488ilg.2.2020.02.13.21.48.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Feb 2020 21:48:11 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::431 as permitted sender) client-ip=2607:f8b0:4864:20::431; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Ag5tV9G1; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::431 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-pf1-x431.google.com with SMTP id p14so4329852pfn.4 for ; Thu, 13 Feb 2020 21:48:11 -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=QI601XeFqRpdNYpsbD32L9J101nL5talvFIPDSL2V6M=; b=Ag5tV9G19tJTVyIrfeb368JwAmLtkZEJmy8LaLXVNBTx8DjKW7L93WKWDfniIAmOfC AJga7Pd3Up09kCGbsfgMaDhZNhUfTq8+bSAqDR0idd0JBTHcAbzWsDV9cslPOtWo8oVX Lri6cBMa3Is6L94uo+Ux8ODZVsIoXReDIZf1GRNG78NfqebZaxbtj3/hwdgFPZOkx1vt ozrKT4TS1oq9LzaZEncG1xqwdw/Rc3q/7XGtnFfBlcjmqFDSTpQUJxRmRHNsokpmpqqh B6UIgYfHKY+KRrvWv+HDh2uLo/K8z264F6ivPSC+c4mF0CCP+BvJ39Oa6lEt9y7bWsc+ I2ew== 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=QI601XeFqRpdNYpsbD32L9J101nL5talvFIPDSL2V6M=; b=fQxBsKLCa8b0c8GXgAqvi2u/OLOAXF8bg5FIlg6EUwi75osNtSN7C/YZrec/Sknhnr r/yQtQGf2bp+C3qLNJY2opOzrCheoNiKJr++fmdscCsh4vS4mZBnZS6+HBlOY8lCfYHd JuRV/JNmz0R2nxpZeAdCOyPDM1OcaCvP1vMfNFFyXmB86zDBO1w3KJHCapv0I+9amqJK 5eGOyYZABFffLm3g7F8MvEnxYqhectDmhIjL7Axo8gJGqFXK+2K/7+vPTxzgqiTjDyWK LtJZZhksURXPAv/I+PWovpzFaB7hjm6LYElNhWN09iLwgsYyhF3FfD6L9It7I5Vxi3ph mk9w== X-Gm-Message-State: APjAAAV8eyVW7T8KDM22/T4WGZI1Dblmo1xwNkUEFPx5MplFWVJH0LIV ov7TTafPzRO7upgxYBzmN1TstMc9Fr+RRQ== X-Received: by 2002:a63:cb11:: with SMTP id p17mr1728552pgg.42.1581659290517; Thu, 13 Feb 2020 21:48:10 -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 a17sm4957657pfo.146.2020.02.13.21.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 21:48:09 -0800 (PST) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Vijai Kumar K Subject: [PATCH v3 1/2] rootfs: Make rootfs finalize a separate task Date: Fri, 14 Feb 2020 11:18:00 +0530 Message-Id: <20200214054801.11870-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200213100820.23444-2-Vijaikumar_Kanagarajan@mentor.com> References: <20200213100820.23444-2-Vijaikumar_Kanagarajan@mentor.com> X-TUID: F3lYMBsU2HIY 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 v3: - Take care of non-existent downloads/deb-src directory. 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