darwin.xnu: python2 -> python3

This commit is contained in:
Daiderd Jordan 2020-01-12 21:09:14 +01:00
parent dd5fd3b1ff
commit c7d457c9da
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 45 additions and 2 deletions

View File

@ -1,9 +1,11 @@
{ appleDerivation, lib, bootstrap_cmds, bison, flex { appleDerivation, lib, bootstrap_cmds, bison, flex
, gnum4, unifdef, perl, python , gnum4, unifdef, perl, python3
, headersOnly ? true }: , headersOnly ? true }:
appleDerivation ({ appleDerivation ({
nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python ]; nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python3 ];
patches = [ ./python3.patch ];
postPatch = '' postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \

View File

@ -0,0 +1,41 @@
diff --git a/bsd/kern/makekdebugevents.py b/bsd/kern/makekdebugevents.py
index 73b2db4..d354ba0 100755
--- a/bsd/kern/makekdebugevents.py
+++ b/bsd/kern/makekdebugevents.py
@@ -5,7 +5,7 @@
# named kd_events[] or these mappings.
# Required to generate a header file used by DEVELOPMENT and DEBUG kernels.
#
-
+
import sys
import re
@@ -21,18 +21,18 @@ code_table = []
# scan file to generate internal table
with open(trace_code_file, 'rt') as codes:
for line in codes:
- m = id_name_pattern.match(line)
- if m:
+ m = id_name_pattern.match(line)
+ if m:
code_table += [(int(m.group(1),base=16), m.group(2))]
# emit typedef:
-print "typedef struct {"
-print " uint32_t id;"
-print " const char *name;"
-print "} kd_event_t;"
+print("typedef struct {")
+print(" uint32_t id;")
+print(" const char *name;")
+print("} kd_event_t;")
# emit structure declaration and sorted initialization:
-print "kd_event_t kd_events[] = {"
+print("kd_event_t kd_events[] = {")
for mapping in sorted(code_table, key=lambda x: x[0]):
- print " {0x%x, \"%s\"}," % mapping
-print "};"
+ print(" {0x%x, \"%s\"}," % mapping)
+print("};")