From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6659325660443443200 X-Received: by 2002:a7b:c349:: with SMTP id l9mr1578442wmj.18.1550495080612; Mon, 18 Feb 2019 05:04:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:6503:: with SMTP id z3ls1706256wmb.2.canary-gmail; Mon, 18 Feb 2019 05:04:40 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ3frTOtsNVmYyoaWMEhyR0jzU2CGMYlKwrS3hniTfNF6rOaJlpq81KpJ9CnwWl+I6cvqLn X-Received: by 2002:a1c:c00d:: with SMTP id q13mr1003518wmf.5.1550495080221; Mon, 18 Feb 2019 05:04:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550495080; cv=none; d=google.com; s=arc-20160816; b=q8epE9SJ1pdUpDq5mvJpY+P2Z2TFWA6QeFtP2o+dsSo+pdddWieF1rEvoeMS1FVIXv XIKCw/sbludil9z+w3QIgJdjoIbmsDvEfflSe6G+zoKMSISES/2pjBC0GU2U47cOuei8 cfqVAvQyeKzRl3zf/PkfHotNAzofnyUYBPJVMQy4wCVVyA8cB5xj3Y3TaQTpCp4yhA1R amoDcgHoScmNQ9VgRZNBbb6kE3890Tv9z3BCgs7R9YCMNxgG3yHqElip3W1W4F06VYvP 4ea/81NvrmH6xdEpQAnsggLJ5WFfZHEXfwWdZsVNyzQ3iRyt68l3poQrB9yQuIAAezIa bTDg== 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:date:subject:cc:to:from; bh=PBEofJ0WHBcAfo5YBowlrGrDJ8KDHYHko2n0GwTT7yo=; b=qVQ08wwggbsnILQt8enOk1T4YZJuOqMa78vQjcksYO6N1Nw9LFpd4CbhoRxjbupSEE VjqaEKJT4EVkvMOkrwt12/KyH0w1DxuuIme4sjyOleFA30qw9ltrIM/bSs6RuzruJg1c yqhFFXZxZl/ONZ+fwroO1iq9KHoKV+ND/d+0yff9wWrj26ko++LQCzVMQ1aPSU2bQinw s0vcow4FlD6hifwFoyqzks1Cr3j0nDi+U21OTTOoB13b12UeMxpmjTtcWUbEFYZfCDqg 96wpnGLgDJp5oRk+ShrJg/sBPoEYRlYxaGOYm5oqDl8hO52gg/cwKZ0N7HE+prrhGzki PpZQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id t25si630151wmh.2.2019.02.18.05.04.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 05:04:40 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x1ID4cbk018885 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 Feb 2019 14:04:39 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x1ID4bqu004439; Mon, 18 Feb 2019 14:04:37 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 1/1] meta/ext4-img: refactor to fit current image creation methods Date: Mon, 18 Feb 2019 14:04:29 +0100 Message-Id: <20190218130429.9881-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218130429.9881-1-claudius.heine.ext@siemens.com> References: <20190218130429.9881-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: JIInrgx1SpcJ From: Claudius Heine EXT4_IMAGE_FILE does no longer contain the full path to the ext4 image in the deploy directory. Signed-off-by: Claudius Heine --- meta-isar/classes/rpi-sdimg.bbclass | 2 +- meta/classes/ext4-img.bbclass | 31 +++++++++++------------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index 91b09cd..4e5d170 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -15,7 +15,7 @@ BOOT_SPACE ?= "40960" IMAGE_ROOTFS_ALIGNMENT = "4096" SDIMG = "${DEPLOY_DIR_IMAGE}/${PN}.rpi-sdimg" -SDIMG_ROOTFS = "${EXT4_IMAGE_FILE}" +SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}" do_rpi_sdimg () { # Align partitions diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 29e5f77..2620de9 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -1,30 +1,23 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ext4.img" +EXT4_IMAGE_FILE = "${IMAGE_FULLNAME}.ext4.img" + +IMAGER_INSTALL += "e2fsprogs" do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" # Generate ext4 filesystem image do_ext4_image() { - rm -f ${EXT4_IMAGE_FILE} - - dd if=/dev/zero of=${EXT4_IMAGE_FILE} bs=1k count=${ROOTFS_SIZE} - - sudo mkfs.ext4 -F ${EXT4_IMAGE_FILE} - - mkdir -p ${WORKDIR}/mnt - sudo mount -o loop ${EXT4_IMAGE_FILE} ${WORKDIR}/mnt - _do_ext4_image_cleanup() { - ret=$? - sudo umount ${WORKDIR}/mnt 2>/dev/null || true - sudo rmdir ${WORKDIR}/mnt 2>/dev/null || true - (exit $ret) || bb_exit_handler - } - trap '_do_ext4_image_cleanup' EXIT - sudo cp -r ${IMAGE_ROOTFS}/* ${WORKDIR}/mnt - _do_ext4_image_cleanup + rm -f '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}' + + truncate -s ${ROOTFS_SIZE}K '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}' + + image_do_mounts + + sudo chroot ${BUILDCHROOT_DIR} /sbin/mke2fs ${MKE2FS_ARGS} \ + -F -d '${PP_ROOTFS}' '${PP_DEPLOY}/${EXT4_IMAGE_FILE}' } -addtask ext4_image before do_build after do_copy_boot_files +addtask ext4_image before do_build after do_copy_boot_files do_install_imager_deps do_ext4_image[prefuncs] = 'set_image_size' -- 2.20.1