Merge branch '2.9' into master.

Author: petterreinholdtsen

.github/workflows/ci.yml

@@ -95,10 +95,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        # drop building on (trixy and) sid until <URL: https://bugs.debian.org/1076675 >
-        # is fixed.
-        #image: ["debian:bullseye", "debian:bookworm", "debian:sid"]
-        image: ["debian:bullseye", "debian:bookworm"]
+        image: ["debian:bullseye", "debian:bookworm", "debian:sid"]
     container:
       image: ${{ matrix.image }}
       # IPC_OWNER is needed for shmget IPC_CREAT
@@ -179,10 +176,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        # drop building on (trixy and) sid until <URL: https://bugs.debian.org/1076675 >
-        # is fixed.
-        #image: ["debian:bullseye", "debian:bookworm", "debian:sid"]
-        image: ["debian:bullseye", "debian:bookworm"]
+        image: ["debian:bullseye", "debian:bookworm", "debian:sid"]
     container:
       image: ${{ matrix.image }}
       # IPC_OWNER is needed for shmget IPC_CREAT

.gitignore

@@ -60,3 +60,5 @@ docs/help/nb/*
 docs/help/vi/*
 docs/help/zh_CN/*
 docs/src/*/gui/gmoccapy_release_notes.txt
+configs/**/*.tbl.bak
+configs/**/halshow.preferences

debian/configure

@@ -116,8 +116,6 @@ case $DISTRIB_NAME in
 esac
 
 TARGET=uspace
-MAIN_PACKAGE_NAME=linuxcnc
-OTHER_MAIN_PACKAGE_NAME=linuxcnc-uspace
 EXTRA_RECOMMENDS=hostmot2-firmware-all
 MODULE_PATH=usr/lib/linuxcnc/modules
 MODULE_EXT=.so
@@ -126,9 +124,14 @@ KERNEL_DEPENDS_BUILD=libudev-dev
 KERNEL_HEADERS=
 KERNEL_VERSION=uspace
 MODUTILS_DEPENDS=
+if false; then
+MAIN_PACKAGE_NAME=linuxcnc
+OTHER_MAIN_PACKAGE_NAME=linuxcnc-uspace
+else
 DISTRIB_NAME=uspace-$DISTRIB_NAME
 MAIN_PACKAGE_NAME=linuxcnc-uspace
 OTHER_MAIN_PACKAGE_NAME=linuxcnc
+fi
 
 EXTRA_RECOMMENDS="$EXTRA_RECOMMENDS, linux-image-rt-amd64 [linux-amd64], linux-image-rt-686-pae [linux-i386]"
 CONFIGURE_REALTIME_ARG=--with-realtime=uspace

debian/linuxcnc.install.in

@@ -142,121 +142,6 @@ usr/share/linuxcnc/touchy.glade
 
 usr/share/locale
 
-usr/share/man/man1/5axisgui.1
-usr/share/man/man1/axis.1
-usr/share/man/man1/axis-remote.1
-usr/share/man/man1/debuglevel.1
-usr/share/man/man1/elbpcom.1
-usr/share/man/man1/emccalib.1
-usr/share/man/man1/gladevcp.1
-usr/share/man/man1/gladevcp_demo.1
-usr/share/man/man1/gmoccapy.1
-usr/share/man/man1/gremlin_view.1
-usr/share/man/man1/gs2_vfd.1
-usr/share/man/man1/gscreen.1
-usr/share/man/man1/halcmd.1
-usr/share/man/man1/halcmd_twopass.1
-usr/share/man/man1/hal-histogram.1
-usr/share/man/man1/hal_input.1
-usr/share/man/man1/hal_manualtoolchange.1
-usr/share/man/man1/halmeter.1
-usr/share/man/man1/halreport.1
-usr/share/man/man1/halrmt.1
-usr/share/man/man1/halrun.1
-usr/share/man/man1/halsampler.1
-usr/share/man/man1/halscope.1
-usr/share/man/man1/halshow.1
-usr/share/man/man1/halstreamer.1
-usr/share/man/man1/haltcl.1
-usr/share/man/man1/halui.1
-usr/share/man/man1/hbmgui.1
-usr/share/man/man1/hexagui.1
-usr/share/man/man1/hy_gt_vfd.1
-usr/share/man/man1/hy_vfd.1
-usr/share/man/man1/image-to-gcode.1
-usr/share/man/man1/inivar.1
-usr/share/man/man1/io.1
-usr/share/man/man1/iocontrol.1
-usr/share/man/man1/iov2.1
-usr/share/man/man1/latency-histogram.1
-usr/share/man/man1/latency-plot.1
-usr/share/man/man1/latency-test.1
-usr/share/man/man1/lineardelta.1
-usr/share/man/man1/linuxcnc.1
-usr/share/man/man1/linuxcnc_info.1
-usr/share/man/man1/linuxcnclcd.1
-usr/share/man/man1/linuxcncmkdesktop.1
-usr/share/man/man1/linuxcnc_module_helper.1
-usr/share/man/man1/linuxcncrsh.1
-usr/share/man/man1/linuxcncsvr.1
-usr/share/man/man1/linuxcnctop.1
-usr/share/man/man1/linuxcnc_var.1
-usr/share/man/man1/maho600gui.1
-usr/share/man/man1/max5gui.1
-usr/share/man/man1/mb2hal.1
-usr/share/man/man1/mdi.1
-usr/share/man/man1/mdro.1
-usr/share/man/man1/melfagui.1
-usr/share/man/man1/milltask.1
-usr/share/man/man1/millturn.1
-usr/share/man/man1/millturngui.1
-usr/share/man/man1/mitsub_vfd.1
-usr/share/man/man1/modcompile.1
-usr/share/man/man1/monitor-xhc-hb04.1
-usr/share/man/man1/motion-logger.1
-usr/share/man/man1/moveoff_gui.1
-usr/share/man/man1/mqtt-publisher.1
-usr/share/man/man1/ngcgui.1
-usr/share/man/man1/panelui.1
-usr/share/man/man1/pi500_vfd.1
-usr/share/man/man1/pmx485.1
-usr/share/man/man1/pmx485-test.1
-usr/share/man/man1/pncconf.1
-usr/share/man/man1/puma560gui.1
-usr/share/man/man1/pumagui.1
-usr/share/man/man1/pyngcgui.1
-usr/share/man/man1/pyui.1
-usr/share/man/man1/pyvcp.1
-usr/share/man/man1/pyvcp_demo.1
-usr/share/man/man1/qtplasmac-cfg2prefs.1
-usr/share/man/man1/qtplasmac-materials.1
-usr/share/man/man1/qtplasmac-plasmac2qt.1
-usr/share/man/man1/qtplasmac-setup.1
-usr/share/man/man1/qtplasmac_gcode.1
-usr/share/man/man1/qtvcp.1
-usr/share/man/man1/rotarydelta.1
-usr/share/man/man1/rs274.1
-usr/share/man/man1/rtapi_app.1
-usr/share/man/man1/scaragui.1
-usr/share/man/man1/schedrmt.1
-usr/share/man/man1/scorbot-er-3.1
-usr/share/man/man1/sendkeys.1
-usr/share/man/man1/setup_designer.1
-usr/share/man/man1/shuttle.1
-usr/share/man/man1/sim_pin.1
-usr/share/man/man1/sim-torch.1
-usr/share/man/man1/simulate_probe.1
-usr/share/man/man1/stepconf.1
-usr/share/man/man1/svd-ps_vfd.1
-usr/share/man/man1/teach-in.1
-usr/share/man/man1/thermistor.1
-usr/share/man/man1/tool_mmap_read.1
-usr/share/man/man1/tool_watch.1
-usr/share/man/man1/tooledit.1
-usr/share/man/man1/touchy.1
-usr/share/man/man1/update_ini.1
-usr/share/man/man1/vfdb_vfd.1
-usr/share/man/man1/vfs11_vfd.1
-usr/share/man/man1/wj200_vfd.1
-usr/share/man/man1/xhc-hb04.1
-usr/share/man/man1/xhc-hb04-accels.1
-usr/share/man/man1/xhc-whb04b-6.1
-usr/share/man/man1/xyzab-tdr-gui.1
-usr/share/man/man1/xyzac-trt-gui.1
-usr/share/man/man1/xyzbc-trt-gui.1
-
-usr/share/man/man9
-
 usr/share/qtvcp
 
 src/emc/usr_intf/axis/etc    usr/share/doc/@MAIN_PACKAGE_NAME@/axis

debian/linuxcnc.manpages.in

@@ -1,104 +1,113 @@
-usr/share/man/man1/halmeter.1
-usr/share/man/man1/simulate_probe.1
-usr/share/man/man1/linuxcnc_info.1
-usr/share/man/man1/pyvcp.1
+usr/share/man/man1/5axisgui.1
+usr/share/man/man1/axis.1
+usr/share/man/man1/axis-remote.1
+usr/share/man/man1/debuglevel.1
+usr/share/man/man1/elbpcom.1
+usr/share/man/man1/emccalib.1
+usr/share/man/man1/gladevcp.1
+usr/share/man/man1/gladevcp_demo.1
+usr/share/man/man1/gmoccapy.1
 usr/share/man/man1/gremlin_view.1
-usr/share/man/man1/linuxcnc_var.1
-usr/share/man/man1/hbmgui.1
-usr/share/man/man1/shuttle.1
-usr/share/man/man1/xhc-whb04b-6.1
-usr/share/man/man1/xhc-hb04.1
-usr/share/man/man1/scaragui.1
-usr/share/man/man1/halui.1
+usr/share/man/man1/gs2_vfd.1
+usr/share/man/man1/gscreen.1
+usr/share/man/man1/halcmd.1
+usr/share/man/man1/halcmd_twopass.1
+usr/share/man/man1/hal-histogram.1
+usr/share/man/man1/hal_input.1
+usr/share/man/man1/hal_manualtoolchange.1
+usr/share/man/man1/halmeter.1
+usr/share/man/man1/halreport.1
 usr/share/man/man1/halrmt.1
-usr/share/man/man1/sim-torch.1
-usr/share/man/man1/latency-histogram.1
-usr/share/man/man1/pyui.1
-usr/share/man/man1/puma560gui.1
-usr/share/man/man1/io.1
-usr/share/man/man1/touchy.1
-usr/share/man/man1/max5gui.1
-usr/share/man/man1/mdi.1
-usr/share/man/man1/linuxcncrsh.1
 usr/share/man/man1/halrun.1
+usr/share/man/man1/halsampler.1
+usr/share/man/man1/halscope.1
+usr/share/man/man1/halshow.1
+usr/share/man/man1/halstreamer.1
+usr/share/man/man1/haltcl.1
+usr/share/man/man1/halui.1
+usr/share/man/man1/hbmgui.1
+usr/share/man/man1/hexagui.1
+usr/share/man/man1/hy_gt_vfd.1
+usr/share/man/man1/hy_vfd.1
+usr/share/man/man1/image-to-gcode.1
 usr/share/man/man1/inivar.1
-usr/share/man/man1/hal-histogram.1
-usr/share/man/man1/stepconf.1
-usr/share/man/man1/gladevcp.1
-usr/share/man/man1/thermistor.1
+usr/share/man/man1/io.1
+usr/share/man/man1/iocontrol.1
 usr/share/man/man1/iov2.1
-usr/share/man/man1/panelui.1
-usr/share/man/man1/gmoccapy.1
-usr/share/man/man1/image-to-gcode.1
-usr/share/man/man1/mdro.1
-usr/share/man/man1/sendkeys.1
-usr/share/man/man1/xyzac-trt-gui.1
-usr/share/man/man1/axis-remote.1
+usr/share/man/man1/latency-histogram.1
+usr/share/man/man1/latency-plot.1
+usr/share/man/man1/latency-test.1
+usr/share/man/man1/lineardelta.1
+usr/share/man/man1/linuxcnc.1
+usr/share/man/man1/linuxcnc_info.1
+usr/share/man/man1/linuxcnclcd.1
+usr/share/man/man1/linuxcncmkdesktop.1
 usr/share/man/man1/linuxcnc_module_helper.1
-usr/share/man/man1/scorbot-er-3.1
+usr/share/man/man1/linuxcncrsh.1
+usr/share/man/man1/linuxcncsvr.1
+usr/share/man/man1/linuxcnctop.1
+usr/share/man/man1/linuxcnc_var.1
+usr/share/man/man1/maho600gui.1
+usr/share/man/man1/max5gui.1
+usr/share/man/man1/mb2hal.1
+usr/share/man/man1/mdi.1
+usr/share/man/man1/mdro.1
+usr/share/man/man1/melfagui.1
+usr/share/man/man1/milltask.1
+usr/share/man/man1/millturn.1
+usr/share/man/man1/millturngui.1
+usr/share/man/man1/mitsub_vfd.1
+usr/share/man/man1/modcompile.1
 usr/share/man/man1/monitor-xhc-hb04.1
+usr/share/man/man1/motion-logger.1
 usr/share/man/man1/moveoff_gui.1
-usr/share/man/man1/qtplasmac-plasmac2qt.1
-usr/share/man/man1/gladevcp_demo.1
-usr/share/man/man1/xhc-hb04-accels.1
-usr/share/man/man1/linuxcnclcd.1
-usr/share/man/man1/halreport.1
+usr/share/man/man1/mqtt-publisher.1
+usr/share/man/man1/ngcgui.1
+usr/share/man/man1/panelui.1
+usr/share/man/man1/pi500_vfd.1
+usr/share/man/man1/pmx485.1
+usr/share/man/man1/pmx485-test.1
+usr/share/man/man1/pncconf.1
+usr/share/man/man1/puma560gui.1
+usr/share/man/man1/pumagui.1
+usr/share/man/man1/pyngcgui.1
+usr/share/man/man1/pyui.1
+usr/share/man/man1/pyvcp.1
+usr/share/man/man1/pyvcp_demo.1
 usr/share/man/man1/qtplasmac-cfg2prefs.1
-usr/share/man/man1/maho600gui.1
-usr/share/man/man1/hy_vfd.1
-usr/share/man/man1/svd-ps_vfd.1
-usr/share/man/man1/gs2_vfd.1
-usr/share/man/man1/haltcl.1
+usr/share/man/man1/qtplasmac_gcode.1
+usr/share/man/man1/qtplasmac-materials.1
+usr/share/man/man1/qtplasmac-plasmac2qt.1
+usr/share/man/man1/qtplasmac-setup.1
 usr/share/man/man1/qtvcp.1
 usr/share/man/man1/rotarydelta.1
 usr/share/man/man1/rs274.1
-usr/share/man/man1/halsampler.1
-usr/share/man/man1/milltask.1
-usr/share/man/man1/debuglevel.1
-usr/share/man/man1/linuxcnc.1
-usr/share/man/man1/vfs11_vfd.1
-usr/share/man/man1/update_ini.1
-usr/share/man/man1/pumagui.1
-usr/share/man/man1/halcmd.1
-usr/share/man/man1/lineardelta.1
-usr/share/man/man1/tooledit.1
-usr/share/man/man1/halstreamer.1
 usr/share/man/man1/rtapi_app.1
-usr/share/man/man1/linuxcncmkdesktop.1
-usr/share/man/man1/linuxcncsvr.1
-usr/share/man/man1/pi500_vfd.1
-usr/share/man/man1/gscreen.1
-usr/share/man/man1/motion-logger.1
-usr/share/man/man1/pncconf.1
+usr/share/man/man1/scaragui.1
 usr/share/man/man1/schedrmt.1
-usr/share/man/man1/5axisgui.1
-usr/share/man/man1/emccalib.1
-usr/share/man/man1/pyngcgui.1
-usr/share/man/man1/hexagui.1
-usr/share/man/man1/axis.1
-usr/share/man/man1/pyvcp_demo.1
-usr/share/man/man1/halcmd_twopass.1
-usr/share/man/man1/vfdb_vfd.1
-usr/share/man/man1/hal_manualtoolchange.1
-usr/share/man/man1/linuxcnctop.1
-usr/share/man/man1/hy_gt_vfd.1
-usr/share/man/man1/halscope.1
+usr/share/man/man1/scorbot-er-3.1
+usr/share/man/man1/sendkeys.1
+usr/share/man/man1/setup_designer.1
+usr/share/man/man1/shuttle.1
 usr/share/man/man1/sim_pin.1
-usr/share/man/man1/mb2hal.1
-usr/share/man/man1/qtplasmac-setup.1
+usr/share/man/man1/sim-torch.1
+usr/share/man/man1/simulate_probe.1
+usr/share/man/man1/stepconf.1
+usr/share/man/man1/svd-ps_vfd.1
 usr/share/man/man1/teach-in.1
-usr/share/man/man1/qtplasmac-materials.1
-usr/share/man/man1/latency-plot.1
+usr/share/man/man1/thermistor.1
+usr/share/man/man1/tooledit.1
+usr/share/man/man1/tool_mmap_read.1
+usr/share/man/man1/tool_watch.1
+usr/share/man/man1/touchy.1
+usr/share/man/man1/update_ini.1
+usr/share/man/man1/vfdb_vfd.1
+usr/share/man/man1/vfs11_vfd.1
 usr/share/man/man1/wj200_vfd.1
-usr/share/man/man1/pmx485-test.1
-usr/share/man/man1/mqtt-publisher.1
-usr/share/man/man1/ngcgui.1
-usr/share/man/man1/pmx485.1
-usr/share/man/man1/iocontrol.1
-usr/share/man/man1/hal_input.1
-usr/share/man/man1/latency-test.1
+usr/share/man/man1/xhc-hb04.1
+usr/share/man/man1/xhc-hb04-accels.1
+usr/share/man/man1/xhc-whb04b-6.1
+usr/share/man/man1/xyzab-tdr-gui.1
+usr/share/man/man1/xyzac-trt-gui.1
 usr/share/man/man1/xyzbc-trt-gui.1
-usr/share/man/man1/halshow.1
-usr/share/man/man1/mitsub_vfd.1
-usr/share/man/man1/elbpcom.1
 usr/share/man/man9/*