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 <[email protected]> Signed-off-by: Christian Marangi <[email protected]> [fixes] Signed-off-by: Petr Štetiar <[email protected]> [apk compat + print]
openwrt · Jun 13, 2024 · 1c309f7 · 1c309f7
1 parent 44ed9a3
commit 1c309f7
Showing 1 changed file with 25 additions and 0 deletions.
diff --git 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",