From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6617812835611181056 X-Received: by 2002:a25:9b85:: with SMTP id v5-v6mr4691495ybo.90.1540829633372; Mon, 29 Oct 2018 09:13:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:4407:: with SMTP id r7-v6ls1194952yba.20.gmail; Mon, 29 Oct 2018 09:13:53 -0700 (PDT) X-Google-Smtp-Source: AJdET5ckYqxSvoTHSsoRDmNFKMVwPihOqDbs57KPICuadqDOQd6uvp3Cq9UaPudt75vLdyU+glJB X-Received: by 2002:a25:2708:: with SMTP id n8-v6mr8719820ybn.96.1540829633096; Mon, 29 Oct 2018 09:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540829633; cv=none; d=google.com; s=arc-20160816; b=HRHlOeGgW+IMuplff300p74TiSAsUEeLI6UWNUDNOGIk5IV9H8rXpTPFn6DorPh2Yf 8DhfksnOO0fLEmIm3oGwEiwGm4+zw3UEHMxwieOV0CDI/u/VV/8hcUzm6sloXdnQ15sA yri14zjourTh6rtoOnTrFmyRcgZv6y5c8qfbO1cBmFYDAoT+wTqbypniBSHKlFLGM9Mr 4M3xVreQHTkxdgF/UA/i60Tps1qB0hJOG5pmFeB3aU0YW5uFFGv/izwNH3jT0OuFmqzm cmDxsc93kwNJXpbU0M1Ne+BjXabf7UTRcU46nnUQFXES5VQuvHsCYPooE+vTm5wDoF1R HQLQ== 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=91H71b/XvTacHwlwCX0ZuhU6l1kry2MWFMMa2ea/Ruc=; b=uiE64yyLsDXntaUBxOAhO2ENvCF6YTf+c1G3Q46afzM0YjmhJmPjiXhNZsFHoc5MF9 6S7Wus2E+NWEkNR5kq9xF0DBAhzwqlCZtlYs+RXFpr8IeNzKbRV4ojeNQeMCFZocZv5y 90p+EIkMAHZrkHYhBdDA8ZZXI7uYGYECMHHOkqu5PX2N6QPLIW0rZAfW1MycrzsxeE8q jMn/1Sq+/E77UmsJugPNWdCtvsQAoYYSyhu4bWs83QIwsmDUua7tgKqGaKoi+8sQOHGJ fXLoHfns+D9s08487OdHGn1eyDnNENTZF8w8mLwwtcykVtFLK4jUM7X/zylaEWUR95OZ 4vrA== 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 r2-v6si880666ybb.2.2018.10.29.09.13.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 09:13:52 -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 1gHAAq-0006QD-8n from Cedric_Hombourger@mentor.com for isar-users@googlegroups.com; Mon, 29 Oct 2018 09:13:52 -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; Mon, 29 Oct 2018 16:13:48 +0000 From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 2/4] isar-image: refactor do_rootfs() Date: Mon, 29 Oct 2018 17:13:01 +0100 Message-ID: <20181029161303.7410-3-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181029161303.7410-1-Cedric_Hombourger@mentor.com> References: <20181029161303.7410-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-04.mgc.mentorg.com (139.181.222.4) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: 7DVOxU5N1qN4 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-isar/classes/isar-image.bbclass | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta-isar/classes/isar-image.bbclass b/meta-isar/classes/isar-image.bbclass index ec2b9e3..e0508be 100644 --- a/meta-isar/classes/isar-image.bbclass +++ b/meta-isar/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