From 591df9b69cf2afc4b486d255db6e8157ce65d7f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Wed, 19 Oct 2022 17:35:32 +0200 Subject: [PATCH] phase1: remove unused 'kmod_repository' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index d61fc91..a5b7a6b 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -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", -- 2.30.2