ardupilotwaf: Fix inconsistency in signed firmware file when generated with the compact method of signing firmware

If the firmware file is built and signed using the compact method (ie. build and sign firmware at the same time) then the firmware file is not updated with the field signed_firmware.

If the firmware file is built using the long form method (ie. build the firmware first, then sign after) then the apj is updated with the field signed_firmware.

This ensures both signed firmware is consistent and contains the 'signed_firmware' field.

Author: joshanne

Tools/ardupilotwaf/chibios.py

@@ -378,6 +378,9 @@ def run(self):
             # we omit build_time when we don't have build_dates so that apj
             # file is identical for same git hash and compiler
             d["build_time"] = int(time.time())
+        if self.env.AP_SIGNED_FIRMWARE and self.env.PRIVATE_KEY:
+            # The firmware file was signed during the build process, so set the flag
+            d['signed_firmware'] = True
         apj_file = self.outputs[0].abspath()
         f = open(apj_file, "w")
         f.write(json.dumps(d, indent=4))