begin unification of Pixel kernel build instructions

This can be fully unified for 6th through 9th generation Pixels with
Android 15 QPR2 due to 6th through 8th generation Pixels moving to the
6.1 LTS kernel branch.

2 files changed, 40 insertions, 72 deletions

diff --git a/static/build.html b/static/build.html
index 0572aee0..5bc78eb5 100644
--- a/static/build.html
+++ b/static/build.html
@@ -87,7 +87,7 @@
                                     <li><a href="#kernel-9th-generation-pixels">9th generation Pixels</a></li>
                                     <li><a href="#kernel-8th-generation-pixels">8th generation Pixels</a></li>
                                     <li><a href="#kernel-7th-generation-pixels">7th generation Pixels</a></li>
-                                    <li><a href="#kernel-6th-generation-pixels">6th generation Pixels</a></li>
+                                    <li><a href="#kernel-6th-and-7th-generation-pixels">6th and 7th generation Pixels</a></li>
                                     <li><a href="#kernel-5th-generation-pixels">5th generation Pixels</a></li>
                                     <li><a href="#kernel-4th-generation-pixels">4th generation Pixels</a></li>
                                 </ul>
@@ -792,21 +792,22 @@ cd android/kernel/pixel
 repo init -u https://github.com/GrapheneOS/kernel_manifest-pixel.git -b 15
 repo sync -j8</pre>
 
-                        <p>To build the caimito kernel for the Pixel 9, Pixel 9 Pro and Pixel 9 Pro XL:</p>
+                        <p>Select the correct kernel codename for the device model:</p>
 
-                        <pre>./build_caimito.sh --config=no_download_gki --config=no_download_gki_fips140 --lto=full</pre>
-
-                        <p>Replace the files in the OS source tree at
-                        <code>device/google/caimito-kernels/6.1/grapheneos/</code> with your build in
-                        <code>out/caimito/dist/</code>.</p>
+                        <ul>
+                            <li>comet: comet</li>
+                            <li>komodo: caimito</li>
+                            <li>caiman: caimito</li>
+                            <li>tokay: caimito</li>
+                        </ul>
 
-                        <p>To build the comet kernel for the Pixel 9 Pro Fold:</p>
+                        <p>To build the kernel and modules:</p>
 
-                        <pre>./build_comet.sh --config=no_download_gki --config=no_download_gki_fips140 --lto=full</pre>
+                        <pre>./build_<var>codename</var>.sh --config=no_download_gki --config=no_download_gki_fips140 --lto=full</pre>
 
                         <p>Replace the files in the OS source tree at
-                        <code>device/google/comet-kernels/6.1/grapheneos/</code> with your build in
-                        <code>out/comet/dist/</code>.</p>
+                        <code>device/google/<var>codename</var>-kernels/6.1/grapheneos/</code> with your build in
+                        <code>out/<var>codename</var>/dist/</code>.</p>
                     </section>
 
                     <section id="kernel-8th-generation-pixels">
@@ -819,68 +820,25 @@ cd android/kernel/zuma
 repo init -u https://github.com/GrapheneOS/kernel_manifest-zuma.git -b 15
 repo sync -j8</pre>
 
-                        <p>To build the shusky kernel for the Pixel 8 and Pixel 8 Pro:</p>
-
-                        <pre>./build_shusky.sh --config=no_download_gki --lto=full</pre>
-
-                        <p>Replace the files in the OS source tree at
-                        <code>device/google/shusky-kernels/5.15/grapheneos/</code> with your build in
-                        <code>out/shusky/dist/</code>.</p>
-
-                        <p>To build the akita kernel for the Pixel 8a:</p>
-
-                        <pre>./build_akita.sh --config=no_download_gki --lto=full</pre>
-
-                        <p>Replace the files in the OS source tree at
-                        <code>device/google/akita-kernels/5.15/grapheneos/</code> with your build in
-                        <code>out/akita/dist/</code>.</p>
-                    </section>
-
-                    <section id="kernel-7th-generation-pixels">
-                        <h4><a href="#kernel-7th-generation-pixels">7th generation Pixels</a></h4>
-
-                        <p>To sync the kernel sources:</p>
-
-                        <pre>mkdir -p android/kernel/gs
-cd android/kernel/gs
-repo init -u https://github.com/GrapheneOS/kernel_manifest-gs.git -b 15
-repo sync -j8</pre>
+                        <p>Select the correct kernel codename for the device model:</p>
 
-                        <p>To build the pantah kernel for the Pixel 7 and Pixel 7 Pro:</p>
-
-                        <pre>BUILD_AOSP_KERNEL=1 LTO=full ./build_cloudripper.sh</pre>
-
-                        <p>Replace the files in the OS source tree at
-                        <code>device/google/pantah-kernels/5.10/grapheneos/</code> with your build in
-                        <code>out/mixed/dist/</code>.</p>
-
-                        <p>To build the lynx kernel for the Pixel 7a:</p>
-
-                        <pre>BUILD_AOSP_KERNEL=1 LTO=full ./build_lynx.sh</pre>
-
-                        <p>Replace the files in the OS source tree at
-                        <code>device/google/lynx-kernels/5.10/grapheneos/</code> with your build in
-                        <code>out/mixed/dist/</code>.</p>
-
-                        <p>To build the tangorpro kernel for the Pixel Tablet:</p>
-
-                        <pre>BUILD_AOSP_KERNEL=1 LTO=full ./build_tangorpro.sh</pre>
-
-                        <p>Replace the files in the OS source tree at
-                        <code>device/google/tangorpro-kernels/5.10/grapheneos/</code> with your build in
-                        <code>out/mixed/dist/</code>.</p>
+                        <ul>
+                            <li>akita: akita</li>
+                            <li>husky: shusky</li>
+                            <li>shiba: shusky</li>
+                        </ul>
 
-                        <p>To build the felix kernel for the Pixel Fold:</p>
+                        <p>To build the kernel and modules:</p>
 
-                        <pre>BUILD_AOSP_KERNEL=1 LTO=full ./build_felix.sh</pre>
+                        <pre>./build_<var>codename</var>.sh --config=no_download_gki --lto=full</pre>
 
                         <p>Replace the files in the OS source tree at
-                        <code>device/google/felix-kernels/5.10/grapheneos/</code> with your build in
-                        <code>out/mixed/dist/</code>.</p>
+                        <code>device/google/<var>codename</var>-kernels/5.15/grapheneos/</code> with your build in
+                        <code>out/<var>codename</var>/dist/</code>.</p>
                     </section>
 
-                    <section id="kernel-6th-generation-pixels">
-                        <h4><a href="#kernel-6th-generation-pixels">6th generation Pixels</a></h4>
+                    <section id="kernel-6th-and-7th-generation-pixels">
+                        <h4><a href="#kernel-6th-and-7th-generation-pixels">6th and 7th generation Pixels</a></h4>
 
                         <p>To sync the kernel sources:</p>
 
@@ -889,17 +847,25 @@ cd android/kernel/gs
 repo init -u https://github.com/GrapheneOS/kernel_manifest-gs.git -b 15
 repo sync -j8</pre>
 
-                        <p>To build the raviole kernel for the Pixel 6 and Pixel 6 Pro:</p>
+                        <p>Select the correct kernel codename for the device model:</p>
 
-                        <pre>BUILD_AOSP_KERNEL=1 LTO=full ./build_slider.sh</pre>
+                        <ul>
+                            <li>felix: felix</li>
+                            <li>tangorpro: tangorpro</li>
+                            <li>lynx: lynx</li>
+                            <li>cheetah: pantah</li>
+                            <li>panther: pantah</li>
+                            <li>bluejay: bluejay</li>
+                            <li>raven: raviole</li>
+                            <li>oriole: raviole</li>
+                        </ul>
 
-                        <p>To build the bluejay kernel for the Pixel 6a:</p>
+                        <p>To build the kernel and modules:</p>
 
-                        <pre>BUILD_AOSP_KERNEL=1 LTO=full ./build_bluejay.sh</pre>
+                        <pre>BUILD_AOSP_KERNEL=1 LTO=full ./build_<var>codename</var>.sh</pre>
 
                         <p>Replace the files in the OS source tree at
-                        <code>device/google/raviole-kernels/5.10/grapheneos/</code> or
-                        <code>device/google/bluejay-kernels/5.10/grapheneos/</code> with your build in
+                        <code>device/google/<var>codename</var>-kernels/5.10/grapheneos/</code> with your build in
                         <code>out/mixed/dist/</code>.</p>
                     </section>
 
diff --git a/static/js/redirect.js b/static/js/redirect.js
index d63455a5..764292ee 100644
--- a/static/js/redirect.js
+++ b/static/js/redirect.js
@@ -36,6 +36,8 @@ const redirects = new Map([
     ["/install/web#fastboot-as-non-root", "/install/web#flashing-as-non-root"],
 
     ["/build#enabling-updatable-apex-components", "/build#apex-components"],
+    ["/build#kernel-6th-generation-pixels", "/build#kernel-6th-and-7th-generation-pixels"],
+    ["/build#kernel-7th-generation-pixels", "/build#kernel-6th-and-7th-generation-pixels"],
 
     // legacy devices
     ["/releases#marlin-stable", "/faq#legacy-devices"],