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. Also add an additional step to remove any kmod entry from sha256sums. Signed-off-by: Daniel Golle <[email protected]> [ rework implementation, sha256sumsclean + --remove-source-files ] Signed-off-by: Christian Marangi <[email protected]>
openwrt · Jun 14, 2024 · edd31c9 · edd31c9
1 parent 44ed9a3
commit edd31c9
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/phase1/master.cfg b/phase1/master.cfg
@@ -1289,10 +1289,11 @@ def prepareFactory(target):
     factory.addStep(
         ShellCommand(
             name="kmodprepare",
-            description="Preparing kmod archive",
+            description="Preparing kmod archive (move kmods)",
             descriptionDone="Kmod archive prepared",
             command=[
                 "rsync",
+                "--remove-source-files",
                 "--include=/kmod-*.ipk",
                 "--exclude=*",
                 "-va",
@@ -1335,6 +1336,26 @@ def prepareFactory(target):
         )
     )
 
+    factory.addStep(
+        ShellCommand(
+            name="sha256sumsclean",
+            description="Removing kmods from sha256sums",
+            descriptionDone="Kmods removed",
+            command=[
+                "sed",
+                "-i",
+                "\# *packages/kmod-.*$#d",
+                Interpolate(
+                    "bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/sha256sums",
+                    target=target,
+                    subtarget=subtarget,
+                ),
+            ],
+            haltOnFailure=True,
+            doStepIf=IsKmodArchiveEnabled,
+        )
+    )
+
     # sign
     factory.addStep(
         MasterShellCommand(