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.

Sign up for GitHub

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

Jump to bottom

Explicitly set roborio platform tag for crossenv #34

Merged
merged 1 commit into from
Nov 24, 2024
Merged

Explicitly set roborio platform tag for crossenv #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions cross-ubuntu-py/Dockerfile.py310
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@ COPY --from=pycompile /build/crosspy /build/crosspy

ARG ARCH=invalid-arch
ARG TARGET_HOST=invalid-target-host
ARG EXTRA_CROSSENV_ARGS=

RUN set -xe; \
ldconfig; \
python3.10 -m pip install crossenv==1.4.0; \
python3.10 -m crossenv /build/crosspy/bin/python3.10 /build/venv --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc; \
python3.10 -m pip install crossenv==1.5.0; \
python3.10 -m crossenv /build/crosspy/bin/python3.10 /build/venv --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
/build/venv/bin/cross-pip install wheel;

COPY pip-${ARCH}.conf /build/venv/cross/pip.conf
Expand Down
5 changes: 3 additions & 2 deletions cross-ubuntu-py/Dockerfile.py311
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,12 @@ COPY --from=pycompile /build/crosspy /build/crosspy

ARG ARCH=invalid-arch
ARG TARGET_HOST=invalid-target-host
ARG EXTRA_CROSSENV_ARGS=

RUN set -xe; \
ldconfig; \
python3.11 -m pip install crossenv==1.4.0; \
python3.11 -m crossenv /build/crosspy/bin/python3.11 /build/venv --sysroot=$(${TARGET_HOST}-print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc; \
python3.11 -m pip install crossenv==1.5.0; \
python3.11 -m crossenv /build/crosspy/bin/python3.11 /build/venv --sysroot=$(${TARGET_HOST}-print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
/build/venv/bin/cross-pip install wheel;

COPY pip-${ARCH}.conf /build/venv/cross/pip.conf
Expand Down
5 changes: 3 additions & 2 deletions cross-ubuntu-py/Dockerfile.py312
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,12 @@ COPY --from=pycompile /build/crosspy /build/crosspy
ARG ARCH=invalid-arch
ARG TARGET_HOST=invalid-target-host
ARG MACHINE_ARG=
ARG EXTRA_CROSSENV_ARGS=

RUN set -xe; \
ldconfig; \
python3.12 -m pip install 'crossenv~=1.4.0'; \
python3.12 -m crossenv /build/crosspy/bin/python3.12 /build/venv ${MACHINE_ARG} --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc; \
python3.12 -m pip install 'crossenv~=1.5.0'; \
python3.12 -m crossenv /build/crosspy/bin/python3.12 /build/venv ${MACHINE_ARG} --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
/build/venv/bin/cross-pip install wheel;

COPY pip-${ARCH}.conf /build/venv/cross/pip.conf
Expand Down
3 changes: 2 additions & 1 deletion cross-ubuntu-py/Dockerfile.py313
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,12 @@ COPY --from=pycompile /build/crosspy /build/crosspy
ARG ARCH=invalid-arch
ARG TARGET_HOST=invalid-target-host
ARG MACHINE_ARG=
ARG EXTRA_CROSSENV_ARGS=

RUN set -xe; \
ldconfig; \
python3.13 -m pip install 'crossenv~=1.5.0'; \
python3.13 -m crossenv /build/crosspy/bin/python3.13 /build/venv ${MACHINE_ARG} --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc; \
python3.13 -m crossenv /build/crosspy/bin/python3.13 /build/venv ${MACHINE_ARG} --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
/build/venv/bin/cross-pip install wheel;

COPY pip-${ARCH}.conf /build/venv/cross/pip.conf
Expand Down
5 changes: 3 additions & 2 deletions cross-ubuntu-py/Dockerfile.py39
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ COPY --from=pycompile /build/crosspy /build/crosspy

ARG ARCH=invalid-arch
ARG TARGET_HOST=invalid-target-host
ARG EXTRA_CROSSENV_ARGS=

RUN set -xe; \
ldconfig; \
python3.9 -m pip install crossenv==1.4.0; \
python3.9 -m crossenv /build/crosspy/bin/python3.9 /build/venv --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc; \
python3.9 -m pip install crossenv==1.5.0; \
python3.9 -m crossenv /build/crosspy/bin/python3.9 /build/venv --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
/build/venv/bin/cross-pip install wheel;

COPY pip-${ARCH}.conf /build/venv/cross/pip.conf
Expand Down
1 change: 1 addition & 0 deletions cross-ubuntu-py/py.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ build/cross-roborio-py313:
--build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_ROBORIO) \
--build-arg VERSION=$(VERSION_ROBORIO) \
--build-arg MACHINE_ARG="--machine=roborio" \
--build-arg EXTRA_CROSSENV_ARGS="--platform-tag=linux_roborio" \
-f Dockerfile.py313

.PHONY: push/cross-roborio-py313
Expand Down