Fix makepkg versioning error (last try pls)

This commit is contained in:
JeremyStar™ 2024-03-11 17:31:01 +01:00
parent 690fd8f981
commit 0b157c90b5
2 changed files with 6 additions and 6 deletions

View file

@ -112,7 +112,7 @@ 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"
"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}" "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" "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 ### Add upstream patches
echo ":: prepare: adding upstream patches" echo ":: prepare: adding upstream patches"
patch -Np1 -i ../patch-${pkgver} || true patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
### Setting version ### Setting version
echo ":: prepare: updating version" echo ":: prepare: updating version"
@ -232,7 +232,7 @@ prepare() {
### Save configuration for later reuse ### Save configuration for later reuse
[[ -z "$_copyfinalconfig" ]] || ( [[ -z "$_copyfinalconfig" ]] || (
echo ":: prepare: copying configuration file into kernel-optimized repository" 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" echo ":: prepare: prepare() finished"
} }

View file

@ -28,7 +28,7 @@ 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"
"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}" "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" "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 ### Add upstream patches
echo ":: prepare: adding upstream patches" echo ":: prepare: adding upstream patches"
patch -Np1 -i ../patch-${pkgver} || true patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
### Setting version ### Setting version
echo ":: prepare: updating version" echo ":: prepare: updating version"
@ -148,7 +148,7 @@ prepare() {
### Save configuration for later reuse ### Save configuration for later reuse
[[ -z "$_copyfinalconfig" ]] || ( [[ -z "$_copyfinalconfig" ]] || (
echo ":: prepare: copying configuration file into kernel-optimized repository" 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" echo ":: prepare: prepare() finished"
} }