From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Dec 2016 09:50:37 +0000 (+0100)
Subject: mkosi: rename SHA256SUM → SHA256SUMS
X-Git-Tag: v2~26^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F54%2Fhead;p=thirdparty%2Fmkosi.git

mkosi: rename SHA256SUM → SHA256SUMS

This was an unfortunate typo I unfortunately didn't notice earlier. The
file was really supposed to be created as SHA256SUMS rather than
SHA256SUM, in order to follow Ubuntu's naming of the checksums of OS
images.  Moreover systemd's importd tool will actually look for
SHA256SUMS rather than SHA256SUM.

Hence, let's rename this now, even if this is to some level a compat
break. But as nobody noticed this earlier I figure people didn't care so
far.
---

diff --git a/.gitignore b/.gitignore
index 10f4e69dd..557152f63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/SHA256SUM
-/SHA256SUM.gpg
+/SHA256SUMS
+/SHA256SUMS.gpg
 /__pycache__
 /mkosi.egg-info
 /build
diff --git a/README.md b/README.md
index c555f4c88..870dd81c4 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ systemd-nspawn -bD image
 
 # Other features
 
-* Optionally, create an *SHA256SUM* checksum file for the result,
+* Optionally, create an *SHA256SUMS* checksum file for the result,
   possibly even signed via gpg.
 
 * Optionally, place a specific `.nspawn` settings file along
diff --git a/mkosi b/mkosi
index 18797c6ec..cef60ec75 100755
--- a/mkosi
+++ b/mkosi
@@ -1381,7 +1381,7 @@ def calculate_sha256sum(args, raw, tar, root_hash_file, nspawn_settings):
     if not args.checksum:
         return None
 
-    with complete_step('Calculating SHA256SUM'):
+    with complete_step('Calculating SHA256SUMS'):
         f = tempfile.NamedTemporaryFile(mode="w+", prefix=".mkosi-", encoding="utf-8",
                                         dir=os.path.dirname(args.output_checksum))
 
@@ -1403,7 +1403,7 @@ def calculate_signature(args, checksum):
     if checksum is None:
         return None
 
-    with complete_step('Signing SHA256SUM'):
+    with complete_step('Signing SHA256SUMS'):
         f = tempfile.NamedTemporaryFile(mode="wb", prefix=".mkosi-",
                                         dir=os.path.dirname(args.output_signature))
 
@@ -1442,7 +1442,7 @@ def link_output_checksum(args, checksum):
     if checksum is None:
         return
 
-    with complete_step('Linking SHA256SUM file',
+    with complete_step('Linking SHA256SUMS file',
                        'Successfully linked ' + args.output_checksum):
         os.chmod(checksum, 0o666 & ~args.original_umask)
         os.link(checksum, args.output_checksum)
@@ -1460,7 +1460,7 @@ def link_output_signature(args, signature):
     if signature is None:
         return
 
-    with complete_step('Linking SHA256SUM.gpg file',
+    with complete_step('Linking SHA256SUMS.gpg file',
                        'Successfully linked ' + args.output_signature):
         os.chmod(signature, 0o666 & ~args.original_umask)
         os.link(signature, args.output_signature)
@@ -1560,8 +1560,8 @@ def parse_args():
     group.add_argument("--srv-size", help='Set size of /srv partition (only raw_gpt, raw_squashfs)', metavar='BYTES')
 
     group = parser.add_argument_group("Validation (only raw_gpt, raw_btrfs, raw_squashfs, tar)")
-    group.add_argument("--checksum", action='store_true', help='Write SHA256SUM file')
-    group.add_argument("--sign", action='store_true', help='Write and sign SHA256SUM file')
+    group.add_argument("--checksum", action='store_true', help='Write SHA256SUMS file')
+    group.add_argument("--sign", action='store_true', help='Write and sign SHA256SUMS file')
     group.add_argument("--key", help='GPG key to use for signing')
     group.add_argument("--password", help='Set the root password')
 
@@ -2062,10 +2062,10 @@ def load_args():
         args.output_root_hash_file = build_root_hash_file_path(args.output)
 
     if args.checksum:
-        args.output_checksum = os.path.join(os.path.dirname(args.output), "SHA256SUM")
+        args.output_checksum = os.path.join(os.path.dirname(args.output), "SHA256SUMS")
 
     if args.sign:
-        args.output_signature = os.path.join(os.path.dirname(args.output), "SHA256SUM.gpg")
+        args.output_signature = os.path.join(os.path.dirname(args.output), "SHA256SUMS.gpg")
 
     if args.nspawn_settings is not None:
         args.nspawn_settings = os.path.abspath(args.nspawn_settings)