diff options
author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-10-17 11:58:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-17 11:58:23 +0200 |
commit | f31219c790c63652dddd2a3d7515bae036457132 (patch) | |
tree | f5607a04c1e1e8f639755dafa09e7ea1bb70907c | |
parent | 5681c7da7111f95090bfdacc2ac02f9b6cf2c937 (diff) | |
parent | 49b7f6d2580d2b2ec0609d740495da304e90363e (diff) | |
download | navit-fix_zip64.tar.gz |
Merge branch 'trunk' into fix_zip64fix_zip64
-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 |