From patchwork Thu Jun 13 05:51:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Sangorrin X-Patchwork-Id: 10991129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A17018A6 for ; Thu, 13 Jun 2019 05:51:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC21828B02 for ; Thu, 13 Jun 2019 05:51:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CADFA28AA2; Thu, 13 Jun 2019 05:51:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 48A3A28AA2 for ; Thu, 13 Jun 2019 05:51:46 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id F093DAD7; Thu, 13 Jun 2019 05:51:45 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id C341FAD7 for ; Thu, 13 Jun 2019 05:51:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mo-csw.securemx.jp (mo-csw1515.securemx.jp [210.130.202.154]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 12C1263D for ; Thu, 13 Jun 2019 05:51:43 +0000 (UTC) Received: by mo-csw.securemx.jp (mx-mo-csw1515) id x5D5pgsD032571; Thu, 13 Jun 2019 14:51:42 +0900 X-Iguazu-Qid: 34trPHnJuoesOICgXa X-Iguazu-QSIG: v=2; s=0; t=1560405101; q=34trPHnJuoesOICgXa; m=EfAZvMns56bvwHX5YZVII4l1tZvNUyq83JBmRoO68tI= Received: from imx12.toshiba.co.jp (imx12.toshiba.co.jp [61.202.160.132]) by relay.securemx.jp (mx-mr1511) id x5D5pfjh006924; Thu, 13 Jun 2019 14:51:41 +0900 Received: from enc02.toshiba.co.jp ([61.202.160.51]) by imx12.toshiba.co.jp with ESMTP id x5D5peff021297; Thu, 13 Jun 2019 14:51:41 +0900 (JST) Received: from hop101.toshiba.co.jp ([133.199.85.107]) by enc02.toshiba.co.jp with ESMTP id x5D5pdXK021314; Thu, 13 Jun 2019 14:51:39 +0900 From: Daniel Sangorrin To: jan.kiszka@siemens.com Date: Thu, 13 Jun 2019 14:51:38 +0900 X-TSB-HOP: ON Message-Id: <20190613055138.6769-1-daniel.sangorrin@toshiba.co.jp> X-Mailer: git-send-email 2.17.1 Cc: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][next] bmap: apply bmap patch to isar until we upgrade X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org X-Virus-Scanned: ClamAV using ClamSMTP A similar bmap patch has been sent to ISAR upstream, but while it gets accepted and until we update the ISAR version, we can use this backport. Signed-off-by: Daniel Sangorrin --- 0001-bmap-generate-bmap-for-wic-images.patch | 57 ++++++++++++++++++++ kas.yml | 4 ++ 2 files changed, 61 insertions(+) create mode 100644 0001-bmap-generate-bmap-for-wic-images.patch diff --git a/0001-bmap-generate-bmap-for-wic-images.patch b/0001-bmap-generate-bmap-for-wic-images.patch new file mode 100644 index 0000000..63ebe54 --- /dev/null +++ b/0001-bmap-generate-bmap-for-wic-images.patch @@ -0,0 +1,57 @@ +From 4bf7d60b4fb64ed0a7a131431cc6a2573e7178a4 Mon Sep 17 00:00:00 2001 +From: Daniel Sangorrin +Date: Thu, 13 Jun 2019 13:51:28 +0900 +Subject: [PATCH] bmap: generate bmap for wic images + +bmap shortens the time required to flash an image. +This can be useful when you need a fixed-size image, for +example to update partitions with swupdate. + +Example usage: +sudo bmaptool copy --bmap \ +build/tmp/deploy/images/iwg20m/cip-core-image-cip-core-iwg20m.wic.img.bmap \ +build/tmp/deploy/images/iwg20m/cip-core-image-cip-core-iwg20m.wic.img \ +/dev/sdf + +Signed-off-by: Daniel Sangorrin +--- + meta/classes/wic-img.bbclass | 5 ++++- + meta/conf/distro/debian-common.conf | 4 ++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass +index 09d9f2e..f227655 100644 +--- a/meta/classes/wic-img.bbclass ++++ b/meta/classes/wic-img.bbclass +@@ -151,9 +151,12 @@ EOSUDO + ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \ + --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ + -o /tmp/${IMAGE_FULLNAME}.wic/ \ ++ --bmap \ + -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS} + sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true +- cp -f $(ls -t -1 ${BUILDCHROOT_DIR}/tmp/${IMAGE_FULLNAME}.wic/*.direct | head -1) ${WIC_IMAGE_FILE} ++ WIC_DIRECT=$(ls -t -1 ${BUILDCHROOT_DIR}/tmp/${IMAGE_FULLNAME}.wic/*.direct | head -1) ++ cp -f ${WIC_DIRECT} ${WIC_IMAGE_FILE} ++ cp -f ${WIC_DIRECT}.bmap ${WIC_IMAGE_FILE}.bmap + } + + do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}" +diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf +index 5a47483..c1e5d6b 100644 +--- a/meta/conf/distro/debian-common.conf ++++ b/meta/conf/distro/debian-common.conf +@@ -10,8 +10,8 @@ WIC_IMAGER_INSTALL = "parted \ + util-linux \ + dosfstools \ + mtools \ +- e2fsprogs \ +- python3" ++ python3 \ ++ bmap-tools" + + GRUB_BOOTLOADER_INSTALL_amd64 = "grub-efi-amd64-bin" + GRUB_BOOTLOADER_INSTALL_i386 = "grub-efi-ia32-bin" +-- +2.17.1 + diff --git a/kas.yml b/kas.yml index 21a776e..c726079 100644 --- a/kas.yml +++ b/kas.yml @@ -20,6 +20,10 @@ repos: isar: url: https://github.com/ilbers/isar refspec: 596732aa99c361b756655434bc90e0108e1caa33 + patches: + bmap: + repo: cip-core + path: 0001-bmap-generate-bmap-for-wic-images.patch layers: meta: