Fix #338 and #339: output a valid aarch64 debian package with a valid directory layout. #377
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
… directory layout. This commit aims to fix #338 and #339. It fixes #338 by setting [`CPACK_DEBIAN_PACKAGE_ARCHITECTURE`] to the architecture used by CMake. To do so, we inspect the value of [`CMAKE_SYSTEM_PROCESSOR`], which tells us the target architecture. A test has been added to ensure that the target architecture of the output .deb is `arm64`. This commit also fixes #339 by creating a configuration called `DebPack` which sets the right file paths for `cpack`. When `cpack` is invoked with `-C DebPack`, `lib/ossl-modules`, `lib` and `include/oqs-provider` are being used as destination directories. [`CPACK_DEBIAN_PACKAGE_ARCHITECTURE`]: https://cmake.org/cmake/help/latest/cpack_gen/deb.html#variable:CPACK_DEBIAN_PACKAGE_ARCHITECTURE [`CMAKE_SYSTEM_PROCESSOR`]: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_PROCESSOR.html#variable:CMAKE_SYSTEM_PROCESSOR Signed-off-by: thb-sb <is@md5secure.com>
ghost
self-assigned this
ghost
marked this pull request as ready for review
This pull request was closed.
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.
Fix #338 and #339: output a valid aarch64 debian package with a valid directory layout.
This commit aims to fix #338 and #339.
It fixes #338 by setting
CPACK_DEBIAN_PACKAGE_ARCHITECTUREto the architectureused by CMake. To do so, we inspect the value of
CMAKE_SYSTEM_PROCESSOR, whichtells us the target architecture.
A test has been added to ensure that the target architecture of the output .deb
is
arm64.This commit also fixes #339 by creating a configuration called
DebPackwhichsets the right file paths for
cpack.When
cpackis invoked with-C DebPack,lib/ossl-modules,libandinclude/oqs-providerare being used as destination directories.
Signed-off-by: thb-sb is@md5secure.com