phase1: remove unused 'kmod_repository'
authorThibaut VARÈNE <hacks@slashdirt.org>
Wed, 19 Oct 2022 15:35:32 +0000 (17:35 +0200)
committerPetr Štetiar <ynezz@true.cz>
Mon, 15 May 2023 15:36:01 +0000 (17:36 +0200)
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
phase1/master.cfg

index d61fc91dc2a8c1d70d9d9661e44fab14961e1726..a5b7a6b2fdb4b5336ef729913f9f498b829a590b 100644 (file)
@@ -260,14 +260,10 @@ if ini.has_option("usign", "comment"):
        usign_comment = ini.get("usign", "comment")
 
 enable_kmod_archive = False
-embed_kmod_repository = False
 
 if ini.has_option("phase1", "kmod_archive"):
        enable_kmod_archive = ini.getboolean("phase1", "kmod_archive")
 
-if ini.has_option("phase1", "kmod_repository"):
-       embed_kmod_repository = ini.getboolean("phase1", "kmod_repository")
-
 
 # find targets
 targets = [ ]
@@ -1058,34 +1054,6 @@ for target in targets:
                haltOnFailure = True
        ))
 
-       if enable_kmod_archive and embed_kmod_repository:
-               # embed kmod repository. Must happen before 'images'
-
-               # find rootfs staging directory
-               factory.addStep(SetPropertyFromCommand(
-                       name = "stageroot",
-                       property = "stageroot",
-                       description = "Finding the rootfs staging directory",
-                       command=["make", "--no-print-directory", "val.STAGING_DIR_ROOT"],
-                       env = { 'TOPDIR': Interpolate("%(kw:cwd)s/build", cwd=GetCwd) },
-                       want_stderr = False
-               ))
-
-               factory.addStep(ShellCommand(
-                       name = "filesdir",
-                       description = "Creating file overlay directory",
-                       command=["mkdir", "-p", "files/etc/opkg"],
-                       haltOnFailure = True
-               ))
-
-               factory.addStep(ShellCommand(
-                       name = "kmodconfig",
-                       description = "Embedding kmod repository configuration",
-                       command=Interpolate("sed -e 's#^\\(src/gz .*\\)_core \\(.*\\)/packages$#&\\n\\1_kmods \\2/kmods/%(prop:kernelversion)s#' " +
-                                              "%(prop:stageroot)s/etc/opkg/distfeeds.conf > files/etc/opkg/distfeeds.conf"),
-                       haltOnFailure = True
-               ))
-
        #factory.addStep(IfBuiltinShellCommand(
        factory.addStep(ShellCommand(
                name = "images",