diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2017-12-31 10:59:21 +0100 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2017-12-31 10:59:21 +0100 |
| commit | aa4053891c11d1934e7f91aeb0b423e39250ccd9 (patch) | |
| tree | 823b882876ff3952fadae4687ed92e07ef4e9ad1 | |
| parent | ccd147ccfdc2fe2824c0f35c7a00e7d5b323ef86 (diff) | |
| download | navit-aa4053891c11d1934e7f91aeb0b423e39250ccd9.tar.gz | |
Sailfish build on newer SDKs (#388)
* Allow building on new sailfish SDK which uses different tool paths
* Add notice about exportig VERSION_ID
* Add check for VERSION_ID variable.
| -rwxr-xr-x | contrib/sailfish/build_on_sailfish_sdk.sh | 9 | ||||
| -rwxr-xr-x | contrib/sailfish/navit-sailfish.spec | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/contrib/sailfish/build_on_sailfish_sdk.sh b/contrib/sailfish/build_on_sailfish_sdk.sh index 663d31b48..78cec2385 100755 --- a/contrib/sailfish/build_on_sailfish_sdk.sh +++ b/contrib/sailfish/build_on_sailfish_sdk.sh @@ -1,7 +1,10 @@ #! /bin/sh -#run on the Sailfish OS sdk virtual machine. Check that rpmbuild directory exists. +#run on the Sailfish OS sdk virtual machine. Check that rpmbuild directory exists. Remember to export VERSION_ID + +if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSION_ID?"; exit 1; fi + #arm devices -sb2 -t SailfishOS-armv7hl -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec +sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec #intel devices -sb2 -t SailfishOS-i486 -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec +sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec index a798aa487..d8799fb41 100755 --- a/contrib/sailfish/navit-sailfish.spec +++ b/contrib/sailfish/navit-sailfish.spec @@ -15,6 +15,8 @@ License: GPL Group: Applications/Productivity URL: http://navit-projet.org/ +#git is vor version info while building +BuildRequires: git BuildRequires: gcc BuildRequires: cmake BuildRequires: glib2-devel |