From 743bf0fe750786b96e3da5ed0053806627bac916 Mon Sep 17 00:00:00 2001
From: andreili <andreil499@gmail.com>
Date: Sun, 22 Jun 2025 22:19:52 +0200
Subject: [PATCH] Add WiFi driver for CB1.

---
 config/board/btt_cb1.json   | 12 ++++++++++--
 config/board/opi_zero2.json |  4 ++--
 config/target_meta.json     |  7 +++++++
 files/backups/excl_min.lst  |  3 +--
 scripts/sources.py          | 19 ++++++++++++-------
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/config/board/btt_cb1.json b/config/board/btt_cb1.json
index 967aae1..aecd904 100644
--- a/config/board/btt_cb1.json
+++ b/config/board/btt_cb1.json
@@ -51,7 +51,7 @@
             "version": "v6.14-rc7",
             "version_type": "tag",
             "patch_dir": "kernel/sunxi-6.14",
-            "target": [ "Image", "modules", "dtbs" ],
+            "target": [ "Image", "modules", "dtbs", "modules_install" ],
             "artifacts":
             [
                 {
@@ -69,7 +69,15 @@
                     "subdir": "dts/allwiner/overlay"
                 }
             ],
-            "makeopts": "CROSS_COMPILE=%{CROSS_C}% ARCH=arm64"
+            "makeopts": "CROSS_COMPILE=%{CROSS_C}% ARCH=arm64 INSTALL_MOD_PATH=%{out_dir}%/kmods"
+        },
+        {
+            "parent": "rtl8189ES_linux",
+            "version": "rtl8189fs",
+            "version_type": "branch",
+            "target": [ "modules" ],
+            "makeopts": "CROSS_COMPILE=%{CROSS_C}% ARCH=arm64 INSTALL_MOD_PATH=%{out_dir}%/kmods KSRC=%{build_dir}%/kernel_%{board_name}%",
+            "artifacts": []
         },
         {
             "parent": "buildroot",
diff --git a/config/board/opi_zero2.json b/config/board/opi_zero2.json
index 8858abe..02d5694 100644
--- a/config/board/opi_zero2.json
+++ b/config/board/opi_zero2.json
@@ -52,7 +52,7 @@
             "version": "v6.14-rc7",
             "version_type": "tag",
             "patch_dir": "kernel/sunxi-6.14",
-            "target": [ "Image", "modules", "dtbs" ],
+            "target": [ "Image", "modules", "dtbs", "modules_install" ],
             "artifacts":
             [
                 {
@@ -70,7 +70,7 @@
                     "subdir": "dts/allwiner/overlay"
                 }
             ],
-            "makeopts": "CROSS_COMPILE=%{CROSS_C}% ARCH=arm64"
+            "makeopts": "CROSS_COMPILE=%{CROSS_C}% ARCH=arm64 INSTALL_MOD_PATH=%{out_dir}%/kmods"
         },
         {
             "parent": "buildroot",
diff --git a/config/target_meta.json b/config/target_meta.json
index 6bf7303..85cd379 100644
--- a/config/target_meta.json
+++ b/config/target_meta.json
@@ -37,5 +37,12 @@
             "config": true,
             "config_target": "menuconfig"
         }
+    },
+    {
+        "rtl8189ES_linux":
+        {
+            "url": "https://github.com/jwrdegoede/rtl8189ES_linux.git",
+            "config": false
+        }
     }
 ]
diff --git a/files/backups/excl_min.lst b/files/backups/excl_min.lst
index e05a48e..feca53a 100644
--- a/files/backups/excl_min.lst
+++ b/files/backups/excl_min.lst
@@ -6,7 +6,6 @@ usr/lib64/perl5*
 usr/src/*
 var/cache/binpkgs/*
 var/cache/distfiles/*
-var/cache/edb/*
+vvar/cache/edb/*
 var/cache/eix/*
-var/db/*
 var/log/*.log
diff --git a/scripts/sources.py b/scripts/sources.py
index 6ca1429..6aa4634 100644
--- a/scripts/sources.py
+++ b/scripts/sources.py
@@ -138,7 +138,8 @@ class Sources:
 
     def git_work_get_hash_remote(self):
         if (self.type == "branch"):
-            Logger.error("Unsupported source type!")
+            tags = self.repo_bare.git.ls_remote("--branches", "origin", f"{self.version}")
+            return tags.split('\t')[0]
         elif (self.type == "head"):
             tags = self.repo_bare.git.ls_remote("origin", "HEAD")
             return tags.split('\t')[0]
@@ -173,11 +174,15 @@ class Sources:
         Path(self.work_done_marker).touch()
 
     def __patch_apply(self, file, work_dir):
-        patch_bn = os.path.basename(file)
-        Logger.build(f"\tApply patch '{patch_bn}'")
-        p = subprocess.Popen(["patch", "--batch", "-p1", "-N",
-            f"--input={file}", "--quiet"], cwd=work_dir)
-        p.wait()
+        patch_f = Path(file)
+        if (patch_f.is_file()):
+            patch_bn = os.path.basename(file)
+            Logger.build(f"\tApply patch '{patch_bn}'")
+            p = subprocess.Popen(["patch", "--batch", "-p1", "-N",
+                f"--input={file}", "--quiet"], cwd=work_dir)
+            p.wait()
+            if (p.returncode != 0):
+                Logger.error("Failed to patch!")
 
     def do_patch(self, board_name, dir):
         Logger.build(f"Patch...")
@@ -208,7 +213,7 @@ class Sources:
 
     def compile(self, opts, cfg_name):
         #print(f"opts:{opts} target:{target}")
-        Logger.build(f"Compile...")
+        Logger.build(f"Compile (opts='{opts}')...")
         if (cfg_name != ""):
             work_cfg_name = f"{self.work_dir}/.config"
             cfg_or = Path(cfg_name)