PKGBUILD: untuck the way generic subarch is set

Previously a really convoluted two stage 'yes' invocation
was used with that required weird formatting.

Switch to using the good old configs enabling.

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = linux-clear
 	pkgdesc = Linux kernel with patches from Clear Linux which allow for higher performance.
-	pkgver = 6.11.7
+	pkgver = 6.12.6
 	pkgrel = 1
 	url = https://git.staropensource.de/JeremyStarTM/aur-linux-clear
 	arch = x86_64
@@ -18,18 +18,18 @@ pkgbase = linux-clear
 	makedepends = zstd
 	options = !strip
 	options = !debug
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.tar.sign
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.11.7.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.12.6.xz
-	source = cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.11.6-1477
+	source = cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.12.4-1518
 	source = more-uarches-20241018.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20241018.tar.gz
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = E27E5D8A3403A2EF66873BBCDEA66FF797772CDC
 	validpgpkeys = AC2B29BD34A6AFDDB3F68F35E7BFC8EC95861109
-	sha256sums = 55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e
+	sha256sums = b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb
 	sha256sums = SKIP
-	sha256sums = 4ccabe59805d7efd8165405624695255a87811cbea5c0e1d7a3981c21789b2ec
+	sha256sums = dd7c856f12d3e10f09743c1d3db35f91879d92890c9fb176405783c9c7cb0c54
 	sha256sums = SKIP
 	sha256sums = b3fd8b1c5bbd39a577afcccf6f1119fdf83f6d72119f4c0811801bdd51d1bc61
 

.gitignore

@@ -1,5 +1,6 @@
 cl-linux
 src
+pkg
 *.sign
 *.xz
 *.gz

LICENSE

@@ -0,0 +1,16 @@
+BSD Zero Clause License
+
+Copyright (c) 2018-2024 by Josip Ponjavic <josipponjavic@gmail.com>
+Copyright (c) 2024 by JeremyStarTM <jeremystartm@staropensource.de>
+Copyright (c) 2024 by Yaraslau Furman <yaro330@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

MAINTAINERS.md

@@ -0,0 +1,3 @@
+# Maintainers
+- [JeremyStarTM](https://git.staropensource.de/JeremyStarTM) <jeremystartm (at) staropensource (dot) de>
+- [yarost12](https://git.staropensource.de/yarost12) <yaro330 (at) gmail (com) com>

PKGBUILD

@@ -1,5 +1,12 @@
-# Maintainer: JeremyStarTM <jeremystartm@staropensource.de>
+#!/usr/bin/env bash
-# Maintainer: Josip Ponjavic <josipponjavic at gmail dot com>
+# shellcheck disable=SC2034 disable=SC2048 disable=SC2086 disable=SC2154
+
+# This PKGBUILD is/was authored by:
+# - JeremyStarTM <jeremystartm@staropensource.de>
+# - yarost12 <yaro330@gmail.com>
+# - Josip Ponjavic <josipponjavic at gmail dot com>
+#
+# For a list of maintainers see MAINTAINERS.md
 
 ### BUILD OPTIONS
 # You can modify these settings by executing "env _<setting>=<value> makepkg"
@@ -31,6 +38,25 @@
 #
 # Set to anything but null to activate.
 : "${_use_current:=""}"
+: "${_reuse_current:=""}"
+[[ -n "${_reuse_current}" ]] && \
+    warning "Please switch to using '_use_current' flag instead of '_reuse_current'" && \
+    _use_current="y"
+
+# Apply selected optimizations chosen by
+# the package maintainers to the config.
+#
+# Only takes effect if '_use_current'
+# is enabled. Keep disabled if you want
+# to reuse your existing kernel configuration
+# without any changes being applied to it.
+#
+# Set to anything but null to activate.
+: "${_optimize_defconfig:=""}"
+: "${_update_kconfig_on_reuse:=""}"
+[[ -n "${_update_kconfig_on_reuse}" ]] && \
+    warning "Please switch to using '_update_kconfig_on_reuse' flag instead of '_optimize_defconfig'" && \
+    _optimize_defconfig="y"
 
 # Determines whether the kernel configuration should be
 # copied into the source tree before compilation starts.
@@ -48,9 +74,10 @@
 # Set to anything but null to activate.
 : "${_localmodcfg:=""}"
 
-# Optionally select a sub architecture by number or
+# Optionally select a sub architecture by number or its Kconfig name,
-# leave blank, which will require user interaction during the build.
+# for example MCORE2 or MZEN4.
-# Note that the default option is 41.
+# Leaving it blank will require user interaction during the build.
+# Note that the default option is empty.
 #
 #  1. AMD Opteron/Athlon64/Hammer/K8 (MK8)
 #  2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3)
@@ -97,6 +124,18 @@
 #  43. AMD-Native optimizations autodetected by the compiler (MNATIVE_AMD)
 : "${_subarch:=""}"
 
+# Selects the x86-64 microarchitecture to compile for.
+# This value is only used by the GENERIC_CPU
+# subarchitecture and is required.
+# Can be either '1', '2', '3' or '4'
+#
+# Set to '1' by default
+#
+# For more information see:
+# https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
+: "${_subarch_microarch:="1"}"
+
+
 # Enable compilation with LLVM
 # Be warned, this is largely untested by me (JeremyStarTM). It *should* work,
 # but if it doesn't, write a comment and I'll fix it.
@@ -116,10 +155,10 @@
 ### BUILD OPTIONS END
 
 # Kernel version
-_kernel_major=6.11
+_kernel_major=6.12
-_kernel_minor=7
+_kernel_minor=6
 # Clear Linux patches version
-_clr=6-1477
+_clr=4-1518
 # kernel_compiler_patch version
 _kernelcompilerpatch="20241018"
 # Source directory names
@@ -147,10 +186,11 @@ source=(
 )
 
 [[ -n "${_use_llvm_lto}" ]] && BUILD_FLAGS=("LLVM=1" "LLVM_IAS=1")
+[[ -z "${_debug_script}" ]] && BUILD_FLAGS+=("-s")
 
-export KBUILD_BUILD_HOST=archlinux
+export "KBUILD_BUILD_HOST=archlinux"
-export KBUILD_BUILD_USER=${pkgbase}
+export "KBUILD_BUILD_USER=${pkgbase}"
-export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
+export "KBUILD_BUILD_TIMESTAMP=$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 # Applies all patches
 apply_patches() {
@@ -171,12 +211,27 @@ apply_patches() {
 
         patch -Np1 -i "${srcdir}/cl-linux/${i}" || true
     done
+
+    # Patch with kernel_compiler_patch patches.
+    # Do this before any defconfig invocations so we
+    # have all of the extra selectable uarches ready and selectable
+    patch -Np1 -i "$srcdir/kernel_compiler_patch-$_kernelcompilerpatch/more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch"
+}
+
+# Allows user to modify the kernel config
+modify_defconfig() {
+    [[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
+    [[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
+    [[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
+
+    # Don't crash if all three are false
+    true
 }
 
 # Copies the kernel config
 copy_defconfig() {
-    local _cur_major_ver="$(zcat /proc/config.gz | grep Linux | grep -o '[0-9]*[0-9]\.[0-9]*[0-9]')"
+    local _cur_major_ver="$(uname -r | grep -o '[0-9]*[0-9]\.[0-9]*[0-9]')"
-    [[ ${_cur_major_ver} != ${_kernel_major} ]] &&
+    [[ "${_cur_major_ver}" != "${_kernel_major}" ]] &&
         warning "Major version was updated, you should regen the defconfig"
 
     if [[ -s /proc/config.gz ]]; then
@@ -279,23 +334,35 @@ update_defconfig() {
     make ${BUILD_FLAGS[*]} olddefconfig
     diff -u $srcdir/cl-linux/config .config || :
 
-    # Patch with kernel_compiler_patch patches
+    # Here we slightly break the config by removing one of the
-    # This must be executed after olddefconfig
+    # members of the 'Processor family' selection.
-    # to allow for the next section to run.
+    # This causes oldconfig to always invoke that selection.
-    patch -Np1 -i "$srcdir/kernel_compiler_patch-$_kernelcompilerpatch/more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch"
+    sed -i '/CONFIG_GENERIC_CPU/d' .config || :
+    # For a slim chance that someone is building X86_32
+    sed -i '/CONFIG_M686/d' .config || :
 
-    # Set subarch automatically
+    if [ -n "${_subarch}" ]; then
-    [[ -n "${_subarch}" ]] && yes "${_subarch}" | make ${BUILD_FLAGS[*]} oldconfig
+        # check if subarch is a number
+        if [[ ${_subarch} =~ ^[0-9]+$ ]] && ((_subarch>=1)); then
+            if [ "${_subarch}" == "41" ]; then
+                scripts/config -e GENERIC_CPU
+                scripts/config --set-val X86_64_VERSION "${_subarch_microarch}"
+                make ${BUILD_FLAGS[*]} oldconfig
+            else
+                yes "${_subarch}" | make ${BUILD_FLAGS[*]} oldconfig
+            fi
+        # check that this option is present in the .config
+        elif [[ $(grep -c "${_subarch}" .config) -eq 1 ]]; then
+            scripts/config -e "${_subarch}"
+            make ${BUILD_FLAGS[*]} olddefconfig
+        else
+            warning "Unrecognized subarch value: ${_subarch}"
+            exit 1
+        fi
+    else
         # Ask for subarch
-    [[ -z "${_subarch}" ]] && make ${BUILD_FLAGS[*]} oldconfig
+        make ${BUILD_FLAGS[*]} oldconfig
-
+    fi
-    # Open configuration editors
-    [[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
-    [[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
-    [[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
-
-    # Save configuration
-    [[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
 }
 
 # Prepares the installation
@@ -305,7 +372,7 @@ prepare() {
     apply_patches
 
     [[ -n "${_use_current}" ]] && copy_defconfig
-    [[ -z "${_use_current}" ]] && update_defconfig
+    [[ -n "${_optimize_defconfig}" ]] || [[ -z "${_use_current}" ]] && update_defconfig
 
     # Read and apply modprobed database
     # See https://aur.archlinux.org/packages/modprobed-db
@@ -316,6 +383,13 @@ prepare() {
             echo ":: No modprobed.db file was found at ${HOME}/.config, skipping"
         fi
 
+    # Open configuration editors
+    modify_defconfig
+
+    # Save configuration
+    # shellcheck disable=SC2015
+    [[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
+
     # Write kernel version
     make -s kernelrelease > version
 }
@@ -336,7 +410,7 @@ _package() {
     install=linux.install
 
     cd "${_src_linux}" || exit 1
-    local modulesdir="${pkgdir}/usr/lib/modules/$(<version)"
+    local "modulesdir=${pkgdir}/usr/lib/modules/$(<version)"
 
     # Create boot image
     # systemd expects to find the kernel there to allow hibernation
@@ -360,7 +434,7 @@ _package-headers() {
     depends=("pahole")
 
     cd "${_src_linux}" || exit 1
-    local builddir="${pkgdir}/usr/lib/modules/$(<version)/build"
+    local "builddir=${pkgdir}/usr/lib/modules/$(<version)/build"
 
     install -Dt "${builddir}" -m644 .config Makefile Module.symvers System.map \
         localversion.* version vmlinux
@@ -437,8 +511,8 @@ _package-headers() {
 pkgname=("$pkgbase" "$pkgbase-headers")
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {
-    $(declare -f "_package${_p#$pkgbase}")
+    $(declare -f "_package${_p#"$pkgbase"}")
-    _package${_p#$pkgbase}
+    _package${_p#"$pkgbase"}
   }"
 done
 
@@ -449,8 +523,8 @@ validpgpkeys=(
   "E27E5D8A3403A2EF66873BBCDEA66FF797772CDC"  # Sasha Levin
   "AC2B29BD34A6AFDDB3F68F35E7BFC8EC95861109"  # Ben Hutchings
 )
-sha256sums=("55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e"
+sha256sums=("b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb"
             "SKIP"
-            "4ccabe59805d7efd8165405624695255a87811cbea5c0e1d7a3981c21789b2ec"
+            "dd7c856f12d3e10f09743c1d3db35f91879d92890c9fb176405783c9c7cb0c54"
             "SKIP"
             "b3fd8b1c5bbd39a577afcccf6f1119fdf83f6d72119f4c0811801bdd51d1bc61")

README.md

@@ -15,10 +15,12 @@ The PKGBUILD file supports customization via environment variables. Here's a lis
 - `_makenconfig`: Invokes `make nconfig` (ncurses-based nicer configuration menu) before compilation starts
 - `_makexconfig`: Invokes `make xconfig` (X11-based GUI configuration menu) before compilation starts
 - `_use_current`: Will use the configuration of the running kernel, if the running kernel is compiled with `IKCONFIG_PROC`
+- `_optimize_defconfig`: Applies package maintainer-picked configuration changes to your defconfig. Only takes effect with `_use_current` being enabled
 - `_copyfinalconfig`: Copies the final kernel configuration into the repository root as `kconfig-new` before compilation starts
 - `_localmodcfg`: Only compiles modules found in modprobed-db's database (which decreases compilation time and kernel size)
 - `_use_llvm_lto`: Compiles the kernel with LLVM instead of GCC. Should work, if not open an issue
 - `_subarch`: Specifies the subarchitecture to compile for (see the [PKGBUILD file](https://git.staropensource.de/JeremyStarTM/aur-linux-clear/src/branch/develop/PKGBUILD) for a list of all subarches). Default is `41` (Generic x86-64), which is compatible with all amd64 processors. Must be a number
+- `_subarch_microarch`: Specifies the microarchitecture to compile for. Only applies to and is required by the `GENERIC_CPU` subarch. Must be a number between `1` and `4` ([click for more information](https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels))
 - `_debug`: Force enables debug options when set to `y`, force disables debug options when set to `n` or uses the config defaults when unset
 
 All of these variables just need to be set for them to apply, except for `_subarch` and `_debug`. See their descriptions for more information.
@@ -34,9 +36,16 @@ This command only needs to be executed once.
 Please only submit issues if they aren't bug reports about the package or help requests.
 Please keep them on the AUR only. This prevents unnecessary signups.
 
+## Branches
+This repository (at least if you view it on [sos!git](https://git.staropensource.de/JeremyStarTM/aur-linux-clear))
+has two branches: `master` and `develop`. The `master` branch is the stable branch, where stable changes
+are introduced. The `develop` branch is (as you might have already guessed) the development branch.
+
+Please only submit PRs to the `develop` branch. Pull requests to the `master` branch will be rejected.
+
 ## License
-This package does not yet have a license as the original repository (before [me](https://git.staropensource.de/JeremyStarTM) becoming it's maintainer) did not have one yet.
+The linux-clear package is licensed under the BSD Zero-Clause License.
-I have contacted [metak](https://aur.archlinux.org/account/metak) (the previous maintainer) to negotiate a license.
+I ([JeremyStarTM](https://git.staropensource.de/JeremyStarTM)) negotiated it with [metak](https://aur.archlinux.org/account/metak) (the previous maintainer) and [yarost12](https://git.staropensource.de/yarost12) (co-maintainer).
 
 ## Build tool
-*If you want a dead simple way to compile this package, you can [try out my build tool](https://git.staropensource.de/JeremyStarTM/jstm-optimized). It includes a few no nonsense changes to the kernel configuration and allows you to configure the PKGBUILD in a simple manner to decrease build time. If you don't want that, using `makepkg` as-is works fine too.*
+~~*If you want a dead simple way to compile this package, you can [try out my build tool](https://git.staropensource.de/JeremyStarTM/jstm-optimized). It includes a few no nonsense changes to the kernel configuration and allows you to configure the PKGBUILD in a simple manner to decrease build time. If you don't want that, using `makepkg` as-is works fine too.*~~ Deprecated until rewrite.

linux.install

@@ -1,14 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-_5_2_2_2_changes() {
+function _5_2_2_2_changes() {
-  echo ":: A new command line option was added: add page_alloc.shuffle=1"
+ echo ":: Update 5.2.2-2: A new command line option was added: add page_alloc.shuffle=1"
 }
 
-_5_2_9_6_changes() {
+function _5_2_9_6_changes() {
-  echo ":: Microcode is no longer builtin. See https://wiki.archlinux.org/index.php/Microcode"
+ echo ":: Update 5.2.9-6: Microcode is no longer builtin. See https://wiki.archlinux.org/index.php/Microcode"
 }
 
-post_install() {
+function post_install() {
  echo ":: Clear Linux bundles a custom command line which must be applied manually on other distributions."
  echo "  This is their default command line:"
  echo "  quiet console=tty0 console=ttyS0,115200n8 cryptomgr.notests initcall_debug"
@@ -17,15 +17,13 @@ post_install() {
  echo "  rootfstype=ext4,btrfs,xfs,f2fs tsc=reliable rw"
 }
 
-post_upgrade() {
+function post_upgrade() {
-  local v upgrades=(
+ local version upgrades=(
   5.2.2-2
   5.2.9-6
  )
 
-  for v in "${upgrades[@]}"; do
+ for version in "${upgrades[@]}"; do
-    if [[ $(vercmp "${v}" "$2") -eq 1 ]]; then
+  [[ $(vercmp "${version}" "$2") -eq 1 ]] && "_${version//[.-]/_}_changes"
-      "_${v//[.-]/_}_changes"
-    fi
  done
 }