From 0b157c90b51f94cb17e234fb100acbaec3e090d5 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Mon, 11 Mar 2024 17:31:01 +0100 Subject: [PATCH] Fix makepkg versioning error (last try pls) --- PKGBUILD | 6 +++--- PKGBUILD.buildtool | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 238fd75..f3afc0b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -112,7 +112,7 @@ options=('!strip') 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.sign" - "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" + "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${_kernel_major}.${_kernel_minor}.xz" "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_srcname_clpatches}" "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz" ) @@ -135,7 +135,7 @@ prepare() { ### Add upstream patches echo ":: prepare: adding upstream patches" - patch -Np1 -i ../patch-${pkgver} || true + patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true ### Setting version echo ":: prepare: updating version" @@ -232,7 +232,7 @@ prepare() { ### Save configuration for later reuse [[ -z "$_copyfinalconfig" ]] || ( echo ":: prepare: copying configuration file into kernel-optimized repository" - cp -Tf ./.config "${startdir}/finalconfig-${pkgver}-${pkgrel}${pkgbase#linux}" + cp -Tf ./.config "${startdir}/kconfig-final" ) echo ":: prepare: prepare() finished" } diff --git a/PKGBUILD.buildtool b/PKGBUILD.buildtool index 10492ce..5e619cf 100644 --- a/PKGBUILD.buildtool +++ b/PKGBUILD.buildtool @@ -28,7 +28,7 @@ options=('!strip') 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.sign" - "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" + "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${_kernel_major}.${_kernel_minor}.xz" "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_srcname_clpatches}" "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz" ) @@ -51,7 +51,7 @@ prepare() { ### Add upstream patches echo ":: prepare: adding upstream patches" - patch -Np1 -i ../patch-${pkgver} || true + patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true ### Setting version echo ":: prepare: updating version" @@ -148,7 +148,7 @@ prepare() { ### Save configuration for later reuse [[ -z "$_copyfinalconfig" ]] || ( echo ":: prepare: copying configuration file into kernel-optimized repository" - cp -Tf ./.config "${startdir}/finalconfig-${pkgver}-${pkgrel}${pkgbase#linux}" + cp -Tf ./.config "${startdir}/kconfig-final" ) echo ":: prepare: prepare() finished" }