cmake: set the CPACK_DEBIAN_PACKAGE_ARCHITECTURE for old versions of … #212
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This should resolve #200 @tfcollins : Can you try out the build artifact after travis-ci is done? -Robin |
|
@tfcollins confirmed that this resolves things - Trusty builds are passing: https://travis-ci.org/analogdevicesinc/libad9361-iio/builds/448600312 |
Closed
commodo
reviewed
Oct 31, 2018
cmake/LinuxPackaging.cmake
Outdated
| @@ -109,4 +109,17 @@ if (CPACK_RPM_PACKAGE_REQUIRES) | |||
| message(STATUS "Package dependencies (.rpm): " ${CPACK_RPM_PACKAGE_REQUIRES}) | |||
| endif() | |||
|
|
|||
| if(${CMAKE_MAJOR_VERSION} LESS 3) | |||
| # old versions of cmake dont include this, but the same vintage of dpk requires it | |||
commodo
approved these changes
Oct 31, 2018
|
|
…Cmake Old versions (2.8.12) of cmake don't automatically set the debian package architecture. This causes dpkg errors like: dpkg: warning: parsing file '/var/lib/dpkg/tmp.ci/control' near line 10 package 'libiio': empty value for architecture dpkg: error processing archive ./master_latest_libiio-trusty.deb (--install): package architecture () does not match system (amd64) This resolved that error by automatically setting it for old (pre 3) cmakes. Signed-off-by: Robin Getz <[email protected]>
|
fixed typo. Thanks |
mhennerich
added a commit
that referenced
this pull request
Nov 21, 2018
Changelog: 20c9079 CI/travis/inside_bionic_docker.sh: re-use the make_linux logic cd1be7d build,travis: parametrize library name 2b4503d README.md : Update with links to doc cf87e0a travis-ci: install graphviz 2f3632f doxygen: check if building on a case senstive file system. a18ff6e doxygen: If dot exists, use it. cb28721 appveyor: install graphviz and fix doxygen version 550f4b8 README: Update with latest build changes 540c96b deployment : export the LDIST var which is needed in other scripts de8356b fix snprintf warnings from gcc 8 24c7f00 .travis.yml: Add new Xcode versions to the Travis CI builds. d65cabb CI/travis/before_install_darwin: Handle brew failures when installing packages. 29c582e .travis.yml: Drop the Travis CI builds for OSX Image xcode 6.4. 6799876 .travis.yml: Drop the Travis CI builds for Ubuntu 12.04 LTS (Precise Pangolin). f18ed59 .travis.yml: Add support for Ubuntu 18.04 (Bionic) builds. 983657a cmake/LinuxPackaging.cmake: Add libserialport to the list of dependencies that are being handled when creating Linux packages. 25c20d6 channel: Fix #219 get_modifier and get_type seems to work incorrectly ed6709e sorting: ensure sorting happens after global attributes are added f05434e travis-ci: don't hard code distributions anymore 9b75895 Revert "sort: Move channel attribute sorting to context creation" fix #215 cf39834 cmake: set the CPACK_DEBIAN_PACKAGE_ARCHITECTURE for old versions of Cmake 76d4ff7 buffer: Fix bug in mask bit tests (continued) b7407af IIOD: Fix bug in mask bit tests (continued) 37ecd2e Update README.md with newest centos packages 5dd1ff9 add note about triggered buffers in dox source 98d85f6 local: pass errors up the stack 879abfe usb: Increase ctrl pipe timeout da13ffc usb: add libusb version to context attributes 876db45 usb: be more verbose when unable to claim an interface 686ced9 travis : Add the LDIST for centos db47744 Ensure iio_info can find a locally installed libiio.so c5973cf fix whitespace damage from previous commits 67a994c sort: when sorting iio_channels, if the index is the same, use ID b9008a7 sort: Move channel attribute sorting to context creation 8405704 sort: change function names to be more descriptive/accurate afd6d69 Update FIR enable function in ML bindings to not force sample rate ahead of filter write. 53bfb03 local: Sort devices, channels and attributes when adding them. 256a80a appveyor.yml: Downgrade curl from 7.61.1-3 to 7.61.1-2 15ddcd6 Fix FIR load function in ML bindings to actually enable the FIR once loaded. 4c9a050 CI/travis/inside_centos_docker.sh: hack/patch CPackRPM.cmake for CentOS 7 f60f957 cmake/LinuxPackaging.cmake: use non-dev packages to .deb dep list ed6d860 CI/travis/make_linux: install deb package as final test cfe093a build,CI/travis: setup CentOS testing 4a39cb6 CI/travis: enable errexit & xtrace behavior in scripts 77a1154 CI/travis/before_deploy: move `grep` expression in `find` a05d607 .gitignore: add vim swap files 0b23cbe spelling fonction->function ee936e8 Fix bug in mask bit tests c80412c cmake: Suppress errors when looking up the git repository path 2a76c2e .travis.yml: add host-key algo ssh-dss for xenial deploy b853fdb appveyor.yml: change versioning to '{branch}.{build}' format 0950037 CI/travis/deploy: extend cleanup to all debian packages 2b1c4b8 README.md: add Xenial artifact links ea80423 .travis.yml: add Xenial distro to job run Alexandra Trifan (1): appveyor.yml: Downgrade curl from 7.61.1-3 to 7.61.1-2 . Alexandra.Trifan (6): cmake/LinuxPackaging.cmake: Add libserialport to the list of dependencies that are being handled when creating Linux packages. .travis.yml: Add support for Ubuntu 18.04 (Bionic) builds. .travis.yml: Drop the Travis CI builds for Ubuntu 12.04 LTS (Precise Pangolin). .travis.yml: Drop the Travis CI builds for OSX Image xcode 6.4. CI/travis/before_install_darwin: Handle brew failures when installing packages. .travis.yml: Add new Xcode versions to the Travis CI builds. Alexandru Ardelean (14): .travis.yml: add Xenial distro to job run README.md: add Xenial artifact links CI/travis/deploy: extend cleanup to all debian packages appveyor.yml: change versioning to '{branch}.{build}' format .travis.yml: add host-key algo ssh-dss for xenial deploy .gitignore: add vim swap files CI/travis/before_deploy: move `grep` expression in `find` CI/travis: enable errexit & xtrace behavior in scripts build,CI/travis: setup CentOS testing CI/travis/make_linux: install deb package as final test cmake/LinuxPackaging.cmake: use non-dev packages to .deb dep list CI/travis/inside_centos_docker.sh: hack/patch CPackRPM.cmake for CentOS 7 build,travis: parametrize library name CI/travis/inside_bionic_docker.sh: re-use the make_linux logic David Frey (2): Fix bug in mask bit tests spelling fonction->function Lars-Peter Clausen (2): cmake: Suppress errors when looking up the git repository path usb: Increase ctrl pipe timeout Michael Hennerich (15): Merge pull request #175 from analogdevicesinc/sort Merge pull request #203 from analogdevicesinc/sort1 Merge pull request #206 from analogdevicesinc/rgetz-patch-1 Merge pull request #201 from analogdevicesinc/fix-ml-bindings Merge pull request #207 from analogdevicesinc/rgetz-patch-2 IIOD: Fix bug in mask bit tests (continued) buffer: Fix bug in mask bit tests (continued) Merge pull request #198 from mangOH/mask_fix_bug Merge pull request #211 from analogdevicesinc/iiod-mask-fix-bug Merge pull request #212 from analogdevicesinc/rgetz-patch-2 Merge pull request #213 from analogdevicesinc/rgetz-patch-3 Merge pull request #214 from analogdevicesinc/rgetz-patch-4 Revert "sort: Move channel attribute sorting to context creation" fix #215 channel: Fix #219 get_modifier and get_type seems to work incorrectly Merge pull request #224 from analogdevicesinc/rft-issue-219 Robin Getz (23): local: Sort devices, channels and attributes when adding them. sort: change function names to be more descriptive/accurate sort: Move channel attribute sorting to context creation sort: when sorting iio_channels, if the index is the same, use ID fix whitespace damage from previous commits Ensure iio_info can find a locally installed libiio.so travis : Add the LDIST for centos usb: be more verbose when unable to claim an interface usb: add libusb version to context attributes local: pass errors up the stack add note about triggered buffers in dox source Update README.md with newest centos packages cmake: set the CPACK_DEBIAN_PACKAGE_ARCHITECTURE for old versions of Cmake travis-ci: don't hard code distributions anymore sorting: ensure sorting happens after global attributes are added fix snprintf warnings from gcc 8 deployment : export the LDIST var which is needed in other scripts README: Update with latest build changes appveyor: install graphviz and fix doxygen version doxygen: If dot exists, use it. doxygen: check if building on a case senstive file system. travis-ci: install graphviz README.md : Update with links to doc Travis Collins (2): Fix FIR load function in ML bindings to actually enable the FIR once loaded. Update FIR enable function in ML bindings to not force sample rate ahead of filter write. Signed-off-by: Michael Hennerich <[email protected]>
mhennerich
added a commit
that referenced
this pull request
Nov 21, 2018
Changelog: 20c9079 CI/travis/inside_bionic_docker.sh: re-use the make_linux logic cd1be7d build,travis: parametrize library name 2b4503d README.md : Update with links to doc cf87e0a travis-ci: install graphviz 2f3632f doxygen: check if building on a case senstive file system. a18ff6e doxygen: If dot exists, use it. cb28721 appveyor: install graphviz and fix doxygen version 550f4b8 README: Update with latest build changes 540c96b deployment : export the LDIST var which is needed in other scripts de8356b fix snprintf warnings from gcc 8 24c7f00 .travis.yml: Add new Xcode versions to the Travis CI builds. d65cabb CI/travis/before_install_darwin: Handle brew failures when installing packages. 29c582e .travis.yml: Drop the Travis CI builds for OSX Image xcode 6.4. 6799876 .travis.yml: Drop the Travis CI builds for Ubuntu 12.04 LTS (Precise Pangolin). f18ed59 .travis.yml: Add support for Ubuntu 18.04 (Bionic) builds. 983657a cmake/LinuxPackaging.cmake: Add libserialport to the list of dependencies that are being handled when creating Linux packages. 25c20d6 channel: Fix #219 get_modifier and get_type seems to work incorrectly ed6709e sorting: ensure sorting happens after global attributes are added f05434e travis-ci: don't hard code distributions anymore 9b75895 Revert "sort: Move channel attribute sorting to context creation" fix #215 cf39834 cmake: set the CPACK_DEBIAN_PACKAGE_ARCHITECTURE for old versions of Cmake 76d4ff7 buffer: Fix bug in mask bit tests (continued) b7407af IIOD: Fix bug in mask bit tests (continued) 37ecd2e Update README.md with newest centos packages 5dd1ff9 add note about triggered buffers in dox source 98d85f6 local: pass errors up the stack 879abfe usb: Increase ctrl pipe timeout da13ffc usb: add libusb version to context attributes 876db45 usb: be more verbose when unable to claim an interface 686ced9 travis : Add the LDIST for centos db47744 Ensure iio_info can find a locally installed libiio.so c5973cf fix whitespace damage from previous commits 67a994c sort: when sorting iio_channels, if the index is the same, use ID b9008a7 sort: Move channel attribute sorting to context creation 8405704 sort: change function names to be more descriptive/accurate afd6d69 Update FIR enable function in ML bindings to not force sample rate ahead of filter write. 53bfb03 local: Sort devices, channels and attributes when adding them. 256a80a appveyor.yml: Downgrade curl from 7.61.1-3 to 7.61.1-2 15ddcd6 Fix FIR load function in ML bindings to actually enable the FIR once loaded. 4c9a050 CI/travis/inside_centos_docker.sh: hack/patch CPackRPM.cmake for CentOS 7 f60f957 cmake/LinuxPackaging.cmake: use non-dev packages to .deb dep list ed6d860 CI/travis/make_linux: install deb package as final test cfe093a build,CI/travis: setup CentOS testing 4a39cb6 CI/travis: enable errexit & xtrace behavior in scripts 77a1154 CI/travis/before_deploy: move `grep` expression in `find` a05d607 .gitignore: add vim swap files 0b23cbe spelling fonction->function ee936e8 Fix bug in mask bit tests c80412c cmake: Suppress errors when looking up the git repository path 2a76c2e .travis.yml: add host-key algo ssh-dss for xenial deploy b853fdb appveyor.yml: change versioning to '{branch}.{build}' format 0950037 CI/travis/deploy: extend cleanup to all debian packages 2b1c4b8 README.md: add Xenial artifact links ea80423 .travis.yml: add Xenial distro to job run Alexandra Trifan (1): appveyor.yml: Downgrade curl from 7.61.1-3 to 7.61.1-2 . Alexandra.Trifan (6): cmake/LinuxPackaging.cmake: Add libserialport to the list of dependencies that are being handled when creating Linux packages. .travis.yml: Add support for Ubuntu 18.04 (Bionic) builds. .travis.yml: Drop the Travis CI builds for Ubuntu 12.04 LTS (Precise Pangolin). .travis.yml: Drop the Travis CI builds for OSX Image xcode 6.4. CI/travis/before_install_darwin: Handle brew failures when installing packages. .travis.yml: Add new Xcode versions to the Travis CI builds. Alexandru Ardelean (14): .travis.yml: add Xenial distro to job run README.md: add Xenial artifact links CI/travis/deploy: extend cleanup to all debian packages appveyor.yml: change versioning to '{branch}.{build}' format .travis.yml: add host-key algo ssh-dss for xenial deploy .gitignore: add vim swap files CI/travis/before_deploy: move `grep` expression in `find` CI/travis: enable errexit & xtrace behavior in scripts build,CI/travis: setup CentOS testing CI/travis/make_linux: install deb package as final test cmake/LinuxPackaging.cmake: use non-dev packages to .deb dep list CI/travis/inside_centos_docker.sh: hack/patch CPackRPM.cmake for CentOS 7 build,travis: parametrize library name CI/travis/inside_bionic_docker.sh: re-use the make_linux logic David Frey (2): Fix bug in mask bit tests spelling fonction->function Lars-Peter Clausen (2): cmake: Suppress errors when looking up the git repository path usb: Increase ctrl pipe timeout Michael Hennerich (15): Merge pull request #175 from analogdevicesinc/sort Merge pull request #203 from analogdevicesinc/sort1 Merge pull request #206 from analogdevicesinc/rgetz-patch-1 Merge pull request #201 from analogdevicesinc/fix-ml-bindings Merge pull request #207 from analogdevicesinc/rgetz-patch-2 IIOD: Fix bug in mask bit tests (continued) buffer: Fix bug in mask bit tests (continued) Merge pull request #198 from mangOH/mask_fix_bug Merge pull request #211 from analogdevicesinc/iiod-mask-fix-bug Merge pull request #212 from analogdevicesinc/rgetz-patch-2 Merge pull request #213 from analogdevicesinc/rgetz-patch-3 Merge pull request #214 from analogdevicesinc/rgetz-patch-4 Revert "sort: Move channel attribute sorting to context creation" fix #215 channel: Fix #219 get_modifier and get_type seems to work incorrectly Merge pull request #224 from analogdevicesinc/rft-issue-219 Robin Getz (23): local: Sort devices, channels and attributes when adding them. sort: change function names to be more descriptive/accurate sort: Move channel attribute sorting to context creation sort: when sorting iio_channels, if the index is the same, use ID fix whitespace damage from previous commits Ensure iio_info can find a locally installed libiio.so travis : Add the LDIST for centos usb: be more verbose when unable to claim an interface usb: add libusb version to context attributes local: pass errors up the stack add note about triggered buffers in dox source Update README.md with newest centos packages cmake: set the CPACK_DEBIAN_PACKAGE_ARCHITECTURE for old versions of Cmake travis-ci: don't hard code distributions anymore sorting: ensure sorting happens after global attributes are added fix snprintf warnings from gcc 8 deployment : export the LDIST var which is needed in other scripts README: Update with latest build changes appveyor: install graphviz and fix doxygen version doxygen: If dot exists, use it. doxygen: check if building on a case senstive file system. travis-ci: install graphviz README.md : Update with links to doc Travis Collins (2): Fix FIR load function in ML bindings to actually enable the FIR once loaded. Update FIR enable function in ML bindings to not force sample rate ahead of filter write. Signed-off-by: Michael Hennerich <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…Cmake
Old versions (2.8.12) of cmake don't automatically set the debian package architecture.
This causes dpkg errors like:
dpkg: warning: parsing file '/var/lib/dpkg/tmp.ci/control' near line 10 package 'libiio':
empty value for architecture
dpkg: error processing archive ./master_latest_libiio-trusty.deb (--install):
package architecture () does not match system (amd64)
This resolved that error by automatically setting it for old (pre 3) cmakes.
Signed-off-by: Robin Getz [email protected]