diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
index 1f3ea5427b..34f8e1e294 100755
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
@@ -660,7 +660,7 @@ def write_GPIO_config(f):
     # and write #defines for use by config code
     f.write('}\n\n')
     f.write('// full pin define list\n')
-    for l in bylabel:
+    for l in sorted(bylabel.keys()):
         p = bylabel[l]
         label = p.label
         label = label.replace('-', '_')
@@ -886,7 +886,7 @@ process_file(args.hwdef)
 
 outdir = args.outdir
 if outdir is None:
-    outdir = '.'
+    outdir = '/tmp'
 
 if not "MCU" in config:
     error("Missing MCU type in config")