From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6617812835611181056 X-Received: by 2002:a2e:9119:: with SMTP id m25-v6mr174259ljg.22.1541616333495; Wed, 07 Nov 2018 10:45:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:519c:: with SMTP id g28ls430421lfl.17.gmail; Wed, 07 Nov 2018 10:45:33 -0800 (PST) X-Google-Smtp-Source: AJdET5dQDhj+E8rQRtlxVbgr+9V9G1BIQ40Ith8nezMzjDtoQVTCY3kUEeWsT6uSRcpC9Ust17ht X-Received: by 2002:ac2:4187:: with SMTP id z7-v6mr164233lfh.0.1541616332974; Wed, 07 Nov 2018 10:45:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541616332; cv=none; d=google.com; s=arc-20160816; b=lMuzSqLD3sFGCHro4mIr7zZQbC72GAeyTfPN/lH0AeJNVsUG8q/rEaukz6V5m7dwQX Jb1K/DJJgvh2Cq7gch13L3NYwytGbnQOezldef8BE/Hz4xnlxOPWAk8udbud6t61JPc2 VSuYFPx773DaHzdC62R2xZK0k1dH3GGxj2WRtqoK4AzOVt+10vzPx0QwUtqA+Hw4iaOS nm9N17OAe8KAUAN1yjbtxtrzf3EeXWkiKHFU/cecxsnVSsouhZQkQAiEllPEoE+bItXT NW7oPFzfRR0y7uL/tECgz+WAgqSa7l8eagO1qKeHLplNc0AWS6S/rsnCbLRybLBtcNNM HGOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=NQdm4ok/wnYhbh28QaeCuaB9bC+0WNue0oTflzo5fy0=; b=ZJFGY22cyXQ9/JLnbJA/oDk+FKLAXHyhYGNLW6vT/WhxfRcjlvZ2EyhVl2KHsEJsvE DoF3jamk0yztQL0H/dmNglTnmjw9XsgkU9ChD1JM+nsN0IN8RyC3b68FHo7UmeenCwBi fZ39MH91SelDFU9CApXkJujK8Pd+J9orKow+B0ETSVy9yqlhb24RoeGdxMc922YV3gvD BIL10r7699uuV8hHHzvhTI+6RQsfhgpxKQp3g47V31KXjsLZT9rqcs4rLapUfUeKD8re Ypm4iNWslL6xWLnHpXtY7gyK4vudr7MFxQpeajYbMF9961FDPIE1phRxKzCAyTJphm70 hDGw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id t5-v6si60538lje.3.2018.11.07.10.45.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 10:45:32 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id wA7IjWhQ012022 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 Nov 2018 19:45:32 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.189]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wA7IjVru023174; Wed, 7 Nov 2018 19:45:31 +0100 Date: Wed, 7 Nov 2018 19:45:31 +0100 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH v3 2/2] isar-image: refactor do_rootfs() Message-ID: <20181107194531.17356c59@md1za8fc.ad001.siemens.net> In-Reply-To: <20181101101302.8674-2-Cedric_Hombourger@mentor.com> References: <57847f7a-9b85-65ef-b11e-8952bf532e0f@siemens.com> <20181101101302.8674-1-Cedric_Hombourger@mentor.com> <20181101101302.8674-2-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: N6JuOncJ+qxX Am Thu, 1 Nov 2018 11:13:02 +0100 schrieb Cedric Hombourger : > 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) > +} I am loosing my proxies somewhere in current next ... i suspect this guy but did not confirm yet. Henning