moved make modules_install to ekernel.install

This commit is contained in:
Florian Schroegendorfer 2024-06-12 01:49:25 +02:00
parent b703ed2605
commit 0b0d52c8b0
Signed by: root
GPG Key ID: 17625E28D4D6E339
3 changed files with 11 additions and 10 deletions

View File

@ -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:

View File

@ -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)

View File

@ -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")