Compare commits
No commits in common. "master" and "YF-allow-using-extra-uarches-even-with-copied-config" have entirely different histories.
master
...
YF-allow-u
3 changed files with 132 additions and 280 deletions
6
.SRCINFO
6
.SRCINFO
|
@ -1,6 +1,6 @@
|
||||||
pkgbase = linux-clear
|
pkgbase = linux-clear
|
||||||
pkgdesc = Linux kernel with patches from Clear Linux which allow for higher performance.
|
pkgdesc = Linux kernel with patches from Clear Linux which allow for higher performance.
|
||||||
pkgver = 6.12.6
|
pkgver = 6.12.4
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://git.staropensource.de/JeremyStarTM/aur-linux-clear
|
url = https://git.staropensource.de/JeremyStarTM/aur-linux-clear
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
@ -20,7 +20,7 @@ pkgbase = linux-clear
|
||||||
options = !debug
|
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.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/linux-6.12.tar.sign
|
||||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.12.6.xz
|
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.12.4.xz
|
||||||
source = cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.12.4-1518
|
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
|
source = more-uarches-20241018.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20241018.tar.gz
|
||||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
||||||
|
@ -29,7 +29,7 @@ pkgbase = linux-clear
|
||||||
validpgpkeys = AC2B29BD34A6AFDDB3F68F35E7BFC8EC95861109
|
validpgpkeys = AC2B29BD34A6AFDDB3F68F35E7BFC8EC95861109
|
||||||
sha256sums = b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb
|
sha256sums = b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = dd7c856f12d3e10f09743c1d3db35f91879d92890c9fb176405783c9c7cb0c54
|
sha256sums = ba790766fca3eadade5cf74f0c181a8e42a77556f71d9af4b2bd4a53c8b98641
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = b3fd8b1c5bbd39a577afcccf6f1119fdf83f6d72119f4c0811801bdd51d1bc61
|
sha256sums = b3fd8b1c5bbd39a577afcccf6f1119fdf83f6d72119f4c0811801bdd51d1bc61
|
||||||
|
|
||||||
|
|
386
PKGBUILD
386
PKGBUILD
|
@ -5,125 +5,66 @@
|
||||||
# Contributor: yarost12 <yaro330@gmail.com>
|
# Contributor: yarost12 <yaro330@gmail.com>
|
||||||
|
|
||||||
### BUILD OPTIONS
|
### BUILD OPTIONS
|
||||||
# You can modify these settings by
|
# You can modify these settings by executing "env _<setting>=<value> makepkg"
|
||||||
# executing "env _<setting>=<value> makepkg"
|
# instead of modifying the PKGBUILD file. Here's an example:
|
||||||
# instead of modifying the PKGBUILD file.
|
|
||||||
#
|
|
||||||
# Here's an example:
|
|
||||||
# env _makemenuconfig=y _copyfinalconfig=y _subarch=30 makepkg
|
# env _makemenuconfig=y _copyfinalconfig=y _subarch=30 makepkg
|
||||||
|
|
||||||
# Tweak kernel options prior to a build
|
# Tweak kernel options prior to a build via menuconfig.
|
||||||
# via menuconfig.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_makemenuconfig:=""}"
|
: "${_makemenuconfig:=""}"
|
||||||
|
|
||||||
# Tweak kernel options prior to a build
|
# Tweak kernel options prior to a build via nconfig.
|
||||||
# via nconfig.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_makenconfig:=""}"
|
: "${_makenconfig:=""}"
|
||||||
|
|
||||||
# Tweak kernel options prior to a build
|
# Tweak kernel options prior to a build via xconfig.
|
||||||
# via xconfig.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_makexconfig:=""}"
|
: "${_makexconfig:=""}"
|
||||||
|
|
||||||
# Use the current kernel's .config file
|
# Use the current kernel's .config file
|
||||||
#
|
# Enabling this option will use the .config of the currently
|
||||||
# Enabling this option will use the
|
# running kernel rather than the Arch Linux defaults. Useful
|
||||||
# .config of the currently running kernel
|
# when the package gets updated and you already went through
|
||||||
# rather than the Clear Linux defaults.
|
# the trouble of customizing your config options. NOT recommended
|
||||||
#
|
# when a new kernel is released, but again, convenient
|
||||||
# Useful when the package gets updated and
|
# for package bumps.
|
||||||
# you already went through the trouble of
|
|
||||||
# customizing your config options.
|
|
||||||
#
|
|
||||||
# NOT recommended when a new kernel is
|
|
||||||
# released, but again, convenient for
|
|
||||||
# package bumps.
|
|
||||||
#
|
|
||||||
# Takes effect before '_reuse_file'.
|
|
||||||
#
|
|
||||||
# Only takes effect if '_reuse_current'
|
|
||||||
# or '_reuse_file' is enabled. Keep
|
|
||||||
# disabled if you want to reuse your
|
|
||||||
# existing kernel configuration without
|
|
||||||
# any changes being applied on top.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_reuse_current:=""}"
|
: "${_use_current:=""}"
|
||||||
|
|
||||||
# Use the 'kconfig' file placed in the
|
# Apply selected optimizations chosen by
|
||||||
# directory where this PKGBUILD is in.
|
|
||||||
#
|
|
||||||
# Enabling this option will use the
|
|
||||||
# .config placed next to the PKGBUILD file.
|
|
||||||
#
|
|
||||||
# Useful when the package gets updated and
|
|
||||||
# you already went through the trouble of
|
|
||||||
# customizing your config options.
|
|
||||||
#
|
|
||||||
# NOT recommended when a new kernel is
|
|
||||||
# released, but again, convenient for
|
|
||||||
# package bumps.
|
|
||||||
#
|
|
||||||
# Takes effect after '_reuse_current'.
|
|
||||||
#
|
|
||||||
# Only takes effect if '_reuse_current'
|
|
||||||
# or '_reuse_file' is enabled. Keep
|
|
||||||
# disabled if you want to reuse your
|
|
||||||
# existing kernel configuration without
|
|
||||||
# any changes being applied on top.
|
|
||||||
#
|
|
||||||
# Set to anything but null to activate.
|
|
||||||
: "${_reuse_file:=""}"
|
|
||||||
|
|
||||||
# Apply selected config changes chosen by
|
|
||||||
# the package maintainers to the config.
|
# the package maintainers to the config.
|
||||||
#
|
#
|
||||||
# Only takes effect if '_reuse_current'
|
# Only takes effect if '_use_current'
|
||||||
# or '_reuse_file' is enabled. Keep
|
# is enabled. Keep disabled if you want
|
||||||
# disabled if you want to reuse your
|
# to reuse your existing kernel configuration
|
||||||
# existing kernel configuration without
|
# without any changes being applied to it.
|
||||||
# any changes being applied on top.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_update_kconfig_on_reuse:=""}"
|
: "${_optimize_defconfig:=""}"
|
||||||
|
|
||||||
# Determines whether the final kernel
|
# Determines whether the kernel configuration should be
|
||||||
# configuration shall be copied into
|
# copied into the source tree before compilation starts.
|
||||||
# the package source tree (where this
|
|
||||||
# very PKGBUILD file lives) before
|
|
||||||
# compilation starts.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_copyfinalconfig:=""}"
|
: "${_copyfinalconfig:=""}"
|
||||||
|
|
||||||
# Only compile active modules to VASTLY
|
# Only compile active modules to VASTLY reduce the number
|
||||||
# reduce the number of modules built
|
# of modules built and the build time.
|
||||||
# and the build time.
|
|
||||||
#
|
#
|
||||||
# To keep track of which modules are
|
# To keep track of which modules are needed for your specific system/hardware,
|
||||||
# needed for your specific system/hardware,
|
# give modprobed-db a try: https://aur.archlinux.org/packages/modprobed-db
|
||||||
# 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
|
|
||||||
#
|
#
|
||||||
|
# More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_localmodcfg:=""}"
|
: "${_localmodcfg:=""}"
|
||||||
|
|
||||||
# Optionally select a sub architecture
|
# Optionally select a sub architecture by number or
|
||||||
# by number or leave blank, which will
|
# leave blank, which will require user interaction during the build.
|
||||||
# require user interaction during the build.
|
|
||||||
# Note that the default option is 41.
|
# Note that the default option is 41.
|
||||||
#
|
|
||||||
# Requires '_update_kconfig_on_reuse_'
|
|
||||||
# to be enabled if using an existing
|
|
||||||
# kernel configuration.
|
|
||||||
#
|
#
|
||||||
# 1. AMD Opteron/Athlon64/Hammer/K8 (MK8)
|
# 1. AMD Opteron/Athlon64/Hammer/K8 (MK8)
|
||||||
# 2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3)
|
# 2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3)
|
||||||
|
@ -170,63 +111,39 @@
|
||||||
# 43. AMD-Native optimizations autodetected by the compiler (MNATIVE_AMD)
|
# 43. AMD-Native optimizations autodetected by the compiler (MNATIVE_AMD)
|
||||||
: "${_subarch:=""}"
|
: "${_subarch:=""}"
|
||||||
|
|
||||||
# Selects the x86-64 microarchitecture
|
# Selects the x86-64 microarchitecture to compile for.
|
||||||
# to compile for. This value is only
|
# This value is only used by the GENERIC_CPU
|
||||||
# used by the GENERIC_CPU
|
|
||||||
# subarchitecture and is required.
|
# subarchitecture and is required.
|
||||||
# Can be either '1', '2', '3' or '4'
|
# Can be either '1', '2', '3' or '4'
|
||||||
|
#
|
||||||
|
# Set to '1' by default
|
||||||
#
|
#
|
||||||
# For more information see:
|
# For more information see:
|
||||||
# https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
|
# https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
|
||||||
#
|
|
||||||
# Requires '_update_kconfig_on_reuse_'
|
|
||||||
# to be enabled if using an existing
|
|
||||||
# kernel configuration.
|
|
||||||
#
|
|
||||||
# Set to '1' by default
|
|
||||||
: "${_subarch_microarch:="1"}"
|
: "${_subarch_microarch:="1"}"
|
||||||
|
|
||||||
# Enables compilation with LLVM
|
|
||||||
#
|
# Enable compilation with LLVM
|
||||||
# Be warned, this is largely untested
|
# Be warned, this is largely untested by me (JeremyStarTM). It *should* work,
|
||||||
# by me (JeremyStarTM). It *should* work,
|
# but if it doesn't, write a comment and I'll fix it.
|
||||||
# but if it doesn't, write a comment
|
|
||||||
# and I'll write a fix for it.
|
|
||||||
#
|
|
||||||
# Requires '_update_kconfig_on_reuse_'
|
|
||||||
# to be enabled if using an existing
|
|
||||||
# kernel configuration.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_use_llvm_lto:=""}"
|
: "${_use_llvm_lto:=""}"
|
||||||
|
|
||||||
# This allows you to enable or disable
|
# Debug options
|
||||||
# debug options for THE COMPILED KERNEL.
|
# This allows you to enable or disable debug options.
|
||||||
#
|
# Set to 'y' to force enable, 'n' to force disable or '' to ignore debug options.
|
||||||
# Leaving the setting empty will leave
|
# Leaving the setting empty will use the kernel configuration setting to determine
|
||||||
# the debug settings up to the kernel
|
# if debug options shall be enabled/disabled.
|
||||||
# configuration's settings.
|
|
||||||
#
|
|
||||||
# Requires '_update_kconfig_on_reuse_'
|
|
||||||
# to be enabled if using an existing
|
|
||||||
# kernel configuration.
|
|
||||||
#
|
|
||||||
# Set to 'y' to force enable,
|
|
||||||
# 'n' to force disable or '' to
|
|
||||||
# ignore debug options.
|
|
||||||
: "${_debug_kernel:=""}"
|
|
||||||
|
|
||||||
# This allows you to enable
|
|
||||||
# debug options for THIS SCRIPT.
|
|
||||||
#
|
#
|
||||||
# Set to anything but null to activate.
|
# Set to anything but null to activate.
|
||||||
: "${_debug_script:=""}"
|
: "${_debug:=""}"
|
||||||
|
|
||||||
### BUILD OPTIONS END
|
### BUILD OPTIONS END
|
||||||
|
|
||||||
# Kernel version
|
# Kernel version
|
||||||
_kernel_major=6.12
|
_kernel_major=6.12
|
||||||
_kernel_minor=6
|
_kernel_minor=4
|
||||||
# Clear Linux patches version
|
# Clear Linux patches version
|
||||||
_clr=4-1518
|
_clr=4-1518
|
||||||
# kernel_compiler_patch version
|
# kernel_compiler_patch version
|
||||||
|
@ -246,7 +163,7 @@ license=(GPL-2.0-only)
|
||||||
makedepends=("bc" "cpio" "gettext" "git" "libelf" "pahole" "perl" "python" "tar" "xz" "zstd")
|
makedepends=("bc" "cpio" "gettext" "git" "libelf" "pahole" "perl" "python" "tar" "xz" "zstd")
|
||||||
[[ -n "${_use_llvm_to}" ]] && makedepends+=("clang" "llvm" "lld")
|
[[ -n "${_use_llvm_to}" ]] && makedepends+=("clang" "llvm" "lld")
|
||||||
options=("!strip" "!debug")
|
options=("!strip" "!debug")
|
||||||
[[ "${_debug_kernel}" == "y" ]] && options=("!strip")
|
[[ "${_debug}" == "y" ]] && options=("!strip")
|
||||||
source=(
|
source=(
|
||||||
"https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.xz"
|
"https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.xz"
|
||||||
"https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.sign"
|
"https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.sign"
|
||||||
|
@ -261,33 +178,10 @@ 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})"
|
||||||
|
|
||||||
# Debugging
|
|
||||||
_msg() {
|
|
||||||
echo -e ":: ${*}"
|
|
||||||
}
|
|
||||||
_warn() {
|
|
||||||
echo -e ":: WARNING: ${*//\\n/\\n }"
|
|
||||||
}
|
|
||||||
_error() {
|
|
||||||
echo -e ":: ERROR: ${*//\\n/\\n }"
|
|
||||||
}
|
|
||||||
_debug_msg() {
|
|
||||||
[ -n "${_debug_script}" ] && echo ":: debug: ${*}" || :
|
|
||||||
}
|
|
||||||
_debug_call() {
|
|
||||||
local function="${1}"
|
|
||||||
shift
|
|
||||||
local args="${*}"
|
|
||||||
|
|
||||||
_debug_msg "call: ${function}(${args})"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Applies all patches
|
# Applies all patches
|
||||||
_apply_patches() {
|
apply_patches() {
|
||||||
_debug_call "_apply_patches"
|
|
||||||
|
|
||||||
# Patch with kernel version patches
|
# Patch with kernel version patches
|
||||||
patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || :
|
patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
|
||||||
|
|
||||||
# Set version
|
# Set version
|
||||||
echo "-${pkgrel}" > localversion.10-pkgrel
|
echo "-${pkgrel}" > localversion.10-pkgrel
|
||||||
|
@ -301,7 +195,7 @@ _apply_patches() {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
patch -Np1 -i "${srcdir}/cl-linux/${i}" || :
|
patch -Np1 -i "${srcdir}/cl-linux/${i}" || true
|
||||||
done
|
done
|
||||||
|
|
||||||
# Patch with kernel_compiler_patch patches.
|
# Patch with kernel_compiler_patch patches.
|
||||||
|
@ -310,29 +204,62 @@ _apply_patches() {
|
||||||
patch -Np1 -i "$srcdir/kernel_compiler_patch-$_kernelcompilerpatch/more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch"
|
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]')"
|
||||||
|
[[ "${_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
|
# Updates the kernel config
|
||||||
_update_config() {
|
update_defconfig() {
|
||||||
_debug_call "_update_config"
|
# Copy configuration file (if found)
|
||||||
|
if [ -f "${startdir}/kconfig" ]; then
|
||||||
|
echo ":: Using configuration file \"${startdir}/kconfig\""
|
||||||
|
cp -Tf "${startdir}/kconfig" ./.config
|
||||||
|
else
|
||||||
|
echo ":: Using configuration file \"${srcdir}/${pkgbase}/config\""
|
||||||
|
cp -Tf $srcdir/cl-linux/config ./.config
|
||||||
|
fi
|
||||||
|
|
||||||
# Extra configuration
|
# Extra configuration
|
||||||
_debug_msg "Updating configuration"
|
# General setup
|
||||||
# -> General setup
|
|
||||||
scripts/config --set-str DEFAULT_HOSTNAME archlinux \
|
scripts/config --set-str DEFAULT_HOSTNAME archlinux \
|
||||||
-e IKCONFIG \
|
-e IKCONFIG \
|
||||||
-e IKCONFIG_PROC \
|
-e IKCONFIG_PROC \
|
||||||
-u RT_GROUP_SCHED
|
-u RT_GROUP_SCHED
|
||||||
# -> Power management and ACPI options
|
# Power management and ACPI options
|
||||||
scripts/config -e ACPI_REV_OVERRIDE_POSSIBLE \
|
scripts/config -e ACPI_REV_OVERRIDE_POSSIBLE \
|
||||||
-e ACPI_TABLE_UPGRADE
|
-e ACPI_TABLE_UPGRADE
|
||||||
# -> Virtualization
|
# Virtualization
|
||||||
scripts/config -e KVM_SMM
|
scripts/config -e KVM_SMM
|
||||||
# -> General architecture-dependent options
|
# General architecture-dependent options
|
||||||
scripts/config -e KPROBES
|
scripts/config -e KPROBES
|
||||||
# -> Enable loadable module support
|
# Enable loadable module support
|
||||||
scripts/config -u MODULE_SIG_FORCE
|
scripts/config -u MODULE_SIG_FORCE
|
||||||
# -> Networking support
|
# Networking support
|
||||||
scripts/config -e NETFILTER_INGRESS
|
scripts/config -e NETFILTER_INGRESS
|
||||||
# -> Device Drivers
|
# Device Drivers
|
||||||
scripts/config -e FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER \
|
scripts/config -e FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER \
|
||||||
-e DELL_SMBIOS_SMM \
|
-e DELL_SMBIOS_SMM \
|
||||||
-m PATA_JMICRON \
|
-m PATA_JMICRON \
|
||||||
|
@ -342,9 +269,9 @@ _update_config() {
|
||||||
-M SND_MIXER_OSS SND_PCM_OSS \
|
-M SND_MIXER_OSS SND_PCM_OSS \
|
||||||
-E SND_PCM_OSS SND_PCM_OSS_PLUGINS \
|
-E SND_PCM_OSS SND_PCM_OSS_PLUGINS \
|
||||||
-m AGP -M AGP AGP_INTEL -M AGP_INTEL AGP_VIA
|
-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
|
# Kernel hacking -> Compile-time checks and compiler options -> Make section mismatch errors non-fatal
|
||||||
scripts/config -e SECTION_MISMATCH_WARN_ONLY
|
scripts/config -e SECTION_MISMATCH_WARN_ONLY
|
||||||
# -> File systems
|
# File systems
|
||||||
scripts/config -m NTFS3_FS \
|
scripts/config -m NTFS3_FS \
|
||||||
-e NTFS3_LZX_XPRESS \
|
-e NTFS3_LZX_XPRESS \
|
||||||
-e NTFS3_FS_POSIX_ACL
|
-e NTFS3_FS_POSIX_ACL
|
||||||
|
@ -352,7 +279,7 @@ _update_config() {
|
||||||
-e SMB_SERVER_SMBDIRECT \
|
-e SMB_SERVER_SMBDIRECT \
|
||||||
-e SMB_SERVER_CHECK_CAP_NET_ADMIN \
|
-e SMB_SERVER_CHECK_CAP_NET_ADMIN \
|
||||||
-e SMB_SERVER_KERBEROS5
|
-e SMB_SERVER_KERBEROS5
|
||||||
# -> Security options
|
# Security options
|
||||||
scripts/config -e SECURITY_SELINUX \
|
scripts/config -e SECURITY_SELINUX \
|
||||||
-e SECURITY_SELINUX_BOOTPARAM \
|
-e SECURITY_SELINUX_BOOTPARAM \
|
||||||
-e SECURITY_SMACK \
|
-e SECURITY_SMACK \
|
||||||
|
@ -362,57 +289,39 @@ _update_config() {
|
||||||
-e SECURITY_TOMOYO \
|
-e SECURITY_TOMOYO \
|
||||||
-e SECURITY_APPARMOR \
|
-e SECURITY_APPARMOR \
|
||||||
-e SECURITY_YAMA
|
-e SECURITY_YAMA
|
||||||
# -> Security options -> Landlock options
|
# Security options -> Landlock options
|
||||||
scripts/config -e SECURITY_LANDLOCK
|
scripts/config -e SECURITY_LANDLOCK
|
||||||
# -> Library routines
|
# Library routines
|
||||||
scripts/config -k -e FONT_TER16x32
|
scripts/config -k -e FONT_TER16x32
|
||||||
|
|
||||||
# -> Enable LLVM compilation
|
# Enable LLVM compilation
|
||||||
if [ -n "${_use_llvm_lto}" ]; then
|
[[ -n "${_use_llvm_lto}" ]] && scripts/config -d LTO_NONE \
|
||||||
_debug_msg "Enabling LLVM compilation"
|
-e LTO \
|
||||||
|
-e LTO_CLANG \
|
||||||
scripts/config -d LTO_NONE \
|
-e ARCH_SUPPORTS_LTO_CLANG \
|
||||||
-e LTO \
|
-e ARCH_SUPPORTS_LTO_CLANG_THIN \
|
||||||
-e LTO_CLANG \
|
-e HAS_LTO_CLANG \
|
||||||
-e ARCH_SUPPORTS_LTO_CLANG \
|
-e LTO_CLANG_THIN \
|
||||||
-e ARCH_SUPPORTS_LTO_CLANG_THIN \
|
-e HAVE_GCC_PLUGINS
|
||||||
-e HAS_LTO_CLANG \
|
|
||||||
-e LTO_CLANG_THIN \
|
|
||||||
-e HAVE_GCC_PLUGINS
|
|
||||||
fi
|
|
||||||
|
|
||||||
# -> Enable or disable debug settings
|
# Enable or disable debug settings
|
||||||
case "${_debug_kernel}" in
|
[[ "${_debug}" == "y" ]] && scripts/config -e DEBUG_INFO \
|
||||||
"y")
|
-e DEBUG_INFO_BTF \
|
||||||
_debug_msg "Enabling kernel debugging"
|
-e DEBUG_INFO_DWARF4 \
|
||||||
scripts/config -e DEBUG_INFO \
|
-e PAHOLE_HAS_SPLIT_BTF \
|
||||||
-e DEBUG_INFO_BTF \
|
-e DEBUG_INFO_BTF_MODULES
|
||||||
-e DEBUG_INFO_DWARF4 \
|
[[ "${_debug}" == "n" ]] && scripts/config -d DEBUG_INFO \
|
||||||
-e PAHOLE_HAS_SPLIT_BTF \
|
-d DEBUG_INFO_BTF \
|
||||||
-e DEBUG_INFO_BTF_MODULES
|
-d DEBUG_INFO_DWARF4 \
|
||||||
;;
|
-d PAHOLE_HAS_SPLIT_BTF \
|
||||||
"n")
|
-d DEBUG_INFO_BTF_MODULES
|
||||||
_debug_msg "Disabling kernel debugging"
|
|
||||||
scripts/config -d DEBUG_INFO \
|
|
||||||
-d DEBUG_INFO_BTF \
|
|
||||||
-d DEBUG_INFO_DWARF4 \
|
|
||||||
-d PAHOLE_HAS_SPLIT_BTF \
|
|
||||||
-d DEBUG_INFO_BTF_MODULES
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Run olddefconfig
|
# Run olddefconfig
|
||||||
_debug_msg "Running olddefconfig"
|
|
||||||
make ${BUILD_FLAGS[*]} olddefconfig
|
make ${BUILD_FLAGS[*]} olddefconfig
|
||||||
|
|
||||||
# Show diff of default config and updated config
|
|
||||||
_msg "Showing diff between the default and updated config"
|
|
||||||
diff -u $srcdir/cl-linux/config .config || :
|
diff -u $srcdir/cl-linux/config .config || :
|
||||||
|
|
||||||
|
# Set subarch automatically
|
||||||
if [ -n "${_subarch}" ]; then
|
if [ -n "${_subarch}" ]; then
|
||||||
# Set subarch
|
|
||||||
_debug_msg "Setting subarchitecture"
|
|
||||||
|
|
||||||
if [ "${_subarch}" == "41" ]; then
|
if [ "${_subarch}" == "41" ]; then
|
||||||
yes "${_subarch}
|
yes "${_subarch}
|
||||||
${_subarch_microarch}" | make ${BUILD_FLAGS[*]} oldconfig
|
${_subarch_microarch}" | make ${BUILD_FLAGS[*]} oldconfig
|
||||||
|
@ -421,76 +330,34 @@ ${_subarch_microarch}" | make ${BUILD_FLAGS[*]} oldconfig
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Ask for subarch
|
# Ask for subarch
|
||||||
_debug_msg "Asking for subarchitecture"
|
|
||||||
|
|
||||||
make ${BUILD_FLAGS[*]} oldconfig
|
make ${BUILD_FLAGS[*]} oldconfig
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepares the installation
|
# Prepares the installation
|
||||||
prepare() {
|
prepare() {
|
||||||
_debug_call "prepare"
|
|
||||||
cd "${_src_linux}" || exit 1
|
cd "${_src_linux}" || exit 1
|
||||||
|
|
||||||
# Apply patches
|
apply_patches
|
||||||
_apply_patches
|
|
||||||
|
|
||||||
if [ -n "${_reuse_current}" ]; then
|
[[ -n "${_use_current}" ]] && copy_defconfig
|
||||||
# Use config from running kernel
|
[[ -n "${_optimize_defconfig}" ]] || [[ -z "${_use_current}" ]] && update_defconfig
|
||||||
|
|
||||||
_msg " Using configuration file from running kernel"
|
|
||||||
local "_cur_major_ver=$(zcat /proc/config.gz | grep Linux | grep -o '[0-9]*[0-9]\.[0-9]*[0-9]')"
|
|
||||||
|
|
||||||
[ "${_cur_major_ver}" != "${_kernel_major}" ] &&
|
|
||||||
_warn "Your kernel configuration is old, please update your configuration"
|
|
||||||
|
|
||||||
if [[ -s /proc/config.gz ]]; then
|
|
||||||
zcat /proc/config.gz > ./.config
|
|
||||||
make ${BUILD_FLAGS[*]} olddefconfig
|
|
||||||
else
|
|
||||||
_error "Your kernel was not compiled with 'IKCONFIG_PROC'.\nUnable to read kernel configuration, aborting."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
elif [ -n "${_reuse_file}" ]; then
|
|
||||||
# Use ./kconfig
|
|
||||||
|
|
||||||
if [ -f "${startdir}/kconfig" ]; then
|
|
||||||
_msg " Using configuration file \"${startdir}/kconfig\""
|
|
||||||
cp -Tf "${startdir}/kconfig" ./.config
|
|
||||||
else
|
|
||||||
_error "Could not find a kernel configuration at '${startdir}/kconfig'.\nUnable to read kernel configuration, aborting."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# Use builtin
|
|
||||||
|
|
||||||
_msg ":: Using configuration file \"${srcdir}/${pkgbase}/config\""
|
|
||||||
cp -Tf $srcdir/cl-linux/config ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Update kernel configuration
|
|
||||||
if [ -z "${_reuse_current}" ] || [[ -n "${_reuse_current}" && -n "${_update_kconfig_on_reuse}" ]]; then
|
|
||||||
_update_config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Read and apply modprobed database
|
# Read and apply modprobed database
|
||||||
# See https://aur.archlinux.org/packages/modprobed-db
|
# See https://aur.archlinux.org/packages/modprobed-db
|
||||||
if [ -n "${_localmodcfg}" ]; then
|
[[ -n "${_localmodcfg}" ]] &&
|
||||||
if [ -e "${HOME}/.config/modprobed.db" ]; then
|
if [ -e "${HOME}/.config/modprobed.db" ]; then
|
||||||
make ${BUILD_FLAGS[*]} LSMOD=${HOME}/.config/modprobed.db localmodconfig
|
make ${BUILD_FLAGS[*]} LSMOD=${HOME}/.config/modprobed.db localmodconfig
|
||||||
else
|
else
|
||||||
_warn "No modprobed.db file was found at ${HOME}/.config, skipping"
|
echo ":: No modprobed.db file was found at ${HOME}/.config, skipping"
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Open configuration editors
|
# Open configuration editors
|
||||||
[ -n "$_makemenuconfig" ] && make ${BUILD_FLAGS[*]} menuconfig
|
modify_defconfig
|
||||||
[ -n "$_makexconfig" ] && make ${BUILD_FLAGS[*]} xconfig
|
|
||||||
[ -n "$_makenconfig" ] && make ${BUILD_FLAGS[*]} nconfig
|
|
||||||
|
|
||||||
# Save configuration
|
# Save configuration
|
||||||
# shellcheck disable=SC2015
|
# shellcheck disable=SC2015
|
||||||
[ -n "${_copyfinalconfig}" ] && cp -Tf ./.config "${startdir}/kconfig-new" || :
|
[[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
|
||||||
|
|
||||||
# Write kernel version
|
# Write kernel version
|
||||||
make -s kernelrelease > version
|
make -s kernelrelease > version
|
||||||
|
@ -498,15 +365,12 @@ prepare() {
|
||||||
|
|
||||||
# Build kernel
|
# Build kernel
|
||||||
build() {
|
build() {
|
||||||
_debug_call "build"
|
|
||||||
cd "${_src_linux}" || exit 1
|
cd "${_src_linux}" || exit 1
|
||||||
make ${BUILD_FLAGS[*]} all
|
make ${BUILD_FLAGS[*]} all
|
||||||
}
|
}
|
||||||
|
|
||||||
# Packages the kernel package
|
# Packages the kernel package
|
||||||
_package() {
|
_package() {
|
||||||
_debug_call "_package"
|
|
||||||
|
|
||||||
pkgdesc="${pkgdesc} This package includes the kernel and compiled modules."
|
pkgdesc="${pkgdesc} This package includes the kernel and compiled modules."
|
||||||
depends=("coreutils" "kmod" "initramfs")
|
depends=("coreutils" "kmod" "initramfs")
|
||||||
optdepends=("wireless-regdb: to set the correct wireless channels of your country"
|
optdepends=("wireless-regdb: to set the correct wireless channels of your country"
|
||||||
|
@ -535,8 +399,6 @@ _package() {
|
||||||
|
|
||||||
# Packages the headers package
|
# Packages the headers package
|
||||||
_package-headers() {
|
_package-headers() {
|
||||||
_debug_call "_package-headers"
|
|
||||||
|
|
||||||
pkgdesc="${pkgdesc} This package includes header files and scripts for building kernel modules."
|
pkgdesc="${pkgdesc} This package includes header files and scripts for building kernel modules."
|
||||||
depends=("pahole")
|
depends=("pahole")
|
||||||
|
|
||||||
|
@ -632,6 +494,6 @@ validpgpkeys=(
|
||||||
)
|
)
|
||||||
sha256sums=("b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb"
|
sha256sums=("b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb"
|
||||||
"SKIP"
|
"SKIP"
|
||||||
"dd7c856f12d3e10f09743c1d3db35f91879d92890c9fb176405783c9c7cb0c54"
|
"ba790766fca3eadade5cf74f0c181a8e42a77556f71d9af4b2bd4a53c8b98641"
|
||||||
"SKIP"
|
"SKIP"
|
||||||
"b3fd8b1c5bbd39a577afcccf6f1119fdf83f6d72119f4c0811801bdd51d1bc61")
|
"b3fd8b1c5bbd39a577afcccf6f1119fdf83f6d72119f4c0811801bdd51d1bc61")
|
||||||
|
|
20
README.md
20
README.md
|
@ -14,19 +14,16 @@ The PKGBUILD file supports customization via environment variables. Here's a lis
|
||||||
- `_makemenuconfig`: Invokes `make menuconfig` (ncurses-based default configuration menu) before compilation starts
|
- `_makemenuconfig`: Invokes `make menuconfig` (ncurses-based default configuration menu) before compilation starts
|
||||||
- `_makenconfig`: Invokes `make nconfig` (ncurses-based nicer configuration menu) before compilation starts
|
- `_makenconfig`: Invokes `make nconfig` (ncurses-based nicer configuration menu) before compilation starts
|
||||||
- `_makexconfig`: Invokes `make xconfig` (X11-based GUI configuration menu) before compilation starts
|
- `_makexconfig`: Invokes `make xconfig` (X11-based GUI configuration menu) before compilation starts
|
||||||
- `_reuse_current`: Will use the configuration of the running kernel, if the running kernel is compiled with `IKCONFIG_PROC`
|
- `_use_current`: Will use the configuration of the running kernel, if the running kernel is compiled with `IKCONFIG_PROC`
|
||||||
- `_reuse_file`: Will use the configuration file named `kconfig` contained in the `PKGBUILD` file's directory
|
- `_optimize_defconfig`: Applies package maintainer-picked configuration changes to your defconfig. Only takes effect with `_use_current` being enabled
|
||||||
- `_update_kconfig_on_reuse`: Specifies whether the kernel configuration shall be updated when using any of the '_reuse_*' flags
|
|
||||||
- `_copyfinalconfig`: Copies the final kernel configuration into the repository root as `kconfig-new` before compilation starts
|
- `_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)
|
- `_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
|
- `_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`: 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
|
||||||
- `_use_llvm_lto`: Enables compilation with LLVM. Untested but should work. If not write a comment on the AUR.
|
|
||||||
- `_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))
|
- `_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_kernel`: Force enables kernel debugging options when set to `y`, force disables debug options when set to `n` or relies on the kconfig when unset
|
- `_debug`: Force enables debug options when set to `y`, force disables debug options when set to `n` or uses the config defaults when unset
|
||||||
- `_debug_script`: Enables debugging for the `PKGBUILD` file
|
|
||||||
|
|
||||||
All of these variables just need to be set for them to apply, except for `_subarch`, `_subarch_microarch` and `_debug_kernel`. **For more information please check their documentation inside the `PKGBUILD` file**
|
All of these variables just need to be set for them to apply, except for `_subarch` and `_debug`. See their descriptions for more information.
|
||||||
|
|
||||||
## GPG errors
|
## GPG errors
|
||||||
If makepkg complains about invalid PGP keys, try running this command:
|
If makepkg complains about invalid PGP keys, try running this command:
|
||||||
|
@ -39,13 +36,6 @@ 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 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.
|
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
|
## 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.
|
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.
|
I have contacted [metak](https://aur.archlinux.org/account/metak) (the previous maintainer) to negotiate a license.
|
||||||
|
|
Loading…
Reference in a new issue