From 2279d3138c5eb09b0f2ce046d5b5650fab35698b Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Tue, 23 Aug 2022 22:11:26 +0200 Subject: [PATCH] Simplify debian/configure by moving constant values to where they are used This reduce the work done by debian/configure and make it easier to see exactly which settings are configured. --- debian/configure | 35 ----------------------------------- debian/control.main-pkg.in | 25 ++++++++++++++++++------- debian/control.top.in | 14 +++++--------- debian/rules.in | 2 +- 4 files changed, 24 insertions(+), 52 deletions(-) diff --git a/debian/configure b/debian/configure index 2323251be12..be373a3514e 100755 --- a/debian/configure +++ b/debian/configure @@ -33,8 +33,6 @@ if [ "$1" == "-h" -o "$1" == "-help" -o "$1" == "--help" ]; then exit 0 fi -EXTRA_BUILD= -PYTHON_VERSION_NEXT=$(python3 -c 'import sys; print (sys.version[:2] + str(1+int(sys.version[2])))') LIBREADLINE_DEV="libreadline-gplv2-dev | libreadline-dev" ENABLE_BUILD_DOCUMENTATION=--enable-build-documentation=pdf @@ -78,14 +76,6 @@ else DOC_DEPENDS='' fi -MODUTILS_DEPENDS=kmod -PYTHON_PACKAGING_DEPENDS=dh-python -PYTHON_GST=python3-gst-1.0,gstreamer1.0-plugins-base -TCLTK_VERSION=8.6 -PYTHON_IMAGING=python3-pil -PYTHON_IMAGING_TK=python3-pil.imagetk -QTVCP_DEPENDS="python3-pyqt5,\n python3-pyqt5.qsci,\n python3-pyqt5.qtsvg,\n python3-pyqt5.qtopengl,\n python3-opencv,\n python3-dbus,python3-espeak,\n python3-dbus.mainloop.pyqt5,\n python3-pyqt5.qtwebkit,\n espeak-ng,\n pyqt5-dev-tools,\n gstreamer1.0-tools,espeak,\n sound-theme-freedesktop" -YAPPS_RUNTIME="python3-yapps" DEBHELPER="debhelper (>= 12)" COMPAT="12" @@ -106,17 +96,9 @@ 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 -KERNEL_DEPENDS=libudev-dev,iptables -KERNEL_DEPENDS_BUILD=libudev-dev -KERNEL_HEADERS= -KERNEL_VERSION=uspace -MODUTILS_DEPENDS= DISTRIB_NAME=uspace-$DISTRIB_NAME MAIN_PACKAGE_NAME=linuxcnc-uspace OTHER_MAIN_PACKAGE_NAME=linuxcnc @@ -130,30 +112,13 @@ sed \ -e "s#@DEBHELPER@#$DEBHELPER#g" \ -e "s#@DISTRIB_NAME@#$DISTRIB_NAME#g" \ -e "s#@DOC_DEPENDS@#$DOC_DEPENDS#g" \ - -e "s#@EXTRA_BUILD@#$EXTRA_BUILD#g" \ -e "s#@EXTRA_RECOMMENDS@#$EXTRA_RECOMMENDS#g" \ - -e "s#@KERNEL_DEPENDS@#$KERNEL_DEPENDS#g" \ - -e "s#@KERNEL_DEPENDS_BUILD@#$KERNEL_DEPENDS_BUILD#g" \ - -e "s#@KERNEL_HEADERS@#$KERNEL_HEADERS#g" \ - -e "s#@KERNEL_VERSION@#$KERNEL_VERSION#g" \ -e "s#@LIBREADLINE_DEV@#$LIBREADLINE_DEV#g" \ -e "s#@MAIN_PACKAGE_NAME@#$MAIN_PACKAGE_NAME#g" \ - -e "s#@MODULE_EXT@#$MODULE_EXT#g" \ - -e "s#@MODULE_PATH@#$MODULE_PATH#g" \ - -e "s#@MODUTILS_DEPENDS@#$MODUTILS_DEPENDS#g" \ -e "s#@OTHER_MAIN_PACKAGE_NAME@#$OTHER_MAIN_PACKAGE_NAME#g" \ - -e "s#@PYTHON_GST@#$PYTHON_GST#g" \ - -e "s#@PYTHON_IMAGING@#$PYTHON_IMAGING#g" \ - -e "s#@PYTHON_IMAGING_TK@#$PYTHON_IMAGING_TK#g" \ - -e "s#@PYTHON_PACKAGING_DEPENDS@#$PYTHON_PACKAGING_DEPENDS#g" \ - -e "s#@PYTHON_VERSION_NEXT@#$PYTHON_VERSION_NEXT#g" \ - -e "s#@QTVCP_DEPENDS@#$QTVCP_DEPENDS#g" \ -e "s#@RTAI_ARCHITECTURE@#$RTAI_ARCHITECTURE#g" \ - -e "s#@TARGET@#$TARGET#g" \ -e "s#@CONFIGURE_REALTIME_ARG@#$CONFIGURE_REALTIME_ARG#g" \ - -e "s#@TCLTK_VERSION@#$TCLTK_VERSION#g" \ -e "s#@XENOMAI_ARCHITECTURE@#$XENOMAI_ARCHITECTURE#g" \ - -e "s|@YAPPS_RUNTIME@|$YAPPS_RUNTIME|g" \ -e "s#@ENABLE_BUILD_DOCUMENTATION@#$ENABLE_BUILD_DOCUMENTATION#g" \ -e '/^\s*,\s*$/d' \ $* diff --git a/debian/control.main-pkg.in b/debian/control.main-pkg.in index c3b858fb496..d017215b612 100644 --- a/debian/control.main-pkg.in +++ b/debian/control.main-pkg.in @@ -11,8 +11,8 @@ Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, - @KERNEL_DEPENDS@, - @MODUTILS_DEPENDS@, + libudev-dev, + iptables, blt, mesa-utils, python3-tk, @@ -23,8 +23,8 @@ Depends: python3-configobj, python3-xlib, libgtksourceview-3.0-dev, - tcl@TCLTK_VERSION@, - tk@TCLTK_VERSION@, + tcl8.6, + tk8.6, bwidget (>= 1.7), tclreadline, tclx, @@ -34,9 +34,20 @@ Recommends: linuxcnc-doc-en | linuxcnc-doc, librsvg2-dev, @EXTRA_RECOMMENDS@, - @PYTHON_IMAGING@, - @PYTHON_IMAGING_TK@, - @QTVCP_DEPENDS@ + python3-pil, + python3-pil.imagetk, + python3-pyqt5, + python3-pyqt5.qsci, + python3-pyqt5.qtsvg, + python3-pyqt5.qtopengl, + python3-opencv, + python3-dbus,python3-espeak, + python3-dbus.mainloop.pyqt5, + python3-pyqt5.qtwebkit, + espeak-ng, + pyqt5-dev-tools, + gstreamer1.0-tools,espeak, + sound-theme-freedesktop Suggests: mesaflash Description: motion controller for CNC machines and robots LinuxCNC is a fully-realised CNC machine controller that can interpret diff --git a/debian/control.top.in b/debian/control.top.in index d1c59159c30..f8fb2458bfa 100644 --- a/debian/control.top.in +++ b/debian/control.top.in @@ -5,11 +5,8 @@ Maintainer: LinuxCNC Developers Uploaders: Jeff Epler , Sebastian Kuzminsky Build-Depends: @DEBHELPER@, - @PYTHON_PACKAGING_DEPENDS@, - @KERNEL_DEPENDS_BUILD@, - @KERNEL_HEADERS@, - @MODUTILS_DEPENDS@, - @EXTRA_BUILD@, + dh-python, + libudev-dev, asciidoc, ghostscript, imagemagick, @@ -40,9 +37,9 @@ Build-Depends: python3-dev, python3-tk, python3-xlib, - tcl@TCLTK_VERSION@-dev, + tcl8.6-dev, tclx, - tk@TCLTK_VERSION@-dev, + tk8.6-dev, yapps2 Build-Depends-Indep: @DOC_DEPENDS@, @@ -56,11 +53,10 @@ Architecture: any Conflicts: linuxcnc-sim-dev, @OTHER_MAIN_PACKAGE_NAME@-dev Depends: ${misc:Depends}, ${python3:Depends}, - @KERNEL_HEADERS@, python3-serial, @MAIN_PACKAGE_NAME@ (= ${binary:Version}), udev, - @YAPPS_RUNTIME@ + python3-yapps Section: devel Description: PC based motion controller for real-time Linux LinuxCNC is a fully-realised CNC machine controller that can interpret diff --git a/debian/rules.in b/debian/rules.in index fae4585083c..ef173d3b485 100644 --- a/debian/rules.in +++ b/debian/rules.in @@ -28,7 +28,7 @@ TIMESTAMP=$(shell dpkg-parsechangelog -S timestamp) export DATE=$(shell LANG=C date --date='@$(TIMESTAMP)' '+%d\ %b\ %Y') export TIME=$(shell LANG=C date --date='@$(TIMESTAMP)' '+%T') -kernel_version = @KERNEL_VERSION@ +kernel_version = uspace configure_realtime_arg = @CONFIGURE_REALTIME_ARG@ enable_build_documentation = @ENABLE_BUILD_DOCUMENTATION@ DESTDIR=$(CURDIR)/debian/tmp