Skip to content

Commit

Permalink
Merge pull request f4exb#1754 from srcejon/fix_1740
Browse files Browse the repository at this point in the history
Fix syntax error in cmake/ci/build_sdrangel.sh and remote external files from .deb
  • Loading branch information
f4exb authored Jul 31, 2023
2 parents e7b0921 + bf1feb5 commit c50e599
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmake/ci/build_sdrangel.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit c50e599

Please sign in to comment.