[buildbot] phase1: remove kmods in target packages if archive is enabled

[LEDE Commits]

ynezz pushed a commit to buildbot.git, branch main:
https://git.openwrt.org/ec2bd8a07e88f4e251fccb99142bd46c816d62ec

commit ec2bd8a07e88f4e251fccb99142bd46c816d62ec
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri Nov 15 15:27:55 2024 +0100

    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.
    
    This also affects APK that picks packages from the first entry in the
    repository file and doesn't support checking the same package from
    multiple entry.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
    [ add --remove-source-files and improve implementation ]
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 phase1/master.cfg | 57 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 82ebc90..380338b 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -1250,23 +1250,6 @@ def prepareFactory(target):
         )
     )
 
-    factory.addStep(
-        ShellCommand(
-            name="pkgindex",
-            description="Indexing packages",
-            descriptionDone="Packages indexed",
-            command=[
-                "make",
-                Interpolate("-j%(prop:nproc:-1)s"),
-                "package/index",
-                "V=s",
-                "CONFIG_SIGNED_PACKAGES=",
-            ],
-            env=MakeEnv(),
-            haltOnFailure=True,
-        )
-    )
-
     factory.addStep(
         ShellCommand(
             name="images",
@@ -1303,17 +1286,6 @@ def prepareFactory(target):
         )
     )
 
-    factory.addStep(
-        ShellCommand(
-            name="checksums",
-            description="Calculating checksums",
-            descriptionDone="Checksums calculated",
-            command=["make", "-j1", "checksum", "V=s"],
-            env=MakeEnv(),
-            haltOnFailure=True,
-        )
-    )
-
     factory.addStep(
         ShellCommand(
             name="kmoddir",
@@ -1339,6 +1311,7 @@ def prepareFactory(target):
             descriptionDone="Kmod archive prepared",
             command=[
                 "rsync",
+                "--remove-source-files",
                 "--include=/kmod-*.ipk",
                 "--include=/kmod-*.apk",
                 "--exclude=*",
@@ -1359,6 +1332,23 @@ def prepareFactory(target):
         )
     )
 
+    factory.addStep(
+        ShellCommand(
+            name="pkgindex",
+            description="Indexing packages",
+            descriptionDone="Packages indexed",
+            command=[
+                "make",
+                Interpolate("-j%(prop:nproc:-1)s"),
+                "package/index",
+                "V=s",
+                "CONFIG_SIGNED_PACKAGES=",
+            ],
+            env=MakeEnv(),
+            haltOnFailure=True,
+        )
+    )
+
     factory.addStep(
         ShellCommand(
             name="kmodindex",
@@ -1382,6 +1372,17 @@ def prepareFactory(target):
         )
     )
 
+    factory.addStep(
+        ShellCommand(
+            name="checksums",
+            description="Calculating checksums",
+            descriptionDone="Checksums calculated",
+            command=["make", "-j1", "checksum", "V=s"],
+            env=MakeEnv(),
+            haltOnFailure=True,
+        )
+    )
+
     # sign
     factory.addStep(
         MasterShellCommand(