[src/netbsd-9]: src/usr.bin/mkubootimage Pull up following revision(s) (reque...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ece378be8c2
branches:  netbsd-9
changeset: 963596:6ece378be8c2
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 10 19:14:03 2020 +0000

description:
Pull up following revision(s) (requested by ryo in ticket #690):

        usr.bin/mkubootimage/mkubootimage.c: revision 1.30

arm64_image_header->image_size must be included size of arm64_image_header.

with -u option, image_size should be binary (file) size (header included).
without -u option, image_size should be binary (file) size + header size.

diffstat:

 usr.bin/mkubootimage/mkubootimage.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ad8298f58ff2 -r 6ece378be8c2 usr.bin/mkubootimage/mkubootimage.c
--- a/usr.bin/mkubootimage/mkubootimage.c       Mon Feb 10 19:07:22 2020 +0000
+++ b/usr.bin/mkubootimage/mkubootimage.c       Mon Feb 10 19:14:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.24.6.2 2020/01/02 09:47:05 martin Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.24.6.3 2020/02/10 19:14:03 martin Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.24.6.2 2020/01/02 09:47:05 martin Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.24.6.3 2020/02/10 19:14:03 martin Exp $");
 
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -391,7 +391,7 @@
 #endif
 
        const uint64_t dsize = update_image ?
-          (uint64_t)st.st_size - sizeof(*hdr) : (uint64_t)st.st_size;
+           (uint64_t)st.st_size : (uint64_t)st.st_size + sizeof(*hdr);
 
        memset(hdr, 0, sizeof(*hdr));
        hdr->code0 = htole32(ARM64_CODE0);