From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.223.134.175 with SMTP id 44mr698480wrx.11.1505158080776; Mon, 11 Sep 2017 12:28:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.18.219 with SMTP id 88ls308449ljs.39.gmail; Mon, 11 Sep 2017 12:28:00 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDennkOpUp9qY2NqxjutQsviGTE8T5O9SE7Jnw+7QTIAba0XOBaSC0IlzJvuSt1ZjvPIfaz X-Received: by 10.46.23.137 with SMTP id 9mr894616ljx.39.1505158080456; Mon, 11 Sep 2017 12:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505158080; cv=none; d=google.com; s=arc-20160816; b=FgIQB36qSLuMg6HU00wlogI8BuOr9w4MFuWKygKoMHd9PPduYa54gOI1kxvPxCb1ZX LomdWanthAhJarqVCrhIHWVhL8V+ak/fJ+uAhTTHjDx9PGiXFT884usYqqMprUq0bkGs 9aZfeyot+VaKal+Iej8bxtcqGoY+G58y4M+7gWBWYxoBor4yqzb+uNUfY4AfVPBRqEY5 P9381/YvKKPKrFk8ANF88Y+za6rs3ePLn7doqy8o8pwNGDYzfRY6LqZMXyQyyhnHl/8a 6VaE1Nu1lxydU0pPVm+brKHvPfTU2KIDxtohrBxSkFUt90YMxoX2FqJ2OQSxKmZdKvQ1 8EKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gqxxoMeRX6b//lzSY48SP4ySRvFo81uAoIttXtPP4YQ=; b=PYro48Nrki/4jMmyWQO2R1ymCmwH++XiTrPZqVtrrHuK//9OEP87PDCCLZOBB3CDBP WSqHMv8SYPqrAEON5PjAzfKusoKqm9u9EX+nXdBG30c+tbNzkwTYMSV1ohh34ccEV+Ee XF7Q05e9ht2APRtk8ajSmvWCuMNnEp2SbbPYS6qXcfou5SeWIW6X1XfXOzWslNeBiP/z EiSCbv48sFz+XuwUmGK1RO9Czv8K6Qs7TJ0XAHzylaf1rHEfXWwX/ENXv23ImubzMTPa OQ4c7oA+fJO1IEpLIu5At4IHGsBRwsfkKO0OSO3ZK3zkkGrSyFxUAhI8FDcaKiD/dKoK 7pQQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id m74si121202wma.0.2017.09.11.12.28.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 12:28:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v8BJRjMN000908 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Sep 2017 21:27:51 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v3 1/5] image: Unify path to image rootfs Date: Mon, 11 Sep 2017 22:27:34 +0300 Message-Id: <20170911192738.1323-2-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170911192738.1323-1-asmirnov@ilbers.de> References: <20170911192738.1323-1-asmirnov@ilbers.de> X-TUID: P7nhWWPQysFT Use dedicated variable to point to generated image root filesystem. 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 } -- 2.1.4