From f54ecb32819ae8a0e8a3bd4330a21e49c70efaf4 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 8 Sep 2024 14:04:04 +0800
Subject: [PATCH] kernel-config: Add support to set arch

To be used for multilib.
---
 chapter10/kernel/kernel-config.py | 15 ++++++++++-----
 chapter10/kernel/kernel.version   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/chapter10/kernel/kernel-config.py b/chapter10/kernel/kernel-config.py
index 814484b84..6ba7fb573 100755
--- a/chapter10/kernel/kernel-config.py
+++ b/chapter10/kernel/kernel-config.py
@@ -26,6 +26,8 @@ if_stack = []
 expand_var_mp = { 'SRCARCH': 'x86' }
 main_dep = {}
 
+attr_key = ['revision', 'arch']
+
 def expand_var(s):
     for k in expand_var_mp:
         s = s.replace('$(' + k + ')', expand_var_mp[k])
@@ -242,7 +244,7 @@ for _, val, _, _, _, _, menu, _ in r:
 max_line = 80
 buf = []
 
-done = [x[5] for x in r] + ['revision']
+done = [x[5] for x in r] + attr_key
 for i in known_config:
     if i not in done:
         raise Exception("%s seems not exist" % i)
@@ -298,8 +300,11 @@ t = Template('''<?xml version="1.0" encoding="UTF-8"?>
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- Automatically generated by kernel-config.py
      DO NOT EDIT! -->
-<screen role="nodump"{{ rev }}>{{ '\n'.join(buf) }}</screen>''')
+<screen role="nodump"{{ attr }}>{{ '\n'.join(buf) }}</screen>''')
 
-rev = known_config.get('revision')
-rev = ' revision="%s"' % rev if rev else ''
-print(t.render(rev = rev, buf = buf))
+attr = ''
+for k in attr_key:
+    v = known_config.get(k)
+    if v:
+        attr += ' %s="%s"' % (k, v)
+print(t.render(attr = attr, buf = buf))
diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version
index 22cb9e553..8421878a1 100644
--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@@ -1 +1 @@
-6.10.2
+6.10.7