Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Verify cross compile architecture #81

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# SPDX-License-Identifier: Apache-2.0

function get_valid_cross_compile_architecute() {
function get_valid_cross_compile_architecture() {
if [[ "$1" == "aarch64" || "$1" == "arm64" ]]; then
HOST_ARCH="aarch64"
elif [[ "$1" == "x86_64" || "$1" == "amd64" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion NOTICE-3RD-PARTY-CONTENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
|pre-commit|3.5.0|MIT|
|pygments|2.17.2|Simplified BSD|
|PyJWT|2.8.0|MIT|
|python-dateutil|2.9.0|Apache 2.0<br/>BSD|
|python-dateutil|2.9.0.post0|Apache 2.0<br/>BSD|
|PyYAML|6.0.1|MIT|
|requests|2.31.0|Apache 2.0|
|setuptools|58.1.0|MIT|
Expand Down
10 changes: 8 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Builds the targets of the project in different flavors.
#

set -e
source ./.scripts/common.sh

function print_help() {
echo "Build targets of the project
Expand Down Expand Up @@ -74,7 +74,13 @@ while [[ $# -gt 0 ]]; do
shift
;;
-x|--cross)
HOST_ARCH="$2"
HOST_ARCH=$( get_valid_cross_compile_architecture "$2" )

if [ "$?" -eq 1 ]; then
echo "Invalid cross-compile architecture '$2'!"
exit 1
fi

shift
shift
;;
Expand Down
2 changes: 1 addition & 1 deletion install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ while [[ $# -gt 0 ]]; do
shift
;;
-x|--cross)
HOST_ARCH=$( get_valid_cross_compile_architecute "$2" )
HOST_ARCH=$( get_valid_cross_compile_architecture "$2" )

if [ "$?" -eq 1 ]; then
echo "Invalid cross-compile architecture '$2'!"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gcovr==5.2
conan==1.60.2
conan==1.63.0

pre-commit==3.5.0
cpplint==1.6.1
2 changes: 1 addition & 1 deletion sdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN apk update && \
apk add git && \
apk add nodejs && \
apk add npm && \
pip3 install "conan==1.60.2"
pip3 install "conan==1.63.0"

COPY . /sdk

Expand Down
Loading