From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:45183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hE7q3-0005qJ-Pd for guix-patches@gnu.org; Wed, 10 Apr 2019 03:40:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hE7q1-0000xm-IX for guix-patches@gnu.org; Wed, 10 Apr 2019 03:40:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38822) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hE7py-0000wd-6z for guix-patches@gnu.org; Wed, 10 Apr 2019 03:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hE7px-0001oF-W5 for guix-patches@gnu.org; Wed, 10 Apr 2019 03:40:02 -0400 Subject: [bug#35217] gnu: u-boot: Update to 2019.04. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:45117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hE7pf-0005pY-4x for guix-patches@gnu.org; Wed, 10 Apr 2019 03:39:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hE7pd-0000kJ-Pb for guix-patches@gnu.org; Wed, 10 Apr 2019 03:39:43 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:39726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hE7pd-0000k9-Bg for guix-patches@gnu.org; Wed, 10 Apr 2019 03:39:41 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100e]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id E70B31AA27 for ; Wed, 10 Apr 2019 00:39:40 -0700 (PDT) From: Vagrant Cascadian Date: Wed, 10 Apr 2019 00:39:36 -0700 Message-ID: <87h8b6ia13.fsf@ponder> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: 35217@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/packages/bootloaders (u-boot): Update to 2019.04. [source]: Add patch. (u-boot-novena): Update dynamic patch to handle variable rename. (u-boot-am335x-evm): New variable. (u-boot-am335x-boneblack): Deprecate variable. (u-boot-novena): Fix typo in description. * gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch: New fi= le. * gnu/local.mk (dist_patch_DATA): Update accordingly. =2D-- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 18 ++++--- ...boot-fix-mkimage-header-verification.patch | 48 +++++++++++++++++++ 3 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/u-boot-fix-mkimage-header-verifica= tion.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6c39c3fef5..d8b74c0650 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1307,6 +1307,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-include-qregexpvalidator.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 d6ef7d52b5..6064e699f8 100644 =2D-- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -378,7 +378,7 @@ tree binary files. These are board description files u= sed by Linux and BSD.") (define u-boot (package (name "u-boot") =2D (version "2019.01") + (version "2019.04") (source (origin (method url-fetch) (uri (string-append @@ -386,7 +386,10 @@ tree binary files. These are board description files = used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 =2D "08hwsmh5xsb1gcxsv8gvx00bai938dm5y3889n8jif3a8rd7xgah"))= )) + "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn")) + (patches + (search-patches=20 + "u-boot-fix-mkimage-header-verification.patch")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) @@ -577,8 +580,11 @@ board-independent tools."))) (define-public u-boot-malta (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) =20 =2D(define-public u-boot-beagle-bone-black =2D (make-u-boot-package "am335x_boneblack" "arm-linux-gnueabihf")) +(define-public u-boot-am335x-evm + (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf")) + +(define-public u-boot-am335x-boneblack + (deprecated-package "u-boot-am335x-boneblack" u-boot-am335x-evm)) =20 (define-public (make-u-boot-sunxi64-package board triplet) (let ((base (make-u-boot-package board triplet))) @@ -637,7 +643,7 @@ board-independent tools."))) also initializes the boards (RAM etc). =20 This U-Boot is built for Novena. Be advised that this version, contrary =2Dto Novena upstream, does not load u-boot.img from the first patition.") +to Novena upstream, does not load u-boot.img from the first partition.") (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) @@ -647,7 +653,7 @@ to Novena upstream, does not load u-boot.img from the f= irst patition.") ;; allowing it to be installed at a device offset. (lambda _ (substitute* "configs/novena_defconfig" =2D (("CONFIG_SPL_FAT_SUPPORT=3Dy") "# CONFIG_SPL_FAT_SUP= PORT is not set")) + (("CONFIG_SPL_FS_FAT=3Dy") "# CONFIG_SPL_FS_FAT is not = set")) #t))))))))) =20 (define-public u-boot-cubieboard diff --git a/gnu/packages/patches/u-boot-fix-mkimage-header-verification.pa= tch b/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch new file mode 100644 index 0000000000..a24519d2f4 =2D-- /dev/null +++ b/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch @@ -0,0 +1,48 @@ +From da8dc3e61bab213b322eafeffa2802585508f288 Mon Sep 17 00:00:00 2001 +From: Jordan Hand +Date: Tue, 9 Apr 2019 10:36:09 -0700 +Subject: [PATCH] fdt: Fix mkimage list to try every header type +Origin: https://patchwork.ozlabs.org/patch/1082572/ + +Signed-off-by: Jordan Hand +--- + tools/mkimage.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/tools/mkimage.c b/tools/mkimage.c +index 2899adff81..d1e1a6743d 100644 +--- a/tools/mkimage.c ++++ b/tools/mkimage.c +@@ -403,14 +403,21 @@ int main(int argc, char **argv) + exit (EXIT_FAILURE); + } +=20 +- /* +- * 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 =3D 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 =3D imagetool_verify_print_header_by_type(ptr, &sbuf, ++ tparams, ¶ms); ++ } else { ++ /** ++ * When listing the image, we are not given the image type. Simply che= ck all ++ * image types to find one that matches our header ++ */ ++ retval =3D imagetool_verify_print_header(ptr, &sbuf, ++ tparams, ¶ms); ++ } +=20 + (void) munmap((void *)ptr, sbuf.st_size); + (void) close (ifd); +--=20 +2.20.1 + =2D-=20 2.20.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXK2duAAKCRDcUY/If5cW qlXfAP9v/z8F9+1bNFzsCm/vrcaAodjvq9phWQsTVH3hZchArQEArrFdjFo83fgJ G+T3iSIwbouHpXftgzFavKQM8KMDqg4= =MJ46 -----END PGP SIGNATURE----- --=-=-=--