From 1c309f7726d64db5d00e06ce151c80e1ca629b3c Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 31 May 2024 02:32:07 +0100 Subject: [PATCH] phase1: remove kmods in target packages if archive is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OPKG gets confused if kmod packages are present in both, target packages as well as kernel version specific folder. Remove them from target packages to make opkg pick the kmods from kmod archive folder only. Signed-off-by: Daniel Golle Signed-off-by: Christian Marangi [fixes] Signed-off-by: Petr Štetiar [apk compat + print] --- phase1/master.cfg | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/phase1/master.cfg b/phase1/master.cfg index 4e7cbc1..41eb8da 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -1312,6 +1312,31 @@ def prepareFactory(target): ) ) + factory.addStep( + ShellCommand( + name="kmodclean", + description="Removing kmods from target packages", + descriptionDone="Kmods removed", + command=[ + "find", + Interpolate( + "bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/packages/", + target=target, + subtarget=subtarget, + ), + "-name", + "kmod-*.ipk", + "-o", + "-name", + "kmod-*.apk", + "-delete", + "-print", + ], + haltOnFailure=True, + doStepIf=IsKmodArchiveEnabled, + ) + ) + factory.addStep( ShellCommand( name="kmodindex",