From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35405) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJtQm-0003EC-LG for guix-patches@gnu.org; Mon, 14 Oct 2019 02:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJtQk-0005hR-7z for guix-patches@gnu.org; Mon, 14 Oct 2019 02:02:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJtQj-0005gZ-Q9 for guix-patches@gnu.org; Mon, 14 Oct 2019 02:02:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iJtQj-0006UV-Mh for guix-patches@gnu.org; Mon, 14 Oct 2019 02:02:05 -0400 Subject: [bug#37741] [PATCH 1/3] gnu: u-boot: Update to 2019.10. Resent-Message-ID: From: nomble@palism.com Date: Mon, 14 Oct 2019 02:01:05 -0400 Message-Id: <20191014060105.31091-1-nomble@palism.com> In-Reply-To: <20191014001407.28367-1-nomble@palism.com> References: <20191014001407.28367-1-nomble@palism.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 37741@debbugs.gnu.org Cc: Vagrant Cascadian , Danny Milosavljevic , Caliph Nomble From: Caliph Nomble * gnu/packages/bootloaders.scm (u-boot): Update to 2019.10. [source]: Remove upstreamed patches. * gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Caliph Nomble --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 7 +-- ...boot-fix-mkimage-header-verification.patch | 57 ------------------- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch diff --git a/gnu/local.mk b/gnu/local.mk index 39b8e009b2..428708c9fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1371,7 +1371,6 @@ dist_patch_DATA = \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/txr-shell.patch \ - %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ %D%/packages/patches/unzip-CVE-2014-8141.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 520728b52c..91f27d2e38 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -400,7 +400,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2019.04") + (version "2019.10") (source (origin (method url-fetch) (uri (string-append @@ -408,10 +408,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn")) - (patches - (search-patches - "u-boot-fix-mkimage-header-verification.patch")))) + "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) diff --git a/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch b/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch deleted file mode 100644 index 063677db4a..0000000000 --- a/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 48b52117235928cfd7ef1ec5c3f2cff5d7b03862 Mon Sep 17 00:00:00 2001 -From: Jordan Hand -Date: Wed, 10 Apr 2019 09:46:32 -0700 -Subject: [PATCH,v2] fdt: Fix mkimage list to try every header type -Origin: https://patchwork.ozlabs.org/patch/1083495/ - -Image type is not supplied to `mkimage -l`. For this reason, we cannot -use imagetool_verify_print_header_by_type. Instead, this patch uses -imagetool_verify_print_header to look through all header types to find -one where image validation succeeds. - -This patch fixes failures in test/image/test-imagetools.sh - -Signed-off-by: Jordan Hand -Tested-by: Alex Kiernan -Tested-by: Vagrant Cascadian ---- - tools/mkimage.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/tools/mkimage.c b/tools/mkimage.c -index 2899adff81..76c3406d37 100644 ---- a/tools/mkimage.c -+++ b/tools/mkimage.c -@@ -403,14 +403,21 @@ int main(int argc, char **argv) - exit (EXIT_FAILURE); - } - -- /* -- * scan through mkimage registry for all supported image types -- * and verify the input image file header for match -- * Print the image information for matched image type -- * Returns the error code if not matched -- */ -- retval = imagetool_verify_print_header_by_type(ptr, &sbuf, -- tparams, ¶ms); -+ if (params.fflag) { -+ /* -+ * Verifies the header format based on the expected header for -+ * image type in tparams -+ */ -+ retval = imagetool_verify_print_header_by_type(ptr, &sbuf, -+ tparams, ¶ms); -+ } else { -+ /** -+ * When listing the image, we are not given the image type. Simply check all -+ * image types to find one that matches our header -+ */ -+ retval = imagetool_verify_print_header(ptr, &sbuf, -+ tparams, ¶ms); -+ } - - (void) munmap((void *)ptr, sbuf.st_size); - (void) close (ifd); --- -2.20.1 - -- 2.21.0