From 4d5c7ef2a1f49e35bc4c09b9efe7706d7b001c6b Mon Sep 17 00:00:00 2001 From: maade93791 <70593890+maade69@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:53:50 +0300 Subject: [PATCH] replace 5.10/5.15 emulator kernel instructions with 6.1/6.6 ones --- static/build.html | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/static/build.html b/static/build.html index 4738c397..3b70d498 100644 --- a/static/build.html +++ b/static/build.html @@ -685,47 +685,35 @@ cd ../..

Emulator

-

To sync the 5.15 kernel sources:

+

To sync the 6.6 kernel sources:

-
mkdir -p android/kernel/5.15
-cd android/kernel/5.15
-repo init -u https://github.com/GrapheneOS/kernel_manifest-5.15.git -b 14
+                        
mkdir -p android/kernel/6.6
+cd android/kernel/6.6
+repo init -u https://github.com/GrapheneOS/kernel_manifest-6.6.git -b 15
 repo sync -j8
-

To build the 5.15 kernel image and modules for the emulator:

+

To build the 6.6 kernel image and modules for the emulator:

-
BUILD_CONFIG=common/build.config.gki.x86_64 build/build.sh
-cp -a out out-vendor-modules
-BUILD_CONFIG=common-modules/virtual-device/build.config.virtual_device.x86_64 OUT_DIR=out-vendor-modules/android13-5.15 build/build.sh
-find out-vendor-modules/android13-5.15/dist -type f -name '*.ko' -exec out/android13-5.15/common/scripts/sign-file sha256 out/android13-5.15/common/certs/signing_key.pem out/android13-5.15/common/certs/signing_key.x509 {} \;
+
ARCH=x86_64 common/build_virt.sh

Replace the prebuilts in the OS source tree:

-
ANDROID_BUILD_TOP=~/android/grapheneos-14
-cp out/android13-5.15/dist/bzImage $ANDROID_BUILD_TOP/kernel/prebuilts/5.15/x86_64/kernel-5.15
-cp out/android13-5.15/dist/System.map $ANDROID_BUILD_TOP/kernel/prebuilts/5.15/x86_64/System.map
-cp out-vendor-modules/android13-5.15/dist/*.ko $ANDROID_BUILD_TOP/kernel/prebuilts/common-modules/virtual-device/5.15/x86-64/
+
ANDROID_BUILD_TOP=~/android/grapheneos-14 ARCH=x86_64 common/update_virt_prebuilts.sh
-

To sync the 5.10 kernel sources:

+

To sync the 6.1 kernel sources:

-
mkdir -p android/kernel/5.10
-cd android/kernel/5.10
-repo init -u https://github.com/GrapheneOS/kernel_manifest-5.10.git -b 14
+                        
mkdir -p android/kernel/6.1
+cd android/kernel/6.1
+repo init -u https://github.com/GrapheneOS/kernel_manifest-6.1.git -b 14
 repo sync -j8
-

To build the 5.10 kernel image and modules for the emulator:

+

To build the 6.1 kernel image and modules for the emulator:

-
BUILD_CONFIG=common/build.config.gki.x86_64 build/build.sh
-cp -a out out-vendor-modules
-BUILD_CONFIG=common-modules/virtual-device/build.config.virtual_device.x86_64 OUT_DIR=out-vendor-modules/android13-5.10 build/build.sh
-find out-vendor-modules/android13-5.10/dist -type f -name '*.ko' -exec out/android13-5.10/common/scripts/sign-file sha256 out/android13-5.10/common/certs/signing_key.pem out/android13-5.10/common/certs/signing_key.x509 {} \;
+
ARCH=x86_64 common/build_virt.sh

Replace the prebuilts in the OS source tree:

-
ANDROID_BUILD_TOP=~/android/grapheneos-14
-cp out/android13-5.10/dist/bzImage $ANDROID_BUILD_TOP/kernel/prebuilts/5.10/x86_64/kernel-5.10
-cp out/android13-5.10/dist/System.map $ANDROID_BUILD_TOP/kernel/prebuilts/5.10/x86_64/System.map
-cp out-vendor-modules/android13-5.10/dist/*.ko $ANDROID_BUILD_TOP/kernel/prebuilts/common-modules/virtual-device/5.10/x86-64/
+
ANDROID_BUILD_TOP=~/android/grapheneos-14 ARCH=x86_64 common/update_virt_prebuilts.sh

You can configure the kernel version used for the x86_64 emulator in device/generic/goldfish/board/kernel/x86_64.mk.