hotfix: update remaining paths and names

Author: seppzer0

.github/workflows/main.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Run Tests
         run: |
-          python3 -m pre_commit run --files builder/**/*.py
+          python3 -m pre_commit run --files zkb/**/*.py
 
       - name: Build
         run: |

Dockerfile

@@ -33,14 +33,14 @@ RUN \
 #
 # The main idea here is that we pre-pack all the tools into the Docker/Podman image that can be used for any device:
 # (toolchains, binutils -- everything except device-specific kernel source);
-# 
+#
 # This significantly reduces the total build time, as each time we make a build call for a device,
 # only device-specific kernel source is being downloaded into the container.
 #
 RUN curl -LsSf https://astral.sh/uv/$(cat ./requirement-uv.txt | awk -F'==' '{print $2}' | tr -d ' \n')/install.sh | sh && \
     . $HOME/.local/bin/env && \
     uv sync --frozen --no-install-project && \
-    uv run ${WDIR}/builder/utils/bridge.py --shared
+    uv run ${WDIR}/zkb/utils/bridge.py --shared
 
 # activate .venv
 CMD [ "source", ".venv/bin/activate" ]

README.md

@@ -78,7 +78,7 @@ The kernel has the following features:
 
 ## Usage
 
-The custom build wrapper (aka "builder") consists of 2 core components and 3 primary commands:
+The custom build wrapper (aka "zkb") consists of 2 core components and 3 primary commands:
 
 Components:
 
@@ -92,8 +92,8 @@ Commands:
 - `bundle`.
 
 ```help
-$ python3 builder --help
-usage: builder [-h] [--clean] {kernel,assets,bundle} ...
+$ python3 zkb --help
+usage: zkb [-h] [--clean] {kernel,assets,bundle} ...
 
 A custom builder for the zero_kernel.
 
@@ -124,7 +124,7 @@ To run this tool in a `local` environment, you will need:
 ```sh
 # install uv version from project file
 python3 -m pip install -r requirement-uv.txt
-# make builder/ internal imports visible to itself
+# make zkb/ internal imports visible to itself
 export PYTHONPATH=$(pwd)
 # prepare and activate dev environment
 uv sync --frozen --no-install-project
@@ -138,8 +138,8 @@ Once you are finished working with the project, don't forget to disable the virt
 Kernel build process can be launched using the `kernel` subcommand.
 
 ```help
-$ python3 builder kernel --help
-usage: builder kernel [-h] --build-env {local,docker,podman} --base {los,pa,x,aosp}
+$ python3 zkb kernel --help
+usage: zkb kernel [-h] --build-env {local,docker,podman} --base {los,pa,x,aosp}
                       --codename CODENAME --lkv LKV [-c] [--clean-image] [--ksu]
 
 options:
@@ -161,8 +161,8 @@ options:
 As mentioned, there is also an asset downloader, which can collect latest versions of ROM, TWRP, Magisk and it's modules, Kali Chroot etc.
 
 ```help
-$ python3 builder assets --help
-usage: builder assets [-h] --build-env {local,docker,podman} --base {los,pa,x,aosp}
+$ python3 zkb assets --help
+usage: zkb assets [-h] --build-env {local,docker,podman} --base {los,pa,x,aosp}
                       --codename CODENAME --chroot {full,minimal} [--rom-only]
                       [--clean-image] [--clean] [--ksu]
 
@@ -203,8 +203,8 @@ Options `full` and `conan` collect all of the assets required to successfuly fla
 Option named `slim` is a much lighter version of `full` packaging, as only the ROM is collected from the asset list. This is done to reduce package sizes while ensuring the kernel+ROM compatibility.
 
 ```help
-$ python3 builder bundle --help
-usage: builder bundle [-h] --build-env {local,docker,podman} --base {los,pa,x,aosp}
+$ python3 zkb bundle --help
+usage: zkb bundle [-h] --build-env {local,docker,podman} --base {los,pa,x,aosp}
                       --codename CODENAME --lkv LKV --package-type
                       {conan,slim,full} [--conan-upload] [--clean-image] [--ksu]
 
@@ -231,19 +231,19 @@ Here are some examples of commands:
 **(Recommended)** Build kernel and collect ROM via Docker:
 
 ```sh
-python3 builder bundle --build-env=docker --base=los --codename=dumpling --lkv=4.4 --package-type=slim
+python3 zkb bundle --build-env=docker --base=los --codename=dumpling --lkv=4.4 --package-type=slim
 ```
 
 Build kernel locally:
 
 ```sh
-python3 builder kernel --build-env=local --base=los --codename=dumpling --lkv=4.4
+python3 zkb kernel --build-env=local --base=los --codename=dumpling --lkv=4.4
 ```
 
 Collect all of the assets locally:
 
 ```sh
-python3 builder assets --build-env=local --base=los --codename=dumpling --package-type=full
+python3 zkb assets --build-env=local --base=los --codename=dumpling --package-type=full
 ```
 
 ## See also

conanfile.py

@@ -23,8 +23,8 @@ def build(self):
             self.options.codename,
             self.options.chroot
         )
-        cmd = "python3 builder kernel {0} &&"\
-              "python3 builder assets {0} --clean"\
+        cmd = "python3 zkb kernel {0} &&"\
+              "python3 zkb assets {0} --clean"\
               .format(shared_args)
         print(f"[cmd] {cmd}")
         self.run(cmd)

zkb/configs/argument.py

@@ -66,7 +66,7 @@ def check_settings(self) -> None:
 
         # check if specified device is supported
         with open(
-            Path(__file__).absolute().parents[2] / "builder" / "manifests" / "devices.json", encoding="utf-8"
+            Path(__file__).absolute().parents[2] / "zkb" / "manifests" / "devices.json", encoding="utf-8"
         ) as f:
             devices = json.load(f)
 

zkb/core/kernel_builder.py

@@ -273,11 +273,11 @@ def patch_anykernel3(self) -> None:
         cm.remove(self.rmanager.paths["AnyKernel3"] / "models")
 
         fo.ucopy(
-            dcfg.root / "builder" / "modifications" / self._ucodename / "anykernel3" / "ramdisk",
+            dcfg.root / "zkb" / "modifications" / self._ucodename / "anykernel3" / "ramdisk",
             self.rmanager.paths["AnyKernel3"] / "ramdisk"
         )
         fo.ucopy(
-            dcfg.root / "builder" / "modifications" / self._ucodename / "anykernel3" / "anykernel.sh",
+            dcfg.root / "zkb" / "modifications" / self._ucodename / "anykernel3" / "anykernel.sh",
             self.rmanager.paths["AnyKernel3"] / "anykernel.sh"
         )
 
@@ -448,7 +448,7 @@ def patch_ksu(self) -> None:
         # either patch kernel or KernelSU sources, depending on Linux kernel version
         target_d = dcfg.root / "KernelSU" if self.lkv_src == "4.14" else self.rmanager.paths[self.codename]
         fo.ucopy(
-            dcfg.root / "builder" / "modifications" / self._ucodename / self.lkv_src / patch_name,
+            dcfg.root / "zkb" / "modifications" / self._ucodename / self.lkv_src / patch_name,
             target_d
         )
         os.chdir(target_d)
@@ -461,7 +461,7 @@ def patch_qcacld(self) -> None:
         goback = Path.cwd()
 
         fo.ucopy(
-            dcfg.root / "builder" / "modifications" / self._ucodename / self.lkv_src / patch_name,
+            dcfg.root / "zkb" / "modifications" / self._ucodename / self.lkv_src / patch_name,
             self.rmanager.paths[self.codename]
         )
         os.chdir(self.rmanager.paths[self.codename])
@@ -494,7 +494,7 @@ def patch_kernel(self) -> None:
 
         # apply .patch files
         fo.ucopy(
-            dcfg.root / "builder" / "modifications" / self._ucodename / self.lkv_src,
+            dcfg.root / "zkb" / "modifications" / self._ucodename / self.lkv_src,
             self.rmanager.paths[self.codename],
             ("kernelsu-compat.patch", "qcacld_pa.patch")
         )

zkb/engines/generic_container.py

@@ -81,7 +81,7 @@ def check_cache(self) -> bool:
     @property
     def builder_cmd(self) -> str:
         # prepare launch command
-        cmd = f"python3 {Path('builder', 'utils', 'bridge.py')}"
+        cmd = f"python3 {Path('zkb', 'utils', 'bridge.py')}"
         arguments = {
             "--command": self.command,
             "--codename": self.codename,

zkb/managers/resource.py

@@ -39,13 +39,13 @@ def read_data(self) -> None:
         device = ""
 
         # load JSON data
-        with open(dcfg.root / "builder" / "manifests" / "tools.json", encoding="utf-8") as f:
+        with open(dcfg.root / "zkb" / "manifests" / "tools.json", encoding="utf-8") as f:
             tools = json.load(f)
 
         # codename and ROM are undefined only when the Docker/Podman image is being prepared
         if self.codename and self.base:
 
-            with open(dcfg.root / "builder" / "manifests" / "devices.json", encoding="utf-8") as f:
+            with open(dcfg.root / "zkb" / "manifests" / "devices.json", encoding="utf-8") as f:
                 data = json.load(f)
                 # load data only for the required codename + linux kernel version combination
                 try: