From fcd58bf333a0aefa689a74727153a396b7e10bbb Mon Sep 17 00:00:00 2001
From: lod <github@bremsspur.org>
Date: Wed, 12 Mar 2025 17:02:12 +0100
Subject: [PATCH 1/2] remove unnecessary _pkgbase variable

---
 PKGBUILD | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index e1b671d..276f284 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,15 +38,12 @@ b2sums=('024826402eaf156b36d300d162a0e90a70f82902901e3a78a669d0c6f63dc12b7cbebec
         'SKIP')
 
 prepare() {
-  _pkgbase="$srcdir/${pkgname%%-*}"
-  cd "$_pkgbase"
-
   # Deactivate these statements; they bundle the libs for AppImage.
   for pattern in "LIBSSL1" "LIBUSB1" "DFU_UTIL"; do
-      sed -i "s/if(${pattern}_FOUND)/if(false)/g" ./companion/src/CMakeLists.txt
+      sed -i "s/if(${pattern}_FOUND)/if(false)/g" ./edgetx/companion/src/CMakeLists.txt
   done
 
-  cd "$_pkgbase/radio/src/thirdparty/"
+  cd "$srcdir/edgetx/radio/src/thirdparty/"
   git submodule init
   git config submodule.AccessDenied.url "$srcdir/AccessDenied"
   git config submodule.FreeRTOS-Kernel.url "$srcdir/FreeRTOS-Kernel"
@@ -56,13 +53,13 @@ prepare() {
   git config submodule.uf2.url "$srcdir/uf2"
   git submodule update --init
 
-  cd "$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"
+  cd "$srcdir/edgetx/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"
   git submodule init
   git config submodule.FreeRTOS-Kernel-Community-Supported-Ports.url "$srcdir/Community-Supported-Ports"
   git config submodule.FreeRTOS-Kernel-Partner-Supported-Ports.url "$srcdir/Partner-Supported-Ports"
   git submodule update --init
 
-  cd "$_pkgbase/radio/src/thirdparty/uf2/"
+  cd "$srcdir/edgetx/radio/src/thirdparty/uf2/"
   git submodule init
   git config submodule.hidapi.url "$srcdir/hidapi"
   git -c protocol.file.allow=always submodule update --init

From 3469bf3c106f4fc8baaf43ff55eaa4706910d589 Mon Sep 17 00:00:00 2001
From: lod <github@bremsspur.org>
Date: Wed, 12 Mar 2025 19:27:28 +0100
Subject: [PATCH 2/2] use companion target

---
 PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PKGBUILD b/PKGBUILD
index 276f284..9e67dea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -103,7 +103,8 @@ build() {
     cmake --build native --target libsimulator
   done
 
-  cmake ${BUILD_OPTIONS} "$srcdir/edgetx/build/native"
+  cmake --build . --target native-configure
+  cmake --build native --target companion
 }
 
 package() {