From a13b68f64191c841c6697ef08b911378961bd02a Mon Sep 17 00:00:00 2001
From: kraoc <tech@zogg.fr>
Date: Sat, 2 Mar 2024 15:45:39 +0100
Subject: [PATCH] Kernel 6.7.7 + Pilotes Nvidia fonctionnel

---
 README.md |  3 +--
 kernel.sh | 52 ++++++++++++++++++++++++++++++++++------------------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index e578a6b..a92630b 100644
--- a/README.md
+++ b/README.md
@@ -44,8 +44,7 @@ sudo bash kernel.sh 6.x 6.6.10
 
 - Modularisation des options par variable de conditionnement
 - Ajout du 'Fast Kernel Headers' (désactivé pour le moment)
-- Ajustements des options (tests en cours)
-- Objectif: permettre l'installation de pilote Nvidia
+- Ajustment des options permettant l'instalaltion de pilote Nvidia
 
 ### 2024-02-23
 
diff --git a/kernel.sh b/kernel.sh
index 6429c15..6ab9aa7 100644
--- a/kernel.sh
+++ b/kernel.sh
@@ -6,7 +6,8 @@ ENABLE=1         # enable some options
 MITIGATIONS=0    # enable/disable all mitigations
 UARCH=1          # apply more uarch patch
 FKH=0            # apply fast kernel headers patch
-TESTING=1        # add testing options
+TESTING=0        # add testing options
+UNCOMPRESS=1     # perform uncompress if already exist
 CLEANUP=1        # perform folder cleanup
 CLANG=0          # use Clang compiler (if not, use GCC)
 ARCH="x86-64-v4" # target architecture (uarch patch)
@@ -46,6 +47,11 @@ CONFIGMOD=0      # enable all mod config
 # In case of usage of uninstall.sh, you must reinstall 'linux-libc-dev' with the version of used kernel
 #
 
+#
+# To make a diff of different .config file:
+#   diff --side-by-side --suppress-common-lines --ignore-tab-expansion --ignore-trailing-space --ignore-space-change --ignore-blank-lines --text CONFIG1 CONFIG2
+#
+
 doBuildSystem() {
     echo "v$UPDATED"
 }
@@ -154,9 +160,8 @@ doDownload() {
 }
 
 # Uncompress
-doUncompress() {
+doPerformUncompress() {
     cd $WORKDIR
-
     doEchoStep "Uncompress"
     rm -rf linux-$VERSION
     tar -xaf linux-$VERSION.tar.xz
@@ -165,6 +170,17 @@ doUncompress() {
         echo ">>> Error in uncompress !"
         exit 1
     fi
+}
+doUncompress() {
+    if [ -d $WORKDIR ]; then
+        if [ $UNCOMPRESS == 1 ]; then
+            doPerformUncompress
+        else
+            doEchoStep "$BRANCH/$VERSION already present (don't uncompress)"
+        fi
+    else
+        doPerformUncompress
+    fi
 
     doSync
 }
@@ -1046,6 +1062,21 @@ doDefaultsEnable() {
         ./scripts/config --enable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD
         ./scripts/config --enable ZRAM_MEMORY_TRACKING
         ./scripts/config --enable CONFIG_ZRAM_MULTI_COMP
+        ./scripts/config --enable CONFIG_KEXEC
+        ./scripts/config --enable CONFIG_CRASH_CORE
+        ./scripts/config --enable CONFIG_CRASH_DUMP
+        ./scripts/config --enable CONFIG_KEXEC_CORE
+        ./scripts/config --enable CONFIG_HAVE_IMA_KEXEC
+        ./scripts/config --enable CONFIG_KEXEC_FILE
+        ./scripts/config --enable CONFIG_X86_5LEVEL
+        ./scripts/config --enable CONFIG_ARCH_SELECTS_KEXEC_FILE
+        ./scripts/config --enable CONFIG_CALL_PADDING
+        ./scripts/config --enable CONFIG_HAVE_ARCH_NODE_DEV_GROUP
+        ./scripts/config --enable CONFIG_WATCHDOG_CORE
+        ./scripts/config --enable CONFIG_DEVMEM
+        ./scripts/config --enable CONFIG_STRICT_DEVMEM
+        ./scripts/config --enable CONFIG_IO_STRICT_DEVMEM
+        ./scripts/config --enable CONFIG_COMPILE_TEST
 
         case ${ARCH} in
         "x86-64-v2")
@@ -1090,21 +1121,6 @@ doDefaultsTesting() {
             cp .config .config.testing.before
         fi
 
-        ./scripts/config --enable CONFIG_KEXEC
-        ./scripts/config --enable CONFIG_CRASH_CORE
-        ./scripts/config --enable CONFIG_CRASH_DUMP
-        ./scripts/config --enable CONFIG_KEXEC_CORE
-        ./scripts/config --enable CONFIG_HAVE_IMA_KEXEC
-        ./scripts/config --enable CONFIG_KEXEC_FILE
-        ./scripts/config --enable CONFIG_X86_5LEVEL
-        ./scripts/config --enable CONFIG_ARCH_SELECTS_KEXEC_FILE
-        ./scripts/config --enable CONFIG_CALL_PADDING
-        ./scripts/config --enable CONFIG_HAVE_ARCH_NODE_DEV_GROUP
-        ./scripts/config --enable CONFIG_WATCHDOG_CORE
-        ./scripts/config --enable CONFIG_DEVMEM
-        ./scripts/config --enable CONFIG_STRICT_DEVMEM
-        ./scripts/config --enable CONFIG_IO_STRICT_DEVMEM
-
         ./scripts/config --set-str CONFIG_LOCALVERSION '-zogg-test'
         cp .config .config.testing.after
     fi