From b21b488dd7ac757ca676df2a0c6614aa3a31afa8 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 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 --- phase1/master.cfg | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/phase1/master.cfg b/phase1/master.cfg index 4e7cbc1..d1584d3 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -1312,6 +1312,27 @@ def prepareFactory(target): ) ) + factory.addStep( + ShellCommand( + name="kmodclean", + description="Removing kmods from target packages", + descriptionDone="Kmods removed", + command=[ + "find", + "-name" + "kmod-*.ipk", + "-delete", + Interpolate( + "bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/packages/", + target=target, + subtarget=subtarget, + ), + ], + haltOnFailure=True, + doStepIf=IsKmodArchiveEnabled, + ) + ) + factory.addStep( ShellCommand( name="kmodindex",