From patchwork Fri Jan 31 16:59:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1232046 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.a=rsa-sha256 header.s=default header.b=Ydt/7WAL; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 488Nk86z3vz9sPJ for ; Sat, 1 Feb 2020 03:59:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 01597844E7; Fri, 31 Jan 2020 16:59:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cuudvZvREP02; Fri, 31 Jan 2020 16:59:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C871A844D5; Fri, 31 Jan 2020 16:59:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id AC4851BF284 for ; Fri, 31 Jan 2020 16:59:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A092122851 for ; Fri, 31 Jan 2020 16:59:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ceBEVY-MJwhb for ; Fri, 31 Jan 2020 16:59:39 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from koncepto.io (koncepto.io [195.154.119.111]) by silver.osuosl.org (Postfix) with ESMTPS id 0DAB420403 for ; Fri, 31 Jan 2020 16:59:38 +0000 (UTC) Received: from menoah.home (lfbn-bor-1-1001-35.w90-120.abo.wanadoo.fr [90.120.192.35]) by koncepto.io (Postfix) with ESMTPSA id 4E77360372; Fri, 31 Jan 2020 17:59:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1580489973; bh=LbrUxNyfMa/WvONIiSQR/OdBu/GqhY305w1sY34Rzj0=; h=From:To:Cc:Subject:Date:From; b=Ydt/7WALQEdScxJWZ+2/7Q2TTLK3G76vw4Dc9+BJT3YDQsnS18ZIe4y+/Bc28SoX9 PWvYmKIgNoj2yaQVpV4dc2nLbNsJNTZK95fHwvJRfZwvyFLlA6ekA9txVw0x6KWxij I3WNTbVpebkETe6ReQBrnzB2Nw9oUwOoaWcYgvh7vnZKT3jpJr2/O5/fommoSrFt9k Olg1P99qkcXdMVBvfM0xlk3Om5uEakbcEUixDYBbD8aRC2fpPkz4zyDDwBcCpeWesT SkuA0rJVkUmxThnSVyXKS1QcAmWIOjc+YPoytFpJdi5Z1UqRyg1rVFvMdeE/Iat7fo I0wsgSZ128N9g== From: Pierre-Jean Texier To: buildroot@buildroot.org Date: Fri, 31 Jan 2020 17:59:31 +0100 Message-Id: <1580489971-27640-1-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH 1/1] package/genimage: bump to version 12 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre-Jean Texier MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also drop upstreamed patch Signed-off-by: Pierre-Jean Texier --- ...-vfat-Add-label-option-to-set-volume-name.patch | 69 ---------------------- package/genimage/genimage.hash | 2 +- package/genimage/genimage.mk | 2 +- 3 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 package/genimage/0001-image-vfat-Add-label-option-to-set-volume-name.patch diff --git a/package/genimage/0001-image-vfat-Add-label-option-to-set-volume-name.patch b/package/genimage/0001-image-vfat-Add-label-option-to-set-volume-name.patch deleted file mode 100644 index a77b826..0000000 --- a/package/genimage/0001-image-vfat-Add-label-option-to-set-volume-name.patch +++ /dev/null @@ -1,69 +0,0 @@ -From c1a165731298b96175b9b0dd80ad088dc8b33dc1 Mon Sep 17 00:00:00 2001 -From: Florent Viard -Date: Sun, 27 Oct 2019 23:48:16 +0100 -Subject: [PATCH] image-vfat: Add label option to set volume name. - -Signed-off-by: Florent Viard -[dariobin@libero.it: remove README.rst changes] -Signed-off-by: Dario Binacchi ---- - image-vfat.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/image-vfat.c b/image-vfat.c -index f16242c..3ea7288 100644 ---- a/image-vfat.c -+++ b/image-vfat.c -@@ -27,14 +27,20 @@ static int vfat_generate(struct image *image) - int ret; - struct partition *part; - char *extraargs = cfg_getstr(image->imagesec, "extraargs"); -+ char *label = cfg_getstr(image->imagesec, "label"); -+ -+ if (label && label[0] != '\0') -+ xasprintf(&label, "-n '%s'", label); -+ else -+ label = ""; - - ret = systemp(image, "%s if=/dev/zero of=\"%s\" seek=%lld count=0 bs=1 2>/dev/null", - get_opt("dd"), imageoutfile(image), image->size); - if (ret) - return ret; - -- ret = systemp(image, "%s %s '%s'", get_opt("mkdosfs"), -- extraargs, imageoutfile(image)); -+ ret = systemp(image, "%s %s %s '%s'", get_opt("mkdosfs"), -+ extraargs, label, imageoutfile(image)); - if (ret) - return ret; - -@@ -72,11 +78,18 @@ static int vfat_generate(struct image *image) - - static int vfat_setup(struct image *image, cfg_t *cfg) - { -+ char *label = cfg_getstr(image->imagesec, "label"); -+ - if (!image->size) { - image_error(image, "no size given or must not be zero\n"); - return -EINVAL; - } - -+ if (label && strlen(label) > 11) { -+ image_error(image, "vfat volume name cannot be longer than 11 characters\n"); -+ return -EINVAL; -+ } -+ - return 0; - } - -@@ -112,6 +125,7 @@ static cfg_opt_t file_opts[] = { - - static cfg_opt_t vfat_opts[] = { - CFG_STR("extraargs", "", CFGF_NONE), -+ CFG_STR("label", "", CFGF_NONE), - CFG_STR_LIST("files", 0, CFGF_NONE), - CFG_SEC("file", file_opts, CFGF_MULTI | CFGF_TITLE), - CFG_END() --- -2.24.0 - diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index c1f2270..fb5d235 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2ee024bfb2ec157651b86f3365d138ee013dcc48277d86e1eed6f3285a67b532 genimage-11.tar.xz +sha256 2e9b43d1288f4e216d6c79de2a0c53ce1bd41f93cec750d8ab057aa2d0b0ee4a genimage-12.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 5ef7d30..8960393 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 11 +GENIMAGE_VERSION = 12 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse