fix: update defconfig definition for 4.14, adjust make flags

seppzer0 · Nov 17, 2023 · 6c6112b · 6c6112b
1 parent e09fefa
commit 6c6112b
Show file tree

Hide file tree

Showing 9 changed files with 188 additions and 121 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ job-build:
     - python3 scripts/multi_build.py
   artifacts:
     paths:
-      - "multi-build/"
+      - "multi-build/zero-*.zip"
     when: on_success
     expire_in: never
   rules:

diff --git a/README.md b/README.md
@@ -1,18 +1,12 @@
-# zero_kernel — an Android kernel w/ Kali NetHunter support
+# zero_kernel
 
-## **Disclaimer**
-
-**This kernel is made for educational purposes only.**
-
-**I am not responsible for anything that may or may not happen to your device by installing any custom ROMs and/or kernels.**
-
-**Anything you do with this kernel you do at your own risk. By using it, you take the responsibility upon yourself and in case of any issue you are not to blame me or other related contributors.**
+An Android kernel with Kali NetHunter functionality.
 
 ## Contents
 
-- [zero\_kernel — an Android kernel w/ Kali NetHunter support](#zero_kernel--an-android-kernel-w-kali-nethunter-support)
-  - [**Disclaimer**](#disclaimer)
+- [zero\_kernel](#zero_kernel)
   - [Contents](#contents)
+  - [**Disclaimer**](#disclaimer)
   - [Kernel Features](#kernel-features)
   - [Supported ROMs and devices](#supported-roms-and-devices)
       - [ROMs](#roms)
@@ -27,6 +21,14 @@
   - [Credits](#credits)
   - [See also](#see-also)
 
+## **Disclaimer**
+
+**This kernel is made for educational purposes only.**
+
+**I am not responsible for anything that may or may not happen to your device by installing any custom ROMs and/or kernels.**
+
+**Anything you do with this kernel you do at your own risk. By using it, you take the responsibility upon yourself and in case of any issue you are not to blame me or other related contributors.**
+
 ## Kernel Features
 
 The kernel has the following features:

diff --git a/conanfile.py b/conanfile.py
@@ -6,7 +6,7 @@ class S0nhConan(ConanFile):
     version = "0.3.3"
     author = "seppzer0"
     url = "https://gitlab.com/api/v4/projects/40803264/packages/conan"
-    description = "An Android kernel w/ Kali NetHunter support."
+    description = "An Android kernel with Kali NetHunter functionality."
     topics = ("zero_kernel", "kali-nethunter")
     settings = None
     options = {

diff --git a/docs/FLASHING.md b/docs/FLASHING.md
@@ -23,7 +23,7 @@ Listed below files are required:
 - compiled kernel, obviously;
 - ROM;
 - Magisk or KernelSU;
-- TWRP, the official 3.7.0 version (supports operations with encrypted partitions);
+- TWRP, the unofficial 3.7.0 version (supports operations with encrypted and dynamic partitions);
 - DM-Verity and Force Encrypt disabler;
 - Kali NetHunter + Kali NetHunter Terminal apps;
 - Kali NetHunter Chroot (you can do this later, but it would be easier to download this beforehand);

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,6 +11,9 @@ conan = "~1"
 argparse = "*"
 requests = "*"
 bandit = "*"
+pathlib = "*"
+dataclasses = "*"
+typing = "*"
 
 
 [build-system]

diff --git a/wrapper/manifests/tools.json b/wrapper/manifests/tools.json
@@ -29,7 +29,7 @@
         "type": "git",
         "path": "KernelSU",
         "url": "https://github.com/tiann/KernelSU",
-        "branch": "v0.7.0",
+        "branch": "v0.7.1",
         "commit": ""
     }
 }
diff --git a/wrapper/models/assets.py b/wrapper/models/assets.py
@@ -95,7 +95,7 @@ def run(self) -> None:
                 "https://store.nethunter.com/NetHunterKeX.apk",
                 "https://store.nethunter.com/NetHunterStore.apk",
                 "https://store.nethunter.com/NetHunterTerminal.apk",
-                "https://eu.dl.twrp.me/cheeseburger_dumpling/twrp-3.7.0_12-1-cheeseburger_dumpling.img",
+                "https://sourceforge.net/projects/op5-5t/files/Android-12/TWRP/twrp-3.7.0_12-5-dyn-cheeseburger_dumpling.img/download",
                 "https://kali.download/nethunter-images/current/rootfs/kalifs-arm64-{}.tar.xz".format(self._chroot),
                 "https://github.com/mozilla-mobile/firefox-android/releases/download/fenix-v117.1.0/fenix-117.1.0-arm64-v8a.apk",
                 "https://f-droid.org/F-Droid.apk",

diff --git a/wrapper/models/kernel.py b/wrapper/models/kernel.py
@@ -77,12 +77,12 @@ def _defconfig(self) -> str:
         """Determine defconfig file name.
 
         Depending on Linux kernel version (4.4 or 4.14)
-        the location for PA's defconfig is different.
+        the location for defconfig file may vary.
         """
         defconfigs = {
             "los": "lineage_oneplus5_defconfig",
-            "pa": "paranoid_defconfig",
-            "x": "oneplus5_defconfig"
+            "pa": "defconfig" if self._linux_kernel_version == "4.14" else "paranoid_defconfig",
+            "x": "msm8998_oneplus_android_defconfig" if self._linux_kernel_version == "4.14" else "oneplus5_defconfig"
         }
         return defconfigs[self._rom]
 
@@ -541,7 +541,8 @@ def _build(self) -> None:
         cmd1 = "make -j{} O=out {} "\
                "ARCH=arm64 "\
                "SUBARCH=arm64 "\
-               "LLVM=1"\
+               "LLVM=1" \
+               "LLVM_IAS=1"\
                 .format(punits, self._defconfig)
         cmd2 = "make -j{} O=out "\
                "ARCH=arm64 "\