add missing space between ! and get_target_build_options and put all the path variables in quotes
This commit is contained in:
parent
6f9d40e1cb
commit
6f68ebd738
2 changed files with 15 additions and 53 deletions
30
PKGBUILD
30
PKGBUILD
|
@ -38,8 +38,8 @@ b2sums=('024826402eaf156b36d300d162a0e90a70f82902901e3a78a669d0c6f63dc12b7cbebec
|
||||||
'SKIP')
|
'SKIP')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
_pkgbase=$srcdir/${pkgname%%-*}
|
_pkgbase="$srcdir/${pkgname%%-*}"
|
||||||
cd $_pkgbase
|
cd "$_pkgbase"
|
||||||
|
|
||||||
# Deactivate these statements; they bundle the libs for AppImage.
|
# Deactivate these statements; they bundle the libs for AppImage.
|
||||||
for pattern in "LIBSSL1" "LIBUSB1" "DFU_UTIL"; do
|
for pattern in "LIBSSL1" "LIBUSB1" "DFU_UTIL"; do
|
||||||
|
@ -48,28 +48,28 @@ prepare() {
|
||||||
|
|
||||||
cd "$_pkgbase/radio/src/thirdparty/"
|
cd "$_pkgbase/radio/src/thirdparty/"
|
||||||
git submodule init
|
git submodule init
|
||||||
git config submodule.AccessDenied.url $srcdir/AccessDenied
|
git config submodule.AccessDenied.url "$srcdir/AccessDenied"
|
||||||
git config submodule.FreeRTOS-Kernel.url $srcdir/FreeRTOS-Kernel
|
git config submodule.FreeRTOS-Kernel.url "$srcdir/FreeRTOS-Kernel"
|
||||||
git config submodule.Segger_RTT.url $srcdir/Segger_RTT
|
git config submodule.Segger_RTT.url "$srcdir/Segger_RTT"
|
||||||
git config submodule.lvgl.url $srcdir/lvgl
|
git config submodule.lvgl.url "$srcdir/lvgl"
|
||||||
git config submodule.stb.url $srcdir/stb
|
git config submodule.stb.url "$srcdir/stb"
|
||||||
git config submodule.uf2.url $srcdir/uf2
|
git config submodule.uf2.url "$srcdir/uf2"
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
|
|
||||||
cd "$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"
|
cd "$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"
|
||||||
git submodule init
|
git submodule init
|
||||||
git config submodule.FreeRTOS-Kernel-Community-Supported-Ports.url $srcdir/Community-Supported-Ports
|
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 config submodule.FreeRTOS-Kernel-Partner-Supported-Ports.url "$srcdir/Partner-Supported-Ports"
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
|
|
||||||
cd "$_pkgbase/radio/src/thirdparty/uf2/"
|
cd "$_pkgbase/radio/src/thirdparty/uf2/"
|
||||||
git submodule init
|
git submodule init
|
||||||
git config submodule.hidapi.url $srcdir/hidapi
|
git config submodule.hidapi.url "$srcdir/hidapi"
|
||||||
git -c protocol.file.allow=always submodule update --init
|
git -c protocol.file.allow=always submodule update --init
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $srcdir/edgetx
|
cd edgetx
|
||||||
export EDGETX_VERSION_TAG=$pkgver
|
export EDGETX_VERSION_TAG=$pkgver
|
||||||
COMMON_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release"
|
COMMON_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release"
|
||||||
source tools/build-common.sh # Provides get_target_build_options() for retrieving individual build options per simulated radio.
|
source tools/build-common.sh # Provides get_target_build_options() for retrieving individual build options per simulated radio.
|
||||||
|
@ -95,7 +95,7 @@ build() {
|
||||||
|
|
||||||
echo "Building ${plugin}"
|
echo "Building ${plugin}"
|
||||||
|
|
||||||
if !get_target_build_options "$plugin"; then
|
if ! get_target_build_options "$plugin"; then
|
||||||
echo "Error: Failed to find a match for target '$plugin'"
|
echo "Error: Failed to find a match for target '$plugin'"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -110,7 +110,7 @@ build() {
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd $srcdir/edgetx/build/native
|
cd edgetx/build/native
|
||||||
make DESTDIR=$pkgdir/ install
|
make DESTDIR="$pkgdir/" install
|
||||||
install -Dm644 "$srcdir/edgetx/LICENSE" "$pkgdir/usr/share/licenses/edgetx-companion/LICENSE"
|
install -Dm644 "$srcdir/edgetx/LICENSE" "$pkgdir/usr/share/licenses/edgetx-companion/LICENSE"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
@@ -30,7 +30,7 @@
|
|
||||||
SRCDIR=$1
|
|
||||||
OUTDIR=$2
|
|
||||||
|
|
||||||
-COMMON_OPTIONS="-DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release"
|
|
||||||
+COMMON_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release"
|
|
||||||
if [ "$(uname)" = "Darwin" ]; then
|
|
||||||
COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
|
|
||||||
elif [ "$(uname)" != "Linux" ]; then # Assume Windows and MSYS2
|
|
||||||
@@ -59,9 +59,9 @@
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
-rm -rf build
|
|
||||||
-mkdir build
|
|
||||||
-cd build
|
|
||||||
+rm -rf ${OUTDIR}
|
|
||||||
+mkdir ${OUTDIR}
|
|
||||||
+cd ${OUTDIR}
|
|
||||||
|
|
||||||
declare -a simulator_plugins=(x9lite x9lites
|
|
||||||
x7 x7-access
|
|
||||||
@@ -176,14 +176,4 @@
|
|
||||||
cmake --build native -j"${JOBS}" --target libsimulator
|
|
||||||
done
|
|
||||||
|
|
||||||
-cmake --build . --target native-configure
|
|
||||||
-if [ "$(uname)" = "Darwin" ]; then
|
|
||||||
- cmake --build native -j"${JOBS}" --target package
|
|
||||||
- cp native/*.dmg "${OUTDIR}"
|
|
||||||
-elif [ "$(uname)" = "Linux" ]; then
|
|
||||||
- cmake --build native -j"${JOBS}" --target package
|
|
||||||
- cp native/*.AppImage "${OUTDIR}"
|
|
||||||
-else
|
|
||||||
- cmake --build native --target installer
|
|
||||||
- cp native/companion/*.exe "${OUTDIR}"
|
|
||||||
-fi
|
|
||||||
+cmake ${BUILD_OPTIONS} "${OUTDIR}/native"
|
|
Loading…
Add table
Reference in a new issue