From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.25.219.206 with SMTP id t75mr276126lfi.7.1504886419730; Fri, 08 Sep 2017 09:00:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.79.23 with SMTP id d23ls39958lfb.36.gmail; Fri, 08 Sep 2017 09:00:19 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCIm/fZVnou60kuwnH1FAsNvR6Bt5d48fsOPIy80JOuBBUB4Z5Sw7BDQWn+5jo4f5E4qP0n X-Received: by 10.25.79.69 with SMTP id a5mr281297lfk.34.1504886419439; Fri, 08 Sep 2017 09:00:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504886419; cv=none; d=google.com; s=arc-20160816; b=wnHLnVabB3AQMNN6niXEhKuIGK/v0pwh1DbLMfRFOv4YPLPuy9bBC6WUCKvQkEUfCP 8nCNfnU6L7ZQ9RFOLW+Czv84UDNKMsKm3CStRAbgPPKOsjB+TeGIcc/ZLiqrhmklppS0 prNdSTHAoi7K312edP8FnCnNCwnMp3KPWV5koYjEWR0SsvSUNO/rBNttYOxbDhH8np6G 6I4qNfHd01o6tGbuqao2h9c4CvjlHHnId2xTYhVlVIyyINYNEmjs+zW14ECqgfrPmLDe 5Xo+gFXNRKHq2WSKuPr7c+5y+fzRDFr4geamOpCCdoMik5YsQqkByNtAHxw/pG5qhvPr YBdA== 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=DmiQlY7xV4ZPpurHyuLvgMnHBukjlGl8f2iMBL79hZE=; b=mx71Zs4GsRBx6eSGNgWYkSfJylopQlGoijz/S/rQxdiEYJVI77al870fqpE/HWAxGc 0A/Vw7VtNVAMezZZXwfAKovf6VXOjorh7/pOhzILKI8uvd9wbhadRkY2zxJbMZ70os+o nVrOmtVRiqrp9Gf3NVI76D1MJMlUMWO2Aq3LdY3v4/hsZm5Xt26nR+Y+xM3qE//qk7Oz Q4aCK0BhUpldWscLbaKYPhpBbCj2TZcw0wFDFmKPkKug7XWF+9N4J+6wTe1NygIUp2Mi mhASstD/ss9e5xcCzFg7g+xkMiwIyjqGAV1sZguClJQTl5hrdlouJgPI//QA6g8ATcg1 ZD5Q== 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 l133si146079wmb.3.2017.09.08.09.00.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 09:00:19 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v88G0Ie0015711 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 8 Sep 2017 18:00:19 +0200 Received: from md1em3qc ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v88G0IjD032481; Fri, 8 Sep 2017 18:00:18 +0200 Date: Fri, 8 Sep 2017 18:00:27 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH v2 1/5] image: Unify path to image rootfs Message-ID: <20170908180027.5c3c04e4@md1em3qc> In-Reply-To: <20170908155606.7654-2-asmirnov@ilbers.de> References: <20170908155606.7654-1-asmirnov@ilbers.de> <20170908155606.7654-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: P3tOQswPJz4N Am Fri, 8 Sep 2017 18:56:02 +0300 schrieb Alexander Smirnov : > Use dedicated variable to point to generated image rooot filesystem. root Henning > Signed-off-by: Alexander Smirnov > --- > meta-isar/classes/rpi-sdimg.bbclass | 2 +- > meta-isar/recipes-core/images/isar-image-base.bb | 8 +++----- > meta/classes/ext4-img.bbclass | 8 ++++---- > meta/classes/image.bbclass | 9 +++++---- > 4 files changed, 13 insertions(+), 14 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/* ::/ > > # 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..94cbc9e 100644 --- > a/meta-isar/recipes-core/images/isar-image-base.bb +++ > b/meta-isar/recipes-core/images/isar-image-base.bb @@ -18,8 +18,6 @@ > IMAGE_PREINSTALL += "apt \ dbus" > WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}/${DISTRO}" > -S = "${WORKDIR}/rootfs" > -IMAGE_ROOTFS = "${S}" > > do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" > > @@ -46,12 +44,12 @@ do_rootfs() { > 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..f493037 100644 > --- a/meta/classes/ext4-img.bbclass > +++ b/meta/classes/ext4-img.bbclass > @@ -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..dff2705 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -6,6 +6,7 @@ INITRD_IMAGE ?= "" > > IMAGE_INSTALL ?= "" > IMAGE_TYPE ?= "ext4-img" > +IMAGE_ROOTFS = "${WORKDIR}/rootfs" > > inherit ${IMAGE_TYPE} > > @@ -14,15 +15,15 @@ do_populate[stamp-extra-info] = > "${MACHINE}-${DISTRO}" # 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 > } >