From 0b0d52c8b06916a862b18d22e53b9072fbfc64df Mon Sep 17 00:00:00 2001
From: Florian Schroegendorfer <florian.schroegendorfer@phlo.at>
Date: Wed, 12 Jun 2024 01:49:25 +0200
Subject: [PATCH] moved make modules_install to ekernel.install

---
 ekernel.py            | 11 ++++++-----
 tests/test_build.py   |  5 -----
 tests/test_install.py |  5 +++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ekernel.py b/ekernel.py
index a4a6a43..99d61db 100644
--- a/ekernel.py
+++ b/ekernel.py
@@ -395,14 +395,10 @@ def build (argv):
     if not kernel.config.exists():
         raise FileNotFoundError(f"error: missing config {kernel.config}")
 
-    # change directory
+    # build
     os.chdir(kernel.src)
-
-    # build and install modules
     out.einfo(f"building {out.teal(kernel.src)}")
     subprocess.run(["make", "-j", str(args.jobs)], check=True)
-    out.einfo(f"installing modules {out.teal(kernel.modules)}")
-    subprocess.run(["make", "modules_install"], check=True)
 
 @cli
 @efi
@@ -496,6 +492,11 @@ def install (argv):
     out.einfo(f"creating backup image {out.teal(kernel.bkp)}")
     shutil.copy(kernel.bzImage, kernel.bkp)
 
+    # install modules
+    os.chdir(kernel.src)
+    out.einfo(f"installing modules {out.teal(kernel.modules)}")
+    subprocess.run(["make", "modules_install"], check=True)
+
     # rebuild external modules
     eargs = ["emerge", "@module-rebuild"]
     if args.quiet:
diff --git a/tests/test_build.py b/tests/test_build.py
index 67930a6..3a7656e 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -40,11 +40,6 @@ class Tests (unittest.TestCase):
         self.assertEqual(args, (["make", "-j", self.jobs],))
         self.assertEqual(kwargs, {"check": True})
         self.assertTrue(self.kernel.bzImage.exists())
-        # make modules_install
-        tracer, (args, kwargs) = next(trace_it)
-        self.assertEqual(tracer.name, "subprocess.run")
-        self.assertEqual(args, (["make", "modules_install"],))
-        self.assertEqual(kwargs, {"check": True})
 
     def test_build (self):
         self.assertEqual(run("-q"), 0)
diff --git a/tests/test_install.py b/tests/test_install.py
index 495408c..7d5e9c4 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -60,6 +60,11 @@ class Tests (unittest.TestCase):
         )
         self.assertEqual(kwargs, {"check": True})
         self.assertEqual(str(data.linux.readlink()), self.kernel.src.name)
+        # make modules_install
+        tracer, (args, kwargs) = next(trace_it)
+        self.assertEqual(tracer.name, "subprocess.run")
+        self.assertEqual(args, (["make", "modules_install"],))
+        self.assertEqual(kwargs, {"check": True})
         # emerge @module-rebuild
         tracer, (args, kwargs) = next(trace_it)
         self.assertEqual(tracer.name, "subprocess.run")