diff options
| author | Patrick Höhn <hoehnp@gmx.de> | 2018-10-05 15:09:42 +0200 |
|---|---|---|
| committer | Patrick Höhn <hoehnp@gmx.de> | 2018-10-05 15:09:42 +0200 |
| commit | 9289c1e29d55aa25b077c3170974979f3504a094 (patch) | |
| tree | 805a904ea745473649f0c9563b1e21cd4a44ee5e | |
| parent | e6667d2034f13384574b021c5f08d21bdc9667ab (diff) | |
| download | navit-9289c1e29d55aa25b077c3170974979f3504a094.tar.gz | |
further corrections for the sailfish build
ändrad: .circleci/config.yml
ändrad: contrib/sailfish/build_sailfish.sh
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rwxr-xr-x | contrib/sailfish/build_sailfish.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 771a748b9..7693ef06a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -237,9 +237,9 @@ jobs: command: | cd contrib/sailfish/ && export VERSION_ID=2.2.1.18 && bash build_sailfish.sh - store_artifacts: - path: ../rpmbuild/RPMS/armv7hl + path: ../../../rpmbuild/RPMS/armv7hl - store_artifacts: - path: ../rpmbuild/RPMS/i586 + path: ../../../rpmbuild/RPMS/i586 merge_trunk_in_master: <<: *defaults steps: diff --git a/contrib/sailfish/build_sailfish.sh b/contrib/sailfish/build_sailfish.sh index 2d582400f..b7af7ab46 100755 --- a/contrib/sailfish/build_sailfish.sh +++ b/contrib/sailfish/build_sailfish.sh @@ -5,8 +5,8 @@ if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSI #arm devices 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 $(pwd)/.." -bb navit-sailfish.spec +sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-build rpmbuild --define "_topdir /home/nemo/rpmbuild" --define "navit_source $(pwd)/../.." -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 $(pwd)/.." -bb navit-sailfish.spec +sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/nemo/rpmbuild" --define "navit_source $(pwd)/../.." -bb navit-sailfish.spec |