From 129d26c332ff14634e3eaaea4d1afd6eb5b50098 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Sat, 14 Jan 2023 17:45:58 +0100 Subject: [PATCH] Get rid of _srcpath --- PKGBUILD | 6 ++---- linux-tkg-config/prepare | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a5ecdb7..8ddc817 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -48,8 +48,6 @@ fi source "$_where"/BIG_UGLY_FROGMINER -_srcpath="linux-src-git" - if [ -n "$_custom_pkgbase" ]; then pkgbase="${_custom_pkgbase}" else @@ -173,9 +171,9 @@ hackbase() { install -Dm644 "${srcdir}"/customization-full.cfg "${pkgdir}/usr/share/doc/${pkgbase}/customization.cfg" # workaround for missing header with winesync - if [ -e "${srcdir}/${_srcpath}/include/uapi/linux/winesync.h" ]; then + if [ -e "${_kernel_work_folder_abs}/include/uapi/linux/winesync.h" ]; then msg2 "Workaround missing winesync header" - install -Dm644 "${srcdir}/${_srcpath}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h" + install -Dm644 "${_kernel_work_folder_abs}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h" fi # load winesync module at boot diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index b9c3412..42eb305 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -1574,7 +1574,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r # Community patches if [ -n "$_community_patches" ]; then if [ ! -d "$_where/../community-patches" ]; then - cd "$_where/.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${srcdir}/${_srcpath}" + cd "$_where/.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${_kernel_work_folder_abs}" fi _community_patches=($_community_patches) mkdir -p "$_where"/linux"$_basever"-tkg-userpatches