6.12.11-1 (clr 6.12.11-1537)

- Check if there's an option starting with CONFIG_
- Add comment describing the numerical case a bit better

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = linux-clear
 	pkgdesc = Linux kernel with patches from Clear Linux which allow for higher performance.
-	pkgver = 6.12.1
+	pkgver = 6.12.11
 	pkgrel = 1
 	url = https://git.staropensource.de/JeremyStarTM/aur-linux-clear
 	arch = x86_64
@@ -16,12 +16,13 @@ pkgbase = linux-clear
 	makedepends = tar
 	makedepends = xz
 	makedepends = zstd
+	makedepends = pv
 	options = !strip
 	options = !debug
 	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.12.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.12.1.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.12.11.xz
-	source = cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.12.1-1493
+	source = cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.12.11-1537
 	source = more-uarches-20241018.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20241018.tar.gz
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -29,7 +30,7 @@ pkgbase = linux-clear
 	validpgpkeys = AC2B29BD34A6AFDDB3F68F35E7BFC8EC95861109
 	sha256sums = b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb
 	sha256sums = SKIP
-	sha256sums = 7013d2a29f02ca7508c7d6264afafdc0c0ee38cf5eef350e7b7f34f1393f2518
+	sha256sums = 86b8dc37ea5abb31bc829820f0ee6c340815e7b9f9907657374b2c085487b70f
 	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,8 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2034 disable=SC2048 disable=SC2086 disable=SC2154
-# Maintainer: JeremyStarTM <jeremystartm@staropensource.de>
+
-# Maintainer: Josip Ponjavic <josipponjavic at gmail dot com>
+# This PKGBUILD is/was authored by:
-# Contributor: yarost12 <yaro330@gmail.com>
+# - 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"
@@ -62,9 +66,17 @@
 # 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.
+# 
+# Important notice for maintainers:
+# Make sure to update the '_subarch'
+# section inside update_defconfig()
+# if this list is updated on updating
+# the kernel compiler patchset.
 #
 #  1. AMD Opteron/Athlon64/Hammer/K8 (MK8)
 #  2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3)
@@ -111,6 +123,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.
@@ -127,13 +151,32 @@
 # Set to anything but null to activate.
 : "${_debug:=""}"
 
+# Show full compilation output
+# Enabling this will cause 'make' to display
+# all targets currently compiling instead of
+# the 'pv' magic we're doing.
+#
+# Set to anything but null to activate.
+: "${_show_compile:=""}"
+
 ### BUILD OPTIONS END
 
+### DEPRECATED BUILD OPTIONS START
+
+# See '_use_current'
+: "${_reuse_current:=""}"
+
+# See '_optimize_defconfig'
+: "${_update_kconfig_on_reuse:=""}"
+
+### DEPRECATED BUILD OPTIONS END
+
+
 # Kernel version
 _kernel_major=6.12
-_kernel_minor=1
+_kernel_minor=11
 # Clear Linux patches version
-_clr=1-1493
+_clr=11-1537
 # kernel_compiler_patch version
 _kernelcompilerpatch="20241018"
 # Source directory names
@@ -150,6 +193,7 @@ url="https://git.staropensource.de/JeremyStarTM/aur-linux-clear"
 license=(GPL-2.0-only)
 makedepends=("bc" "cpio" "gettext" "git" "libelf" "pahole" "perl" "python" "tar" "xz" "zstd")
 [[ -n "${_use_llvm_to}" ]] && makedepends+=("clang" "llvm" "lld")
+[[ -z "${_show_compile}" ]] && makedepends+=("pv")
 options=("!strip" "!debug")
 [[ "${_debug}" == "y" ]] && options=("!strip")
 source=(
@@ -166,8 +210,20 @@ export "KBUILD_BUILD_HOST=archlinux"
 export "KBUILD_BUILD_USER=${pkgbase}"
 export "KBUILD_BUILD_TIMESTAMP=$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
+# Check for deprecated settings
+_check_deprecated_settings() {
+    if [ -n "${_update_kconfig_on_reuse}" ]; then
+        warning "Please switch to using '_update_kconfig_on_reuse' flag instead of '_optimize_defconfig'"
+        _optimize_defconfig="y"
+    fi
+    if [ -n "${_reuse_current}" ]; then
+        warning "Please switch to using '_use_current' flag instead of '_reuse_current'"
+        _use_current="y"
+    fi
+}
+
 # Applies all patches
-apply_patches() {
+_apply_patches() {
     # Patch with kernel version patches
     patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
 
@@ -185,10 +241,15 @@ 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() {
+_modify_defconfig() {
     [[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
     [[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
     [[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
@@ -198,8 +259,8 @@ modify_defconfig() {
 }
 
 # Copies the kernel config
-copy_defconfig() {
+_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}" ]] &&
         warning "Major version was updated, you should regen the defconfig"
 
@@ -215,7 +276,7 @@ copy_defconfig() {
 }
 
 # Updates the kernel config
-update_defconfig() {
+_update_defconfig() {
     # Copy configuration file (if found)
     if [ -f "${startdir}/kconfig" ]; then
         echo ":: Using configuration file \"${startdir}/kconfig\""
@@ -303,25 +364,67 @@ 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
+    case ${_subarch} in
-    [[ -n "${_subarch}" ]] && yes "${_subarch}" | make ${BUILD_FLAGS[*]} oldconfig
+        "")
-    # Ask for subarch
+            # Ask for subarch if none provided
-    [[ -z "${_subarch}" ]] && make ${BUILD_FLAGS[*]} oldconfig
+            make "${BUILD_FLAGS[@]}" oldconfig
+            ;;
+        "41" | "GENERIC_CPU")
+            scripts/config -e GENERIC_CPU
+            scripts/config --set-val X86_64_VERSION "${_subarch_microarch}"
+            make "${BUILD_FLAGS[@]}" oldconfig
+            ;;
+        [1-9]|[1-3][0-9]|[4][0-3]|43)
+            # 1 to 9, 10 to 39, 40 to 43
+            # 43 is the last supported value here, refer to the _subarch
+            # documentation above and keep the last section of this check
+            # in sync with the supported value.
+            # stderr checks below shouldn't be needed with the above check in place,
+            # but will be left in-place regardless in case of future updates
+            # breaking something
+
+            # We're only interested in stderr
+            {
+                local __ERROR=$(echo "${_subarch}" | make "${BUILD_FLAGS[@]}" oldconfig 2>&1 1>&$out)
+            } {out}>/dev/null
+
+            # Invoke echo to sanitize the __ERROR, it can contain a newline or a \r
+            # symbol, thus breaking the script
+            if [[ -n "$(echo $__ERROR)" ]]; then
+                warning "Selected subarch: ${_subarch} is not supported"
+                exit
+            fi
+            ;;
+        *)
+            # String - check if it exists in .config and if it does - set it
+            if grep -q -e "CONFIG_${_subarch}[[:space:]]" -e "CONFIG_${_subarch}=" .config; then
+                # Check if option exists in .config
+                scripts/config -e "${_subarch}"
+                make "${BUILD_FLAGS[@]}" olddefconfig
+            else
+                warning "Unrecognized subarch value: ${_subarch}"
+                exit
+            fi
+            ;;
+    esac
 }
 
 # Prepares the installation
 prepare() {
     cd "${_src_linux}" || exit 1
 
-    apply_patches
+    _check_deprecated_settings
+    _apply_patches
 
-    [[ -n "${_use_current}" ]] && copy_defconfig
+    [[ -n "${_use_current}" ]] && _copy_defconfig
-    [[ -n "${_optimize_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
@@ -333,7 +436,7 @@ prepare() {
         fi
 
     # Open configuration editors
-    modify_defconfig
+    _modify_defconfig
 
     # Save configuration
     # shellcheck disable=SC2015
@@ -346,7 +449,11 @@ prepare() {
 # Build kernel
 build() {
     cd "${_src_linux}" || exit 1
+    if [ -n "${_show_compile}" ]; then
         make ${BUILD_FLAGS[*]} all
+    else
+        make ${BUILD_FLAGS[*]} all | pv -l -F "Elapsed time: %t, targets per sec: %a" > /dev/null
+    fi
 }
 
 # Packages the kernel package
@@ -474,6 +581,6 @@ validpgpkeys=(
 )
 sha256sums=("b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb"
             "SKIP"
-            "7013d2a29f02ca7508c7d6264afafdc0c0ee38cf5eef350e7b7f34f1393f2518"
+            "86b8dc37ea5abb31bc829820f0ee6c340815e7b9f9907657374b2c085487b70f"
             "SKIP"
             "b3fd8b1c5bbd39a577afcccf6f1119fdf83f6d72119f4c0811801bdd51d1bc61")

README.md

@@ -15,11 +15,14 @@ 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
+- `_show_compile`: Enables verbose-er compilation output and displays all executing `make` targets
 
 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 +37,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
 }