From e9c258f8c265c70e6aafb2052ea12791b78e0628 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 31 Jul 2023 14:19:00 +0100 Subject: [PATCH 1/3] Use == instead of = for comparison --- cmake/ci/build_sdrangel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ci/build_sdrangel.sh b/cmake/ci/build_sdrangel.sh index 7cf263bcc..3f4494f6b 100755 --- a/cmake/ci/build_sdrangel.sh +++ b/cmake/ci/build_sdrangel.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ ${CI_LINUX} = true ]; then +if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ ${CI_LINUX} == true ]; then debuild -i -us -uc -b else mkdir -p build; cd build From 6899a3265502cf5446c1544c814709378a2b4295 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 31 Jul 2023 19:20:18 +0100 Subject: [PATCH 2/3] Remove external projects from .deb --- debian/rules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/rules b/debian/rules index da185a490..3fba268de 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,12 @@ override_dh_auto_configure: dh_auto_configure -- -DARCH_OPT=nehalem -DENABLE_EXTERNAL_LIBRARIES=AUTO -DDEBUG_OUTPUT=ON -DBUILD_SERVER=OFF +# delete any external projects (such as libsigmf) that are installed +# would be better if we could prevent them from being installed in CMakeLists.txt +override_dh_install: + -find debian/sdrangel -type d -name external -exec rm -r {} \; -exec mkdir {} \; -exec rmdir -p {} \; + dh_install + override_dh_auto_test: echo "Skipping test step" From bf1feb5835c189594c063b5ee9a6199df2ee2ca1 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 31 Jul 2023 20:34:45 +0100 Subject: [PATCH 3/3] Use bash as sh doesn't support the condition --- cmake/ci/build_sdrangel.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ci/build_sdrangel.sh b/cmake/ci/build_sdrangel.sh index 3f4494f6b..f78b32d1f 100755 --- a/cmake/ci/build_sdrangel.sh +++ b/cmake/ci/build_sdrangel.sh @@ -1,6 +1,6 @@ -#!/bin/sh -e +#!/bin/bash -e -if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ ${CI_LINUX} == true ]; then +if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ "${CI_LINUX}" == true ]; then debuild -i -us -uc -b else mkdir -p build; cd build