[Git][NTPsec/ntpsec][21E17-cross-armhf] 2 commits: ntpq: functionally partially revert 66ed781a -- `ntpq: Display dual column protocol stats ...`

[James Browning (@jamesb_fe80)]

James Browning pushed to branch 21E17-cross-armhf at NTPsec / ntpsec


Commits:
ccd87561 by James Browning at 2021-05-27T14:20:05-07:00
ntpq: functionally partially revert 66ed781a -- `ntpq: Display dual column protocol stats ...`

- - - - -
f0c6ff6d by James Browning at 2021-05-28T15:11:33+00:00
CI: Add cross-armhf docker image related jobs r3

- - - - -


4 changed files:

- + .dockerfiles/cross-armhf.dockerfile
- .gitlab-ci-docker-images.yml
- .gitlab-ci.yml
- ntpclients/ntpq.py


Changes:

=====================================
.dockerfiles/cross-armhf.dockerfile
=====================================
@@ -0,0 +1,6 @@
+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


=====================================
.gitlab-ci-docker-images.yml
=====================================
@@ -82,3 +82,6 @@ build-ubuntu-latest:
 
 build-ubuntu-rolling:
   <<: *build_definition
+
+build-cross-armhf:
+  <<: *build_definition


=====================================
.gitlab-ci.yml
=====================================
@@ -379,6 +379,14 @@ cross-build:
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
+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
+  tags:
+
 gentoo-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/gentoo


=====================================
ntpclients/ntpq.py
=====================================
@@ -1526,8 +1526,6 @@ usage: kerninfo
         sysstats = (
             ("ss_uptime", "uptime:               ", NTP_INT),
             ("ss_numctlreq", "control requests:     ", NTP_INT),
-        )
-        sysstats2 = (
             ("ss_reset", "sysstats reset:       ", NTP_UPTIME),
             ("ss_received", "packets received:     ", NTP_INT),
             ("ss_thisver", "current version:      ", NTP_INT),
@@ -1541,7 +1539,6 @@ usage: kerninfo
             ("ss_processed", "processed for time:   ", NTP_INT),
         )
         self.collect_display(associd=0, variables=sysstats, decodestatus=False)
-        self.collect_display2(variables=sysstats2)
 
     def help_sysstats(self):
         self.say("""\



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/2a4e91f3d8599a39d67bed687000412553378a4b...f0c6ff6d0d695a4c3dc624e487eb1ade57548889

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/2a4e91f3d8599a39d67bed687000412553378a4b...f0c6ff6d0d695a4c3dc624e487eb1ade57548889
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/20210528/015626b1/attachment-0001.htm>