diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2018-06-05 00:54:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 00:54:05 +0200 |
| commit | 2c4b004189386ac9a60fc9c41f4fac00d7dfd4e2 (patch) | |
| tree | 1b25c77f1382106d57ab6531c39c98387f8e285e | |
| parent | 8c2cda867d56ef4c5c965eab48668fb9acac0ac5 (diff) | |
| parent | 6148aec3a90a51fdf294cb5d50c7a894b2853339 (diff) | |
| download | navit-2c4b004189386ac9a60fc9c41f4fac00d7dfd4e2.tar.gz | |
Merge pull request #621 from navit-gps/revert_612_for_sailfish
Revert #612 for sailfish build script
| -rwxr-xr-x | contrib/sailfish/build_on_sailfish_sdk.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/sailfish/build_on_sailfish_sdk.sh b/contrib/sailfish/build_on_sailfish_sdk.sh index a3d515ab0..2aa8ca3dc 100755 --- a/contrib/sailfish/build_on_sailfish_sdk.sh +++ b/contrib/sailfish/build_on_sailfish_sdk.sh @@ -1,12 +1,16 @@ #! /bin/sh #run on the Sailfish OS sdk virtual machine. Check that rpmbuild directory exists. Remember to export VERSION_ID +# please don't mess around with those lines without testing, +# even if some fancy tool tells you to do so to save some pipes. +# -metalstrolch- + if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSION_ID?"; exit 1; fi #arm devices -sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-install -R zypper in `grep navit-sailfish.spec "^BuildRequires: " | sed -e "s/BuildRequires: //"` +sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-install -R zypper in $(grep "^BuildRequires: " navit-sailfish.spec | sed -e "s/BuildRequires: //") 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-${VERSION_ID}-i486 -m sdk-install -R zypper in `grep navit-sailfish.spec "^BuildRequires: " | sed -e "s/BuildRequires: //"` +sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-install -R zypper in $(grep "^BuildRequires: " navit-sailfish.spec | sed -e "s/BuildRequires: //") sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec |