From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6617812835611181056 X-Received: by 2002:a37:a6cb:: with SMTP id p194mr167287qke.52.1541067230168; Thu, 01 Nov 2018 03:13:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:2aa9:: with SMTP id b38-v6ls96981qta.15.gmail; Thu, 01 Nov 2018 03:13:49 -0700 (PDT) X-Google-Smtp-Source: AJdET5fCYv6OHCOF2HHotArY0IGiUoB98m9STBtnCWTRyNl8wjrrbZ9MgBuS5DI9NIPDEgKhDybr X-Received: by 2002:aed:210b:: with SMTP id 11-v6mr4920704qtc.45.1541067229872; Thu, 01 Nov 2018 03:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541067229; cv=none; d=google.com; s=arc-20160816; b=EcLJWsWUpTWPR4et/sLGwnQv3M8bMqkJ9hMysYF0xGvm8VATaVmIIlaEGFDmieCnms q267ySYRvzpXrNnL+wgYBZUrOrhWhTyzKvm7a1uBezJQC6+2fTCkX+PQTpSdSy1+p7QY zq2d0UxcIpTsqIfzsQ+hJ9BHpZmLYie2dCXMtLfudrC8Tw+7Pv+6ntOYq8eUr4TbCg+f VWSaHbsNdjo2zA9g+u8cZYfgWgkAEUwfw7nF5Wa5gM+03/Z4NBuaIGiLwuKrokP4CGIi sph4qKxghQNexZYOEJo8Md6Gf2xMQxnDD4kehlI1EPVGQ/npgnP2jUHHNo2HVsvUQAAs sUeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=5QLW3U7joQ2UZCxNEgCt6RYT6AdS0IjjACBFW+CPSrc=; b=q94ozgiq4sAWLTEkpa6ggu+H2z90sCoN86Pt70dEaBbCeaFD4ZwkWyFWnR4lay0KnW atW7QAXQOtgOXKkqVi+YUT0sZCCq1s8nguRtNUT07eCvmNVLXzLNMl6tSNKuK1uEQOEO rF4Pk+wmhmUntnCmBDy32+654XUym9QF3IW4RJvuNxiHZ8CEZENdWzj/qdU5cLjsYhfr PIYKuL6TGUqTLc/vAl1Q4iTM9eHmJeKaHosBjS7a/MllD3BTGYZKWNY7PloEY9+7O/0Q ggalw9MQkO4dafeVGI+nZtO1c1ehgHk/3kPJ/Bp6jU/WCeeXxq+Nytkv9NECrqhhIc+F lySw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com. [192.94.38.131]) by gmr-mx.google.com with ESMTPS id a195-v6si1437878qkb.1.2018.11.01.03.13.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 03:13:49 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) client-ip=192.94.38.131; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-02.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1gI9z2-000241-Eg from Cedric_Hombourger@mentor.com for isar-users@googlegroups.com; Thu, 01 Nov 2018 03:13:48 -0700 Received: from localhost.localdomain (137.202.0.90) by svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Thu, 1 Nov 2018 10:13:44 +0000 From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH v3 2/2] isar-image: refactor do_rootfs() Date: Thu, 1 Nov 2018 11:13:02 +0100 Message-ID: <20181101101302.8674-2-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181101101302.8674-1-Cedric_Hombourger@mentor.com> References: <57847f7a-9b85-65ef-b11e-8952bf532e0f@siemens.com> <20181101101302.8674-1-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: LVQKGY8EL/C4 Split the do_rootfs() shell function into four (smaller) shell functions to generate the fstab file (isar_image_gen_fstab), populate the root file-system (isar_image_gen_rootfs), configure it (isar_image_conf_rootfs) and perform some house-keeping (isar_image_cleanup). do_rootfs is now a python function and sequentially calls the helper functions listed above. Signed-off-by: Cedric Hombourger --- meta/classes/isar-image.bbclass | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass index ec2b9e3..e0508be 100644 --- a/meta/classes/isar-image.bbclass +++ b/meta/classes/isar-image.bbclass @@ -21,7 +21,7 @@ ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" do_rootfs[root_cleandirs] = "${IMAGE_ROOTFS} \ ${IMAGE_ROOTFS}/isar-apt" -do_rootfs() { +isar_image_gen_fstab() { cat > ${WORKDIR}/fstab << EOF # Begin /etc/fstab /dev/root / auto defaults 0 0 @@ -33,11 +33,15 @@ devtmpfs /dev devtmpfs mode=0755,nosuid 0 0 # End /etc/fstab EOF +} +isar_image_gen_rootfs() { setup_root_file_system --clean --keep-apt-cache \ --fstab "${WORKDIR}/fstab" \ "${IMAGE_ROOTFS}" ${IMAGE_PREINSTALL} ${IMAGE_INSTALL} +} +isar_image_conf_rootfs() { # Configure root filesystem if [ -n "${DISTRO_CONFIG_SCRIPT}" ]; then sudo install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}" @@ -45,7 +49,9 @@ EOF "${BAUDRATE_TTY}" sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" fi +} +isar_image_cleanup() { # Cleanup sudo rm "${IMAGE_ROOTFS}/etc/apt/sources.list.d/isar-apt.list" test ! -e "${IMAGE_ROOTFS}/usr/share/doc/qemu-user-static" && \ @@ -57,3 +63,10 @@ EOF sudo umount -l ${IMAGE_ROOTFS}/proc sudo rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf" } + +python do_rootfs() { + bb.build.exec_func("isar_image_gen_fstab", d) + bb.build.exec_func("isar_image_gen_rootfs", d) + bb.build.exec_func("isar_image_conf_rootfs", d) + bb.build.exec_func("isar_image_cleanup", d) +} -- 2.11.0