From 4ab940f50777609c43a7f21ee455de07f1a2df29 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Fri, 27 Sep 2024 18:38:36 +0300 Subject: [PATCH 1/3] Use modprobed-db for CI builds Signed-off-by: Vasiliy Stelmachenok --- .github/workflows/lint.yml | 5 +- linux-cachyos-bmq/PKGBUILD | 28 +- linux-cachyos-bore/PKGBUILD | 28 +- linux-cachyos-deckify/PKGBUILD | 28 +- linux-cachyos-eevdf/PKGBUILD | 28 +- linux-cachyos-hardened/PKGBUILD | 28 +- linux-cachyos-lts/PKGBUILD | 28 +- linux-cachyos-rc/PKGBUILD | 28 +- linux-cachyos-rt-bore/PKGBUILD | 28 +- linux-cachyos-sched-ext/PKGBUILD | 28 +- linux-cachyos-server/PKGBUILD | 28 +- linux-cachyos/PKGBUILD | 28 +- modprobed.db | 687 +++++++++++++++++++++++++++++++ 13 files changed, 888 insertions(+), 112 deletions(-) create mode 100644 modprobed.db diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bf825367e..4a69e36eb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,6 +5,7 @@ on: - 'linux-cachyos/PKGBUILD' - '.github/workflows/lint.yml' workflow_dispatch: + jobs: linux-cachyos-zfs-gcc: runs-on: ubuntu-latest @@ -15,7 +16,7 @@ jobs: id: makepkg uses: CachyOS/pkgbuild-action@master with: - envvars: "_build_zfs=y _use_auto_optimization= _processor_opt=generic _cc_size=y _cc_harder=" + envvars: "_build_zfs=y _use_auto_optimization= _cc_harder= _localmodcfg=y _localmodcfg_path=${{ github.workspace }}/modprobed.db" pkgdir: "linux-cachyos" namcapExcludeRules: "invalidstartdir" makepkgArgs: "--skipchecksums --skippgpcheck --noconfirm -s" @@ -28,7 +29,7 @@ jobs: id: makepkg uses: CachyOS/pkgbuild-action@master with: - envvars: "_build_zfs=y _use_llvm_lto=thin _use_auto_optimization= _processor_opt=generic _cc_size=y _cc_harder=" + envvars: "CI=1 _build_zfs=y _use_llvm_lto=thin _use_auto_optimization= _cc_harder= _localmodcfg=y _localmodcfg_path=${{ github.workspace }}/modprobed.db" pkgdir: "linux-cachyos" namcapExcludeRules: "invalidstartdir" makepkgArgs: "--skipchecksums --skippgpcheck --noconfirm -s" diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index 8ea07550a..74f2872e9 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index c40ad3e64..8053b3799 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index 1a5a63aee..188a7f6b3 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -431,11 +430,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -481,9 +489,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 976cefb1d..a5001070f 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index fbcf1d821..84db670f8 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -424,11 +423,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -474,9 +482,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index d6a6c27ff..aee42f083 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -48,6 +48,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -58,10 +61,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -449,11 +448,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -557,9 +565,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 7df85920c..6ccef8cd5 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 2fdb5ff54..839bc6019 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index 432625393..a6d1da2fe 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 5d13cee12..3ee735235 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 5eca7558b..4987d82c2 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -49,6 +49,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +62,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -428,11 +427,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +486,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi diff --git a/modprobed.db b/modprobed.db new file mode 100644 index 000000000..7f981b8b3 --- /dev/null +++ b/modprobed.db @@ -0,0 +1,687 @@ +# This list of modules is based on the linux-tkg one: +# https://github.com/Frogging-Family/linux-tkg/blob/master/linux-tkg-config/6.11/minimal-modprobed.db +# And is intended for use by CI works, but you can use it as a base for your +# own. +8021q +8250_dw +842 +842_compress +842_decompress +9p +9pnet +9pnet_virtio +ac97_bus +acer_wireless +acer_wmi +acpi_cpufreq +acpi_mdio +acpi_pad +acpi_tad +acpi_thermal_rel +aesni_intel +af_alg +af_key +af_packet +agpgart +ahci +algif_aead +algif_hash +algif_skcipher +alx +amd64_edac +amd_pmc +amd_pstate +amdgpu +amdxcp +apple_mfi_fastcharge +appletalk +asn1_encoder +asus_atk0110 +asus_nb_wmi +asus_wmi +ata_generic +ata_piix +ath +ath9k_common +ath9k_htc +ath9k_hw +atkbd +atl1c +auth_rpcgss +autofs4 +battery +bch +binder +binfmt_misc +blake2b_generic +bluetooth +bnep +bpf +bpf_preload +br_netfilter +bridge +btbcm +btcoexist +btintel +btmtk +btrfs +btrtl +btusb +button +cbc +ccm +ccp +cdc_acm +cdc_ether +cdc_mbim +cdc_ncm +cdc_wdm +cdrom +cec +cfbcopyarea +cfbfillrect +cfbimgblt +cfg80211 +cgroup +ch341 +chacha_x86_64 +chipreg +cifs +cifs_arc4 +cifs_md4 +cls_cgroup +cmac +cmdlinepart +coretemp +cpufreq_ondemand +crc16 +crc32_generic +crc32_pclmul +crc32c_generic +crc32c_intel +crc64 +crc64_rocksoft +crc64_rocksoft_generic +crc_itu_t +crct10dif_pclmul +cryptd +crypto_null +crypto_simd +crypto_user +curve25519_x86_64 +cuse +dca +des_generic +dm_crypt +dm_log +dm_mirror +dm_mod +dm_multipath +dm_region_hash +dm_round_robin +dmi_sysfs +dns_resolver +drm +drm_buddy +drm_display_helper +drm_exec +drm_kms_helper +drm_panel_orientation_quirks +drm_suballoc_helper +drm_ttm_helper +dvb_core +ebtable_filter +ebtables +ec_sys +ecb +ecc +ecdh_generic +edac_mce_amd +ee1004 +eeepc_wmi +eeprom +efi_pstore +efivarfs +ehci_hcd +ehci_pci +enclosure +encrypted_keys +evdev +exfat +ext2 +ext4 +f2fs +fan +fat +fb_sys_fops +ff_memless +fixed_phy +fjes +fscache +ftdi_sio +fuse +fwnode_mdio +garp +gcm +gf128mul +ghash_clmulni_intel +ghash_generic +gigabyte_wmi +gpio_amdpt +gpio_generic +gpu_sched +grace +hfs +hfsplus +hid +hid_apple +hid_asus +hid_generic +hid_hyperv +hid_logitech_dj +hid_logitech_hidpp +hid_microsoft +hid_multitouch +hid_nintendo +hid_playstation +hid_roccat +hid_roccat_common +hid_roccat_koneplus +hid_roccat_ryos +hid_sony +hid_steam +hid_wiimote +hidp +hp_wmi +hv_balloon +hv_netvsc +hv_storvsc +hv_utils +hv_vmbus +hwmon_vid +hyperv_drm +hyperv_keyboard +i2c_algo_bit +i2c_core +i2c_dev +i2c_hid +i2c_hid_acpi +i2c_i801 +i2c_mux +i2c_nvidia_gpu +i2c_piix4 +i2c_smbus +i8042 +i915 +iTCO_vendor_support +iTCO_wdt +ib_cm +ib_core +idma64 +igb +igc +inet_diag +input_leds +int3400_thermal +int3403_thermal +int340x_thermal_zone +intel_agp +intel_cstate +intel_gtt +intel_hid +intel_lpss +intel_lpss_pci +intel_pch_thermal +intel_pmc_bxt +intel_powerclamp +intel_rapl_common +intel_rapl_msr +intel_soc_dts_iosf +intel_tcc_cooling +intel_uncore +intel_vsec +intel_wmi_thunderbolt +iommu_v2 +iommufd +ip6_tables +ip6_udp_tunnel +ip6t_REJECT +ip6t_rt +ip6table_filter +ip6table_mangle +ip6table_nat +ip6table_raw +ip6table_security +ip_set +ip_tables +ipmi_devintf +ipmi_msghandler +ipt_REJECT +iptable_filter +iptable_mangle +iptable_nat +iptable_raw +iptable_security +ipv6 +ir_kbd_i2c +irqbypass +isofs +it87 +iw_cm +iwlmei +iwlmvm +iwlwifi +jbd2 +jc42 +jfs +joydev +k10temp +ksmbd +kvm +kvm_amd +kvm_intel +led_class_multicolor +ledtrig_audio +ledtrig_timer +libahci +libarc4 +libata +libchacha +libchacha20poly1305 +libcrc32c +libcurve25519_generic +libdes +libphy +libps2 +llc +lm75 +lm83 +lockd +loop +lpc_ich +lz4 +lz4_compress +lz4hc_compress +lzo +lzo_rle +mac80211 +mac_hid +mbcache +mc +mc44s803 +md4 +md_mod +mdio +mdio_devres +mei +mei_gsc +mei_hdcp +mei_me +mei_pxp +mii +minix +mmc_core +mousedev +mptcp_diag +mrp +msdos +msr +mt20xx +mt76 +mt76_connac_lib +mt76_usb +mt76x02_lib +mt76x02_usb +mt76x2_common +mt76x2u +mt7921_common +mt7921e +mtd +mxm_wmi +nandcore +nbd +nct6683 +nct6775 +nct6775_core +netfs +nf_conntrack +nf_conntrack_broadcast +nf_conntrack_ftp +nf_conntrack_h323 +nf_conntrack_irc +nf_conntrack_netbios_ns +nf_conntrack_netlink +nf_conntrack_pptp +nf_conntrack_sip +nf_conntrack_tftp +nf_defrag_ipv4 +nf_defrag_ipv6 +nf_nat +nf_nat_ftp +nf_nat_h323 +nf_nat_irc +nf_nat_pptp +nf_nat_sip +nf_nat_tftp +nf_reject_ipv4 +nf_reject_ipv6 +nf_tables +nfnetlink +nfnetlink_log +nfnetlink_queue +nfs +nfsv4 +nft_chain_nat +nft_compat +nft_ct +nft_fib +nft_fib_inet +nft_fib_ipv4 +nft_fib_ipv6 +nft_masq +nft_nat +nft_reject +nft_reject_inet +nft_reject_ipv4 +nft_reject_ipv6 +nft_xfrm +nilfs2 +nlmon +nls_ascii +nls_cp437 +nls_iso8859_1 +nls_utf8 +nouveau +ntfs +ntfs3 +nvidia_wmi_ec_backlight +nvme +nvme_auth +nvme_common +nvme_core +nvmem_rave_sp_eeprom +nvram +overlay +p8022 +parport +parport_pc +pata_acpi +pcc_cpufreq +pcspkr +pinctrl_alderlake +pinctrl_amd +pkcs8_key_parser +pktcdvd +platform_profile +pmt_class +pmt_telemetry +poly1305_x86_64 +polyval_clmulni +polyval_generic +ppdev +pps_core +processor_thermal_device +processor_thermal_device_pci_legacy +processor_thermal_mbox +processor_thermal_rapl +processor_thermal_rfim +psmouse +psnap +ptp +qcserial +qrtr +r8152 +r8153_ecm +r8169 +radeon +raid1 +raid6_pq +rapl +rave_sp +raw_diag +rc_core +realtek +rfcomm +rfkill +rndis_host +rndis_wlan +rng_core +roles +rpcsec_gss_krb5 +rt2800lib +rt2800usb +rt2x00lib +rt2x00usb +rtl8192ee +rtl8723_common +rtl8723ae +rtl8723be +rtl8821ae +rtl_pci +rtlwifi +rtsx_pci +rtsx_pci_sdmmc +rtw88_8821c +rtw88_8821ce +rtw88_core +rtw88_pci +sch_cake +sch_fq_codel +sch_ingress +scsi_common +scsi_mod +scsi_transport_fc +scsi_transport_sas +sd_mod +selftests +serial_multi_instantiate +serio +serio_raw +ses +sg +sha1_ssse3 +sha256_ssse3 +sha512_ssse3 +snd +snd_acp3x_pdm_dma +snd_acp3x_rn +snd_acp6x_pdm_dma +snd_acp_config +snd_acp_pci +snd_aloop +snd_compress +snd_ctl_led +snd_hda_codec +snd_hda_codec_generic +snd_hda_codec_hdmi +snd_hda_codec_realtek +snd_hda_core +snd_hda_ext_core +snd_hda_intel +snd_hrtimer +snd_hwdep +snd_intel_dspcfg +snd_intel_sdw_acpi +snd_pci_acp3x +snd_pci_acp5x +snd_pci_acp6x +snd_pci_ps +snd_pcm +snd_pcm_dmaengine +snd_rawmidi +snd_rn_pci_acp3x +snd_rpl_pci_acp6x +snd_seq +snd_seq_device +snd_seq_dummy +snd_seq_midi +snd_seq_midi_event +snd_seq_oss +snd_seq_virmidi +snd_soc_acp6x_mach +snd_soc_acpi +snd_soc_acpi_intel_match +snd_soc_core +snd_soc_dmic +snd_soc_hdac_hda +snd_soc_skl +snd_soc_sst_dsp +snd_soc_sst_ipc +snd_sof +snd_sof_amd_acp +snd_sof_amd_rembrandt +snd_sof_amd_renoir +snd_sof_intel_hda +snd_sof_intel_hda_common +snd_sof_intel_hda_mlink +snd_sof_pci +snd_sof_pci_intel_cnl +snd_sof_pci_intel_tgl +snd_sof_probes +snd_sof_utils +snd_sof_xtensa_dsp +snd_timer +snd_ua101 +snd_ump +snd_usb_audio +snd_usb_us122l +snd_usb_usx2y +snd_usbmidi_lib +snd_virmidi +soundcore +soundwire_bus +soundwire_cadence +soundwire_generic_allocation +soundwire_intel +sp5100_tco +sparse_keymap +spi_intel +spi_intel_pci +spi_nor +squashfs +sr_mod +st +stp +sunrpc +syscopyarea +sysfillrect +sysimgblt +t10_pi +tap +tcp_bbr +tcp_diag +tda18271 +tda827x +tda8290 +tda9887 +tea5761 +tea5767 +tee +tg3 +thermal +thinkpad_acpi +thunderbolt +tiny_power_button +tls +tpm +tpm_crb +tpm_tis +tpm_tis_core +trusted +ttm +tun +tuner_simple +tuner_types +tunnel4 +tunnel6 +typec +typec_ucsi +uas +ucsi_acpi +ucsi_ccg +udf +udp_diag +udp_tunnel +ufs +uhci_hcd +uhid +uinput +uio +uio_pdrv_genirq +unix_diag +usb_common +usb_storage +usb_wwan +usbcore +usbhid +usbip_core +usbip_host +usbmon +usbnet +uvc +uvcvideo +uvesafb +v4l2_dv_timings +veth +vfat +vfio +vfio_iommu_type1 +vfio_pci +vfio_pci_core +vhost +vhost_iotlb +vhost_net +video +videobuf2_common +videobuf2_memops +videobuf2_v4l2 +videobuf2_vmalloc +videodev +virtio_pci +virtio_pci_legacy_dev +virtio_pci_modern_dev +virtio_scsi +vivaldi_fmap +vmw_vmci +vmw_vsock_virtio_transport_common +vmw_vsock_vmci_transport +vsock +vsock_loopback +wacom +watchdog +wireguard +wireless_hotkey +wmi +wmi_bmof +x86_pkg_temp_thermal +x_tables +xc2028 +xc4000 +xc5000 +xfrm6_tunnel +xfrm_interface +xfs +xhci_hcd +xhci_pci +xhci_pci_renesas +xor +xpad +xt_CHECKSUM +xt_LOG +xt_MASQUERADE +xt_NFQUEUE +xt_REDIRECT +xt_addrtype +xt_cgroup +xt_comment +xt_conntrack +xt_hl +xt_limit +xt_mark +xt_nat +xt_recent +xt_state +xt_tcpudp +xxhash_generic +zlib_deflate +zram From 0b3b51441df0db5d83b51e809aef5ed30f532fc4 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Fri, 27 Sep 2024 19:19:39 +0300 Subject: [PATCH 2/3] Hardcode modprobed-db path Signed-off-by: Vasiliy Stelmachenok --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4a69e36eb..48f2b6c5e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: id: makepkg uses: CachyOS/pkgbuild-action@master with: - envvars: "_build_zfs=y _use_auto_optimization= _cc_harder= _localmodcfg=y _localmodcfg_path=${{ github.workspace }}/modprobed.db" + envvars: "_build_zfs=y _use_auto_optimization= _cc_harder= _localmodcfg=y _localmodcfg_path=/github/workspace/modprobed.db" pkgdir: "linux-cachyos" namcapExcludeRules: "invalidstartdir" makepkgArgs: "--skipchecksums --skippgpcheck --noconfirm -s" @@ -29,7 +29,7 @@ jobs: id: makepkg uses: CachyOS/pkgbuild-action@master with: - envvars: "CI=1 _build_zfs=y _use_llvm_lto=thin _use_auto_optimization= _cc_harder= _localmodcfg=y _localmodcfg_path=${{ github.workspace }}/modprobed.db" + envvars: "CI=1 _build_zfs=y _use_llvm_lto=thin _use_auto_optimization= _cc_harder= _localmodcfg=y _localmodcfg_path=/github/workspace/modprobed.db" pkgdir: "linux-cachyos" namcapExcludeRules: "invalidstartdir" makepkgArgs: "--skipchecksums --skippgpcheck --noconfirm -s" From b8ef12bd94cafdb64178ec14a45041b3020c9846 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Fri, 27 Sep 2024 20:13:17 +0300 Subject: [PATCH 3/3] Fix die function exit code exit() without argument returns the code of the previous command, but error() is always successful. Signed-off-by: Vasiliy Stelmachenok --- linux-cachyos-bmq/PKGBUILD | 2 +- linux-cachyos-bore/PKGBUILD | 2 +- linux-cachyos-deckify/PKGBUILD | 2 +- linux-cachyos-eevdf/PKGBUILD | 2 +- linux-cachyos-hardened/PKGBUILD | 2 +- linux-cachyos-lts/PKGBUILD | 2 +- linux-cachyos-rc/PKGBUILD | 2 +- linux-cachyos-rt-bore/PKGBUILD | 2 +- linux-cachyos-sched-ext/PKGBUILD | 2 +- linux-cachyos-server/PKGBUILD | 2 +- linux-cachyos/PKGBUILD | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index 74f2872e9..1a9178451 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index 8053b3799..6dac2f9af 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index 188a7f6b3..1548b052e 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -259,7 +259,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index a5001070f..ce6d6ec32 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index 84db670f8..62ab4e606 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -252,7 +252,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index aee42f083..da2ceeef5 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -279,7 +279,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 6ccef8cd5..92986f841 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 839bc6019..d2921725b 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index a6d1da2fe..5f2ac4c89 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 3ee735235..69b55e130 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 4987d82c2..42eb244a9 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -256,7 +256,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname"