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.11.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.11.7.xz
-	source = cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.11.6-1477
+	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.6.xz
+	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>
-# Maintainer: Josip Ponjavic <josipponjavic at gmail dot com>
+#!/usr/bin/env bash
+# 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"
@@ -7,17 +14,17 @@
 # env _makemenuconfig=y _copyfinalconfig=y _subarch=30 makepkg
 
 # Tweak kernel options prior to a build via menuconfig.
-# 
+#
 # Set to anything but null to activate.
 : "${_makemenuconfig:=""}"
 
 # Tweak kernel options prior to a build via nconfig.
-# 
+#
 # Set to anything but null to activate.
 : "${_makenconfig:=""}"
 
 # Tweak kernel options prior to a build via xconfig.
-# 
+#
 # Set to anything but null to activate.
 : "${_makexconfig:=""}"
 
@@ -31,26 +38,46 @@
 #
 # 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.
-# 
+#
 # Set to anything but null to activate.
 : "${_copyfinalconfig:=""}"
 
 # Only compile active modules to VASTLY reduce the number
 # of modules built and the build time.
-# 
+#
 # To keep track of which modules are needed for your specific system/hardware,
 # give modprobed-db a try: https://aur.archlinux.org/packages/modprobed-db
-# 
+#
 # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db
 # Set to anything but null to activate.
 : "${_localmodcfg:=""}"
 
-# Optionally select a sub architecture by number or
-# leave blank, which will require user interaction during the build.
-# Note that the default option is 41.
+# Optionally select a sub architecture by number or its Kconfig name,
+# for example MCORE2 or MZEN4.
+# 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,10 +124,22 @@
 #  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.
-# 
+#
 # Set to anything but null to activate.
 : "${_use_llvm_lto:=""}"
 
@@ -109,17 +148,17 @@
 # Set to 'y' to force enable, 'n' to force disable or '' to ignore debug options.
 # Leaving the setting empty will use the kernel configuration setting to determine
 # if debug options shall be enabled/disabled.
-# 
+#
 # Set to anything but null to activate.
 : "${_debug:=""}"
 
 ### BUILD OPTIONS END
 
 # Kernel version
-_kernel_major=6.11
-_kernel_minor=7
+_kernel_major=6.12
+_kernel_minor=6
 # Clear Linux patches version
-_clr=6-1477
+_clr=4-1518
 # kernel_compiler_patch version
 _kernelcompilerpatch="20241018"
 # Source directory names
@@ -147,21 +186,21 @@ 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_USER=${pkgbase}
-export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
+export "KBUILD_BUILD_HOST=archlinux"
+export "KBUILD_BUILD_USER=${pkgbase}"
+export "KBUILD_BUILD_TIMESTAMP=$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
-prepare() {
-    cd "${_src_linux}" || exit 1
-    
+# Applies all patches
+apply_patches() {
     # Patch with kernel version patches
     patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
-    
+
     # Set version
     echo "-${pkgrel}" > localversion.10-pkgrel
     echo "${pkgbase#linux}" > localversion.20-pkgname
-    
+
     # Patch with Clear Linux patches
     for i in $(grep '^Patch' "${srcdir}"/cl-linux/linux.spec|grep -Ev '^Patch0132|^Patch0109|^Patch0118|^Patch0113|^Patch0138|^Patch0139|^Patch0147' | sed -n 's/.*: //p'); do
         if [ -n "${_use_llvm_lto}" ]; then
@@ -169,10 +208,45 @@ prepare() {
                 continue
             fi
         fi
-        
+
         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="$(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"
+
+    if [[ -s /proc/config.gz ]]; then
+        # modprobe configs
+        zcat /proc/config.gz > ./.config
+        make ${BUILD_FLAGS[*]} olddefconfig
+    else
+        warning "Your kernel was not compiled with IKCONFIG_PROC."
+        warning "Unable to read kernel configuration, aborting."
+        exit
+    fi
+}
+
+# Updates the kernel config
+update_defconfig() {
     # Copy configuration file (if found)
     if [ -f "${startdir}/kconfig" ]; then
         echo ":: Using configuration file \"${startdir}/kconfig\""
@@ -181,16 +255,16 @@ prepare() {
         echo ":: Using configuration file \"${srcdir}/${pkgbase}/config\""
         cp -Tf $srcdir/cl-linux/config ./.config
     fi
-    
+
     # Extra configuration
     # General setup
     scripts/config --set-str DEFAULT_HOSTNAME archlinux \
-                   -e IKCONFIG \
-                   -e IKCONFIG_PROC \
-                   -u RT_GROUP_SCHED
+                -e IKCONFIG \
+                -e IKCONFIG_PROC \
+                -u RT_GROUP_SCHED
     # Power management and ACPI options
     scripts/config -e ACPI_REV_OVERRIDE_POSSIBLE \
-                   -e ACPI_TABLE_UPGRADE
+                -e ACPI_TABLE_UPGRADE
     # Virtualization
     scripts/config -e KVM_SMM
     # General architecture-dependent options
@@ -201,88 +275,105 @@ prepare() {
     scripts/config -e NETFILTER_INGRESS
     # Device Drivers
     scripts/config -e FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER \
-                   -e DELL_SMBIOS_SMM \
-                   -m PATA_JMICRON \
-                   -E SOUND SOUND_OSS_CORE \
-                   -e SND_OSSEMUL \
-                   -M SND_OSSEMUL SND_MIXER_OSS \
-                   -M SND_MIXER_OSS SND_PCM_OSS \
-                   -E SND_PCM_OSS SND_PCM_OSS_PLUGINS \
-                   -m AGP -M AGP AGP_INTEL -M AGP_INTEL AGP_VIA
+                -e DELL_SMBIOS_SMM \
+                -m PATA_JMICRON \
+                -E SOUND SOUND_OSS_CORE \
+                -e SND_OSSEMUL \
+                -M SND_OSSEMUL SND_MIXER_OSS \
+                -M SND_MIXER_OSS SND_PCM_OSS \
+                -E SND_PCM_OSS SND_PCM_OSS_PLUGINS \
+                -m AGP -M AGP AGP_INTEL -M AGP_INTEL AGP_VIA
     # Kernel hacking -> Compile-time checks and compiler options -> Make section mismatch errors non-fatal
     scripts/config -e SECTION_MISMATCH_WARN_ONLY
     # File systems
     scripts/config -m NTFS3_FS \
-                   -e NTFS3_LZX_XPRESS \
-                   -e NTFS3_FS_POSIX_ACL
+                -e NTFS3_LZX_XPRESS \
+                -e NTFS3_FS_POSIX_ACL
     scripts/config -m SMB_SERVER \
-                   -e SMB_SERVER_SMBDIRECT \
-                   -e SMB_SERVER_CHECK_CAP_NET_ADMIN \
-                   -e SMB_SERVER_KERBEROS5
+                -e SMB_SERVER_SMBDIRECT \
+                -e SMB_SERVER_CHECK_CAP_NET_ADMIN \
+                -e SMB_SERVER_KERBEROS5
     # Security options
     scripts/config -e SECURITY_SELINUX \
-                   -e SECURITY_SELINUX_BOOTPARAM \
-                   -e SECURITY_SMACK \
-                   -e SECURITY_SMACK_BRINGUP \
-                   -e SECURITY_SMACK_NETFILTER \
-                   -e SECURITY_SMACK_APPEND_SIGNALS \
-                   -e SECURITY_TOMOYO \
-                   -e SECURITY_APPARMOR \
-                   -e SECURITY_YAMA
+                -e SECURITY_SELINUX_BOOTPARAM \
+                -e SECURITY_SMACK \
+                -e SECURITY_SMACK_BRINGUP \
+                -e SECURITY_SMACK_NETFILTER \
+                -e SECURITY_SMACK_APPEND_SIGNALS \
+                -e SECURITY_TOMOYO \
+                -e SECURITY_APPARMOR \
+                -e SECURITY_YAMA
     # Security options -> Landlock options
     scripts/config -e SECURITY_LANDLOCK
     # Library routines
     scripts/config -k -e FONT_TER16x32
-    
+
     # Enable LLVM compilation
     [[ -n "${_use_llvm_lto}" ]] && scripts/config -d LTO_NONE \
-                                                  -e LTO \
-                                                  -e LTO_CLANG \
-                                                  -e ARCH_SUPPORTS_LTO_CLANG \
-                                                  -e ARCH_SUPPORTS_LTO_CLANG_THIN \
-                                                  -e HAS_LTO_CLANG \
-                                                  -e LTO_CLANG_THIN \
-                                                  -e HAVE_GCC_PLUGINS
-    
+                                                -e LTO \
+                                                -e LTO_CLANG \
+                                                -e ARCH_SUPPORTS_LTO_CLANG \
+                                                -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+                                                -e HAS_LTO_CLANG \
+                                                -e LTO_CLANG_THIN \
+                                                -e HAVE_GCC_PLUGINS
+
     # Enable or disable debug settings
     [[ "${_debug}" == "y" ]] && scripts/config -e DEBUG_INFO \
-                                               -e DEBUG_INFO_BTF \
-                                               -e DEBUG_INFO_DWARF4 \
-                                               -e PAHOLE_HAS_SPLIT_BTF \
-                                               -e DEBUG_INFO_BTF_MODULES
+                                            -e DEBUG_INFO_BTF \
+                                            -e DEBUG_INFO_DWARF4 \
+                                            -e PAHOLE_HAS_SPLIT_BTF \
+                                            -e DEBUG_INFO_BTF_MODULES
     [[ "${_debug}" == "n" ]] && scripts/config -d DEBUG_INFO \
-                                               -d DEBUG_INFO_BTF \
-                                               -d DEBUG_INFO_DWARF4 \
-                                               -d PAHOLE_HAS_SPLIT_BTF \
-                                               -d DEBUG_INFO_BTF_MODULES
-    
+                                            -d DEBUG_INFO_BTF \
+                                            -d DEBUG_INFO_DWARF4 \
+                                            -d PAHOLE_HAS_SPLIT_BTF \
+                                            -d DEBUG_INFO_BTF_MODULES
+
     # Run olddefconfig
     make ${BUILD_FLAGS[*]} olddefconfig
     diff -u $srcdir/cl-linux/config .config || :
-    
-    # Patch with kernel_compiler_patch patches
-    # This must be executed after olddefconfig
-    # to allow for the next section to run.
-    patch -Np1 -i "$srcdir/kernel_compiler_patch-$_kernelcompilerpatch/more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch"
-    
-    # Set subarch automatically
-    [[ -n "${_subarch}" ]] && yes "${_subarch}" | make ${BUILD_FLAGS[*]} oldconfig
-    # Ask for subarch
-    [[ -z "${_subarch}" ]] && make ${BUILD_FLAGS[*]} oldconfig
-    
-    # Optionally use the configuration of the running kernel
-    # Written originally by nous, see
-    # https://web.archive.org/web/20110711231356/https://aur.archlinux.org/packages.php?ID=40191 (package doesn't exist anymore)
-    [[ -n "${_use_current}" ]] &&
-        if [[ -s /proc/config.gz ]]; then
-            # modprobe configs
-            zcat /proc/config.gz > ./.config
+
+    # Here we slightly break the config by removing one of the
+    # members of the 'Processor family' selection.
+    # This causes oldconfig to always invoke that selection.
+    sed -i '/CONFIG_GENERIC_CPU/d' .config || :
+    # For a slim chance that someone is building X86_32
+    sed -i '/CONFIG_M686/d' .config || :
+
+    if [ -n "${_subarch}" ]; then
+        # 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 "Your kernel was not compiled with IKCONFIG_PROC."
-            warning "Unable to read kernel configuration, aborting."
-            exit
+            warning "Unrecognized subarch value: ${_subarch}"
+            exit 1
         fi
-    
+    else
+        # Ask for subarch
+        make ${BUILD_FLAGS[*]} oldconfig
+    fi
+}
+
+# Prepares the installation
+prepare() {
+    cd "${_src_linux}" || exit 1
+
+    apply_patches
+
+    [[ -n "${_use_current}" ]] && copy_defconfig
+    [[ -n "${_optimize_defconfig}" ]] || [[ -z "${_use_current}" ]] && update_defconfig
+
     # Read and apply modprobed database
     # See https://aur.archlinux.org/packages/modprobed-db
     [[ -n "${_localmodcfg}" ]] &&
@@ -291,24 +382,25 @@ prepare() {
         else
             echo ":: No modprobed.db file was found at ${HOME}/.config, skipping"
         fi
-    
-    # Write kernel version
-    make -s kernelrelease > version
-    
+
     # Open configuration editors
-    [[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
-    [[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
-    [[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
+    modify_defconfig
 
     # Save configuration
+    # shellcheck disable=SC2015
     [[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
+
+    # Write kernel version
+    make -s kernelrelease > version
 }
 
+# Build kernel
 build() {
     cd "${_src_linux}" || exit 1
     make ${BUILD_FLAGS[*]} all
 }
 
+# Packages the kernel package
 _package() {
     pkgdesc="${pkgdesc} This package includes the kernel and compiled modules."
     depends=("coreutils" "kmod" "initramfs")
@@ -316,65 +408,66 @@ _package() {
                 "linux-firmware: firmware images needed for some devices")
     provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
     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
     # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
     install -Dm644 "$(make -s image_name)" "${modulesdir}/vmlinuz"
-    
+
     # Used by mkinitcpio to name the kernel
     echo "${pkgbase}" | install -Dm644 /dev/stdin "${modulesdir}/pkgbase"
-    
+
     # Install modules
     ZSTD_CLEVEL=19 make ${BUILD_FLAGS[*]} INSTALL_MOD_PATH="${pkgdir}/usr" INSTALL_MOD_STRIP=1 \
         DEPMOD=/doesnt/exist modules_install  # Suppress depmod
-    
+
     # Remove build directory
     rm "${modulesdir}"/build
 }
 
+# Packages the headers package
 _package-headers() {
     pkgdesc="${pkgdesc} This package includes header files and scripts for building kernel modules."
     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
     install -Dt "${builddir}/kernel" -m644 kernel/Makefile
     install -Dt "${builddir}/arch/x86" -m644 arch/x86/Makefile
     cp -t "${builddir}" -a scripts
-    
+
     # Required when STACK_VALIDATION is enabled
     install -Dt "${builddir}/tools/objtool" tools/objtool/objtool
-    
+
     # Required when DEBUG_INFO_BTF_MODULES is enabled
     [[ -f tools/bpf/resolve_btfids/resolve_btfids ]] && install -Dt "${builddir}/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
-    
+
     cp -t "${builddir}" -a include
     cp -t "${builddir}/arch/x86" -a arch/x86/include
     install -Dt "${builddir}/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
-    
+
     install -Dt "${builddir}/drivers/md" -m644 drivers/md/*.h
     install -Dt "${builddir}/net/mac80211" -m644 net/mac80211/*.h
-    
+
     # https://bugs.archlinux.org/task/13146
     install -Dt "${builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
-    
+
     # https://bugs.archlinux.org/task/20402
     install -Dt "${builddir}/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
     install -Dt "${builddir}/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
     install -Dt "${builddir}/drivers/media/tuners" -m644 drivers/media/tuners/*.h
-    
+
     # https://bugs.archlinux.org/task/71392
     install -Dt "${builddir}/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
-    
+
     find . -name 'Kconfig*' -exec install -Dm644 {} "${builddir}/{}" \;
-    
+
     # Remove redundant architectures
     local arch
     for arch in "${builddir}"/arch/*/; do
@@ -382,16 +475,16 @@ _package-headers() {
         echo "Removing $(basename "${arch}")"
         rm -r "${arch}"
     done
-    
+
     # Remove documentation
     rm -r "${builddir}/Documentation"
-    
+
     # Remove broken symlinks
     find -L "${builddir}" -type l -printf "Removing %P\n" -delete
-    
+
     # Remove loose objects
     find "${builddir}" -type f -name '*.o' -printf "Removing %P\n" -delete
-    
+
     # Strip build tools
     local file
     while read -rd "" file; do
@@ -406,10 +499,10 @@ _package-headers() {
                 strip -v $STRIP_SHARED "$file" ;;
         esac
     done < <(find "${builddir}" -type f -perm -u+x ! -name vmlinux -print0)
-    
+
     # Strip vmlinux
     strip -v $STRIP_STATIC "${builddir}/vmlinux"
-    
+
     # Add symlink to build directory
     mkdir -p "$pkgdir/usr/src"
     ln -sr "${builddir}" "$pkgdir/usr/src/$pkgbase"
@@ -418,8 +511,8 @@ _package-headers() {
 pkgname=("$pkgbase" "$pkgbase-headers")
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {
-    $(declare -f "_package${_p#$pkgbase}")
-    _package${_p#$pkgbase}
+    $(declare -f "_package${_p#"$pkgbase"}")
+    _package${_p#"$pkgbase"}
   }"
 done
 
@@ -430,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 sub architecture 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`: 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.
-I have contacted [metak](https://aur.archlinux.org/account/metak) (the previous maintainer) to negotiate a license.
+The linux-clear package is licensed under the BSD Zero-Clause 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,31 +1,29 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-_5_2_2_2_changes() {
-  echo ":: A new command line option was added: add page_alloc.shuffle=1"
+function _5_2_2_2_changes() {
+ echo ":: Update 5.2.2-2: A new command line option was added: add page_alloc.shuffle=1"
 }
 
-_5_2_9_6_changes() {
-  echo ":: Microcode is no longer builtin. See https://wiki.archlinux.org/index.php/Microcode"
+function _5_2_9_6_changes() {
+ echo ":: Update 5.2.9-6: Microcode is no longer builtin. See https://wiki.archlinux.org/index.php/Microcode"
 }
 
-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"
-  echo "   intel_iommu=igfx_off kvm-intel.nested=1 no_timer_check noreplace-smp"
-  echo "   page_alloc.shuffle=1 rcupdate.rcu_expedited=1"
-  echo "   rootfstype=ext4,btrfs,xfs,f2fs tsc=reliable rw"
+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"
+ echo "  intel_iommu=igfx_off kvm-intel.nested=1 no_timer_check noreplace-smp"
+ echo "  page_alloc.shuffle=1 rcupdate.rcu_expedited=1"
+ echo "  rootfstype=ext4,btrfs,xfs,f2fs tsc=reliable rw"
 }
 
-post_upgrade() {
-  local v upgrades=(
-    5.2.2-2
-    5.2.9-6
-  )
+function post_upgrade() {
+ local version upgrades=(
+  5.2.2-2
+  5.2.9-6
+ )
 
-  for v in "${upgrades[@]}"; do
-    if [[ $(vercmp "${v}" "$2") -eq 1 ]]; then
-      "_${v//[.-]/_}_changes"
-    fi
-  done
+ for version in "${upgrades[@]}"; do
+  [[ $(vercmp "${version}" "$2") -eq 1 ]] && "_${version//[.-]/_}_changes"
+ done
 }