From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6816610675337461760 X-Received: by 2002:a19:5f4e:: with SMTP id a14mr1517741lfj.57.1587115854177; Fri, 17 Apr 2020 02:30:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:504c:: with SMTP id a12ls235672lfm.8.gmail; Fri, 17 Apr 2020 02:30:53 -0700 (PDT) X-Google-Smtp-Source: APiQypKmQl4A63ZDu68vDb9eqpqJSkOox5ynbEFVbL2utD7EgzVG7aNRNKikBLfwfbnIjeKz3dWH X-Received: by 2002:a19:c607:: with SMTP id w7mr1496841lff.32.1587115853435; Fri, 17 Apr 2020 02:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587115853; cv=none; d=google.com; s=arc-20160816; b=hQwZ0FCNVQMSdnBbgwNHfDU7SWUraIdDKS8p6bAek3tHHFFIbu9boGtXoDrSvLq6LX HBk5OdTA/axz9o1+A2zDfUNwpvmcjBI3aYT2DYH+iRjHJV3i9pGmYChXzYHu9u1qCgoK 6UZaR4fbmU1ziLshuX2CWwInB1XfXkMry5mwIPIPmZ5ZOjbYHb8cmvJo9U1KKqUrClsQ b8OAX/xzkAR5UaahBLIKwWq6AgbfCLnMKBJCMIvg2B2GFRrPLZd5qkHj2PJ2yg51Y/KD klPyvqaLl7OwPLEM+C4cHt/tdTYjWgEE90SvzhY/m5GNaMcOCEbtAqoMjL3psm/8xzqj qYxQ== 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=5BGo+cj8ceFwRzvWgBpsV0R0pom++RaL/+O8wnLs+lo=; b=sdlYF3cGUNpiB1RwWz+E8hXLMHpnAezjlwQWRU1JbaY/Aj3ewikzxjC160LhWExVrK F0e1PX4Hmnk3yP0AaUnixWc0xjqx1RauASc0f+HJHo01PJ2vSrOyZI70RHmeaRP58ape jMrcwRzhfFx8bHMoTrrvkolJmkve2RXmmF7rN4Jf5ZtAjMqdwqln0/V7zH1e3JYmkDeo uxcCPN5QukYHVQ+z494APVVIZKtQMuGiVqobmQLxl2pu/io2MRSsjUBoC4J27zpgSdhC dKSEqgssac9Hu+T/5lvrDwVyTHYmCVBepYis67d6fUIj49J7nS0lU3+gls8QXd1yhbgZ JwIw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=g1fMnILK; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 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-x444.google.com (mail-wr1-x444.google.com. [2a00:1450:4864:20::444]) by gmr-mx.google.com with ESMTPS id q24si614970ljg.4.2020.04.17.02.30.53 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Apr 2020 02:30:53 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 as permitted sender) client-ip=2a00:1450:4864:20::444; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=g1fMnILK; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 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-x444.google.com with SMTP id k11so2263400wrp.5 for ; Fri, 17 Apr 2020 02:30:53 -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=5BGo+cj8ceFwRzvWgBpsV0R0pom++RaL/+O8wnLs+lo=; b=g1fMnILKCDDG7MB3CnNfOO0bClMF+kIYDczAF1/+ZePd7N/Bw7muDSNDWd+WQhCEyf hh3huyUrWFzAs69O9cXG5HWjDX+ivfwhLoW2yq6LHn2cTPWfftYWvcIGoGAS1KQCO/t0 Gy1j2+E/57jgNsE/sihtnIW8JMG6+kSgmnh4M8z6Vd/49cYPq2mqzLLxEzZaqmlotQfF ob/NdN6cy/tYyAR6Ia8xaM9E0FyXfTx6Jua0/+xhugGlFIQahIrDhUmrkdXbQP9PlPmr NNBpXmdHlz8VXNbTVmQ771SjRRR9xAQWPg0hWD/vM1eOhLY7P2JtyMyWGDtJVNa5YPQr BX2w== 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=5BGo+cj8ceFwRzvWgBpsV0R0pom++RaL/+O8wnLs+lo=; b=O2MwZ/x0uJ75U4xjxjLg9hN5mXPotVSdtyBRWHJ0d5Vlo86EpmcUDJmCNxe/itugi6 WZixij4a/b8s/jOiW3eIEaUueUyvG7FIb3Hgw4mctQas4zI/NuvXZH5UVEpnvrvRZbeC QONj09Q0rfTEt5U8jkTf8LIOHm1HuMRh2FoHP4cNYM5FQk0dYfeU86qzuWv29Pgr1yV5 kZSks4tVntRltSPWf08euOr9lKMNk0ys32OpM4f3NPkLVbM7CCZBxJBnu09QYHd8yaBs rEqhFcOw6+XRWR4KRiWBPvZ1bPP5uxR/p/9luDSq6kAtRSl/iweCJm6N8d/4DV016MMM 0xQQ== X-Gm-Message-State: AGi0PuYVEg3r4Pi+ZZOKUQPuyoWgWx9hoIopyghxL0HgT3PUULjkxbzR YYKtiUM6Id9P6K04GH43+hrzEYcZjmg= X-Received: by 2002:adf:fad0:: with SMTP id a16mr3200266wrs.149.1587115852487; Fri, 17 Apr 2020 02:30:52 -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 l15sm6836256wmi.48.2020.04.17.02.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 02:30:51 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, ibr@radix50.net, jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH v5 01/13] rootfs: Make rootfs finalize a separate task Date: Fri, 17 Apr 2020 15:00:28 +0530 Message-Id: <20200417093040.15130-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> X-TUID: SnCtlgb4owOo 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 | 39 ----------------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0150f27..6b04c0a 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" +ROOTFS_FEATURES += "clean-package-cache generate-manifest" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" @@ -173,5 +173,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