diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-10-18 10:33:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 10:33:35 +0200 |
| commit | 4579a8b1bee0237ddfe1c2feaaa0b1b6e152ee47 (patch) | |
| tree | bc752a1132c615b2737ded7bd93576cbbf989727 /contrib | |
| parent | a59c6ffc0f6d9ebcf95160d5dcacf2d824e54b07 (diff) | |
| parent | 6c16e5a752d088db6c0714834ae1723b02d2c127 (diff) | |
| download | navit-maptool_turn_restriction_threading.tar.gz | |
Merge branch 'trunk' into maptool_turn_restriction_threadingmaptool_turn_restriction_threading
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/sailfish/build_sailfish_ci.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sailfish/build_sailfish_ci.sh b/contrib/sailfish/build_sailfish_ci.sh index 58d1022f3..55a20317d 100755 --- a/contrib/sailfish/build_sailfish_ci.sh +++ b/contrib/sailfish/build_sailfish_ci.sh @@ -17,6 +17,6 @@ mkdir $HOME/rpmbuild sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-install -R zypper --non-interactive in $(grep "^BuildRequires: " navit-sailfish.spec | sed -e "s/BuildRequires: //") sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-build rpmbuild --define "_topdir /home/nemo/rpmbuild" --define "navit_source ${SCRIPTPATH}/../.." -bb navit-sailfish.spec #intel devices -sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-install -R zypper --non-interactive in $(grep "^BuildRequires: " navit-sailfish.spec | sed -e "s/BuildRequires: //") -sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/nemo/rpmbuild" --define "navit_source ${SCRIPTPATH}/../.." -bb navit-sailfish.spec +#sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-install -R zypper --non-interactive in $(grep "^BuildRequires: " navit-sailfish.spec | sed -e "s/BuildRequires: //") +#sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/nemo/rpmbuild" --define "navit_source ${SCRIPTPATH}/../.." -bb navit-sailfish.spec |