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. Call the kmodclean step before checksums to prevent nonexisting entry in the sha256sums file. Signed-off-by: Daniel Golle <[email protected]> [apk compat + print] Signed-off-by: Petr Štetiar <[email protected]> [ kmodclean before checksums ] Signed-off-by: Christian Marangi <[email protected]>
openwrt · Jun 14, 2024 · 0615b6f · 0615b6f
1 parent 44ed9a3
commit 0615b6f
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/phase1/master.cfg b/phase1/master.cfg
@@ -1257,6 +1257,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="checksums",