From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.223.160.75 with SMTP id l11mr148104wrl.28.1504871268282; Fri, 08 Sep 2017 04:47:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.9.79 with SMTP id 76ls315156wmj.13.canary-gmail; Fri, 08 Sep 2017 04:47:47 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBlYSYB26QCsoVq/sVvjeZdWg8xx76K3hbepx4KuSirETW+37tD/NO0WTkH4bVraQG9cMjQ X-Received: by 10.28.23.200 with SMTP id 191mr182541wmx.25.1504871267754; Fri, 08 Sep 2017 04:47:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504871267; cv=none; d=google.com; s=arc-20160816; b=06yW/FIWD6buJ0GQk5MBhQFjlPniUqPL+8x55luh6oYIkoxOp5krzsAiYx1QfdgYEt 68XO6PrnYS6oWCTQwKDyLWyEYcFBCWKVg8CC+YYnV0Z74/mUCGdESIeI9Gud4ytGd10q fVFar1MPsMTocHGofuT7T5FHN0xsD6xTkDTZSlRPs6AXhHJxNfEDH97nvahPFtQwftCf AyZzWl6ZHytxPcQvqEPNgfrIDXj1pTmo2mymuhAuSVzcvLpT+ItzT57ao0sxXA/euM0W Tsu5z+6Qry6xD35jhotTflZPKMy6ogvoLanfhhdCXQnH1gbGfnih+Q47JDOmVacQggbK ZdEQ== 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:arc-authentication-results; bh=5vH7rLSK6pfkm/As95Lu5c6jeLkldEMdD+9mSRUfu80=; b=iPmpzQb5mQUL1BCeZlhfwZtWt5Z14UGQeF1eLHq9RT4nWixE6YJbkJeRxmwBf8h0qc zokq8l4M9al0B0rkIU2JeVc1zgIo11WA6527Wircjw5HK/G8yFauCOo5Ek2uR8daNoQW KfawLwJ9nyWcXpEZu7RRJ1lcLQ2lpmzrlJP24PsQdpRj5Lf3ilfUrU0e+kXZeSn6e3lq dvXoRBiK0IZYGV7pGGi1fIgEyVGolPedTEzdy8gCi9CG3cJNDmLZxklpD6XDsbqIVGHa XGWl7pt/L12xU+G6ApFDPq9aigNY8q/kM2oRVvJGOEbQvwhwjhicE11MHc/850tVvnjg pg2A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id v23si77757wmv.0.2017.09.08.04.47.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 04:47:47 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v88Bll6f021098 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 8 Sep 2017 13:47:47 +0200 Received: from md1em3qc ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v88BllaY017388; Fri, 8 Sep 2017 13:47:47 +0200 Date: Fri, 8 Sep 2017 13:47:56 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH 1/2] isar: Change build folders tree Message-ID: <20170908134756.4fec08c6@md1em3qc> In-Reply-To: <20170908094834.26496-2-asmirnov@ilbers.de> References: <20170908094834.26496-1-asmirnov@ilbers.de> <20170908094834.26496-2-asmirnov@ilbers.de> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: zE6r7TpRSrOm This one seems pretty big and is doing multiple things at a time. I suggest to split it into smaller units. As far as i can tell it is doing at least 3 things at a time. - rename S to IMAGE_ROOTFS - change multiconf stamps from "${MACHINE}-${DISTRO}" to "${DISTRO}-${MACHINE}" - change folder structure "work/${PN}/${MACHINE}/${DISTRO}" to "work/${DISTRO}-${DISTRO_ARCH}/${PF}" More inline. Am Fri, 8 Sep 2017 12:48:33 +0300 schrieb Alexander Smirnov : > Differentiate folders tree, that are generated during build on > the highest possible level. So the overal tree now looks like the > following: > > tmp/${DISTRO}-${DISTRO_ARCH}/${PF} > > This approach eliminates lots of subfolders to diffirentiate > buildchroot and image for multiconfig builds. Now each configuration > has private tree. > > Signed-off-by: Alexander Smirnov > --- > meta-isar/classes/rpi-sdimg.bbclass | 2 +- > meta-isar/recipes-core/images/isar-image-base.bb | 19 > ++++++++----------- meta/classes/ext4-img.bbclass > | 10 +++++----- meta/classes/image.bbclass | 12 > +++++++----- meta/conf/isar-bitbake.conf | 3 ++- > meta/recipes-devtools/buildchroot/buildchroot.bb | 9 ++++----- > 6 files changed, 27 insertions(+), 28 deletions(-) > > diff --git a/meta-isar/classes/rpi-sdimg.bbclass > b/meta-isar/classes/rpi-sdimg.bbclass index 2614c41..91b09cd 100644 > --- a/meta-isar/classes/rpi-sdimg.bbclass > +++ b/meta-isar/classes/rpi-sdimg.bbclass > @@ -47,7 +47,7 @@ do_rpi_sdimg () { > BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ > 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') rm -f > ${WORKDIR}/boot.img mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C > ${WORKDIR}/boot.img $BOOT_BLOCKS > - mcopy -i ${WORKDIR}/boot.img -s ${S}/boot/* ::/ > + mcopy -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}/boot/* ::/ This could be one patch that replaces S with IMAGE_ROOTFS. > > # Burn Partitions > dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 > bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync diff > --git a/meta-isar/recipes-core/images/isar-image-base.bb > b/meta-isar/recipes-core/images/isar-image-base.bb index > b679d97..178ac05 100644 --- > a/meta-isar/recipes-core/images/isar-image-base.bb +++ > b/meta-isar/recipes-core/images/isar-image-base.bb @@ -9,6 +9,7 @@ > LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = > "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > PV = "1.0" +PF = "${PN}" > > inherit image > > @@ -17,11 +18,7 @@ DEPENDS += "${IMAGE_INSTALL}" > IMAGE_PREINSTALL += "apt \ > dbus" > > -WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}/${DISTRO}" > -S = "${WORKDIR}/rootfs" > -IMAGE_ROOTFS = "${S}" Part of the S -> IMAGE_ROOTFS > - > -do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" > +do_rootfs[stamp-extra-info] = "${DISTRO}-${MACHINE}" This is also a change that should be in a seperate smaller patch. > do_rootfs() { > install -d -m 755 ${WORKDIR}/hooks_multistrap > @@ -38,20 +35,20 @@ do_rootfs() { > sed -i 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|' > ${WORKDIR}/multistrap.conf sed -i > 's|##DISTRO_SUITE##|${DISTRO_SUITE}|' ${WORKDIR}/multistrap.conf sed > -i 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##CONFIG_SCRIPT##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/configscript.sh|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##SETUP_SCRIPT##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/setup.sh|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##DIR_HOOKS##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##CONFIG_SCRIPT##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/configscript.sh|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##SETUP_SCRIPT##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/setup.sh|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##DIR_HOOKS##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf # Multistrap config use relative paths, so > ensure that we are in the right folder cd ${TOPDIR} > > # Create root filesystem > - sudo multistrap -a ${DISTRO_ARCH} -d "${S}" -f > "${WORKDIR}/multistrap.conf" || true > + sudo multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f > "${WORKDIR}/multistrap.conf" || true > # Configure root filesystem > - sudo chroot ${S} /configscript.sh ${MACHINE_SERIAL} > ${BAUDRATE_TTY} \ > + sudo chroot ${IMAGE_ROOTFS} /configscript.sh ${MACHINE_SERIAL} > ${BAUDRATE_TTY} \ ${ROOTFS_DEV} > - sudo rm ${S}/configscript.sh > + sudo rm ${IMAGE_ROOTFS}/configscript.sh > } > > addtask rootfs before do_populate > diff --git a/meta/classes/ext4-img.bbclass > b/meta/classes/ext4-img.bbclass index 8588626..9af781f 100644 > --- a/meta/classes/ext4-img.bbclass > +++ b/meta/classes/ext4-img.bbclass > @@ -6,7 +6,7 @@ ROOTFS_EXTRA ?= "64" > > EXT4_IMAGE_FILE = > "${DEPLOY_DIR_IMAGE}/${PN}-${MACHINE}-${DISTRO}.ext4.img" > -do_ext4_image[stamp-extra-info] = "${MACHINE}-${DISTRO}" > +do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" > > # Generate ext4 filesystem image > do_ext4_image() { > @@ -14,23 +14,23 @@ do_ext4_image() { > > rm -f ${EXT4_IMAGE_FILE} > > - ROOTFS_SIZE=`sudo du -sm ${S} | awk '{print $1 + > ${ROOTFS_EXTRA};}'` > + ROOTFS_SIZE=`sudo du -sm ${IMAGE_ROOTFS} | awk '{print $1 + > ${ROOTFS_EXTRA};}'` dd if=/dev/zero of=${EXT4_IMAGE_FILE} bs=1M > count=${ROOTFS_SIZE} > > sudo mkfs.ext4 -F ${EXT4_IMAGE_FILE} > > mkdir -p ${WORKDIR}/mnt > sudo mount -o loop ${EXT4_IMAGE_FILE} ${WORKDIR}/mnt > - sudo cp -r ${S}/* ${WORKDIR}/mnt > + sudo cp -r ${IMAGE_ROOTFS}/* ${WORKDIR}/mnt > sudo umount ${WORKDIR}/mnt > rm -r ${WORKDIR}/mnt > > if [ -n "${KERNEL_IMAGE}" ]; then > - cp ${S}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE} > + cp ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE} > fi > > if [ -n "${INITRD_IMAGE}" ]; then > - cp ${S}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE} > + cp ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE} > fi > } > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index a7f0d74..fe06352 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -9,20 +9,22 @@ IMAGE_TYPE ?= "ext4-img" > > inherit ${IMAGE_TYPE} > > -do_populate[stamp-extra-info] = "${MACHINE}-${DISTRO}" > +IMAGE_ROOTFS = "${WORKDIR}/rootfs" > + > +do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}" > > # Install Debian packages, that were built from sources > do_populate() { > if [ -n "${IMAGE_INSTALL}" ]; then > - sudo mkdir -p ${S}/deb > + sudo mkdir -p ${IMAGE_ROOTFS}/deb > > for p in ${IMAGE_INSTALL}; do > - sudo cp ${DEPLOY_DIR_DEB}/${p}_*.deb ${S}/deb > + sudo cp ${DEPLOY_DIR_DEB}/${p}_*.deb ${IMAGE_ROOTFS}/deb > done > > - sudo chroot ${S} /usr/bin/dpkg -i -R /deb > + sudo chroot ${IMAGE_ROOTFS} /usr/bin/dpkg -i -R /deb > > - sudo rm -rf ${S}/deb > + sudo rm -rf ${IMAGE_ROOTFS}/deb > fi > } > > diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf > index f85f5cc..5a26743 100644 > --- a/meta/conf/isar-bitbake.conf > +++ b/meta/conf/isar-bitbake.conf > @@ -18,9 +18,10 @@ > # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE > OR # OTHER DEALINGS IN THE SOFTWARE. > > +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}" > DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}" > SSTATE_DIR ?= "${TMPDIR}/sstate-cache" > -BUILDCHROOT_DIR = > "${TOPDIR}/tmp/work/buildchroot/${DISTRO}-${DISTRO_ARCH}/rootfs" > +BUILDCHROOT_DIR = > "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot/rootfs" # Setup > our default hash policy BB_SIGNATURE_HANDLER ?= "noop" > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb > b/meta/recipes-devtools/buildchroot/buildchroot.bb index > ccba683..155bd3f 100644 --- > a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ > b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -9,6 +9,7 @@ > LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = > "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > PV = "1.0" > +PF = "${PN}" I think this is to remove the package version from WORKDIR, i suggest to do WORKDIR= instead of overwriting such an essential variable. Writing to PF will i.e. also affect FILESPATH and STAMP. This line deserves a comment! > > BUILDCHROOT_PREINSTALL ?= "gcc \ > make \ > @@ -21,8 +22,6 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ > apt \ > automake" > > -WORKDIR = "${TMPDIR}/work/${PF}/${DISTRO}" > - > do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > > do_build() { > @@ -40,9 +39,9 @@ do_build() { > sed -i 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|' > ${WORKDIR}/multistrap.conf sed -i > 's|##DISTRO_SUITE##|${DISTRO_SUITE}|' ${WORKDIR}/multistrap.conf sed > -i 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##CONFIG_SCRIPT##|./tmp/work/${PF}/${DISTRO}/configscript.sh|' > ${WORKDIR}/multistrap.conf > - sed -i 's|##SETUP_SCRIPT##|./tmp/work/${PF}/${DISTRO}/setup.sh|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##DIR_HOOKS##|./tmp/work/${PF}/${DISTRO}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##CONFIG_SCRIPT##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/configscript.sh|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##SETUP_SCRIPT##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/setup.sh|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##DIR_HOOKS##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf The pattern tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/ shows up all the time, can that be derived from $WORKDIR instead of writing it down again and again? Henning > # Multistrap config use relative paths, so > ensure that we are in the right folder cd ${TOPDIR}