[Git][NTPsec/ntpsec][master] Rework cross-armhf Docker image and runner configs

[Matt Selsky (@selsky)]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
90515d0a by James Browning at 2023-01-04T21:41:28+00:00
Rework cross-armhf Docker image and runner configs


- - - - -


2 changed files:

- .dockerfiles/cross-armhf
- .gitlab-ci.yml


Changes:

=====================================
.dockerfiles/cross-armhf
=====================================
@@ -2,5 +2,5 @@ FROM debian:testing
 
 RUN dpkg --add-architecture armhf
 RUN apt-get update
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y bison gcc gcc-arm-linux-gnueabihf git make netbase pps-tools python3.9 python-is-python2 wget
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y libssl-dev:armhf libpython3.9-dev:armhf
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y bison gcc gcc-arm-linux-gnueabihf git make netbase pps-tools python-is-python3 wget
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y libssl-dev:armhf libpython3-dev:armhf


=====================================
.gitlab-ci.yml
=====================================
@@ -344,8 +344,8 @@ cross-armhf-build:
   <<: *job_definition_allow_failure
   image: $CI_REGISTRY/ntpsec/ntpsec/cross-armhf
   script:
-    - PYTHON_VERSION=3.9 PYTAG=cpython39 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags '-I/usr/include/ -I/usr/include/python3.9' --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python3.9/dist-packages --pythonarchdir=/usr/libhf/python3.9/dist-packages build -pp --enable-pylib=ffi
-    - PYTHON_VERSION=3.9 PYTAG=cpython39 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags '-I/usr/include/ -I/usr/include/python3.9' --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python3.9/dist-packages --pythonarchdir=/usr/libhf/python3.9/dist-packages build -pp --enable-pylib=ext
+    - PYTHON_VERSION=3.10 PYTAG=cpython3 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags '-I/usr/include/ -I/usr/include/python3.10' --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python3.10/dist-packages --pythonarchdir=/usr/libhf/python3.10/dist-packages build -pp --enable-pylib=ffi
+    - PYTHON_VERSION=3.10 PYTAG=cpython3 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags '-I/usr/include/ -I/usr/include/python3.10' --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python3.10/dist-packages --pythonarchdir=/usr/libhf/python3.10/dist-packages build -pp --enable-pylib=ext
   tags:
 
 gentoo-basic:



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/90515d0a4caa69da4759a7297dab4a52afe51abd

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/90515d0a4caa69da4759a7297dab4a52afe51abd
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20230104/47b0b172/attachment-0001.htm>