CVS commit: [netbsd-9] src/usr.bin/mkubootimage

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon Feb 10 19:14:03 UTC 2020

Modified Files:
        src/usr.bin/mkubootimage [netbsd-9]: mkubootimage.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.24.6.2 -r1.24.6.3 src/usr.bin/mkubootimage/mkubootimage.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.24.6.2 src/usr.bin/mkubootimage/mkubootimage.c:1.24.6.3
--- src/usr.bin/mkubootimage/mkubootimage.c:1.24.6.2	Thu Jan  2 09:47:05 2020
+++ src/usr.bin/mkubootimage/mkubootimage.c	Mon Feb 10 19:14:03 2020
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ generate_header_arm64(struct arm64_image
 #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);