Update debian packaging #1887

SebKuzminsky · 2022-07-30T13:47:11Z

This fixes packaging on Debian Unstable:

Split the package build & install for architecture-specific vs architecture-independent packages, as required by Debian's build infrastructure. This includes some support in src/Makefile, but the common build targets used by humans (i.e. make and make docs) are unchanged.
Move the G-code quick ref html files (and their .desktop files) from the linuxcnc-uspace package to the linuxcnc-doc-* packages. This is required now that the quick ref translations are generated as part of the architecture-independent build (docs), not the architecture-specific (binary) build.
Likewise, move the LinuxCNC Developer's Guide from linuxcnc-uspace-dev to linuxcnc-doc-en, for the same reason.
Switch debian/rules to rely more on the debhelper tools, and do less "by hand".
Fix a bug in debian/rules that made it accidentally rebuild stuff it had just built...
Minor simplifications to debian/configure (just because I happened to be in the neighborhood)

This PR (or something like it) is needed for the next dsc upload to debian.org. I'd appreciate feedback from folks who know debian packaging (@smoe, @petterreinholdtsen, @jepler, and anyone else with input).

jepler

With my hat of someone who uses "run in place" I don't have any concerns about this.

I didn't look quite so carefully at e.g., the debian/rules changes but the build system should exercise that pretty well.

petterreinholdtsen · 2022-07-30T16:32:50Z

I'll have a look at the debian build stuff. Got a test build going as I write this. I notice the run-in-place test on github fail. Perhaps something to adress quickly?

…

-- Happy hacking Petter Reinholdtsn

debian/.gitignore

debian/configure

havardAasen · 2022-07-30T17:39:00Z

debian/linuxcnc.install.in

+debian/extras/etc /
+debian/extras/lib /
+
+debian/extras/usr/share/icons usr/share


Would it be possible to specify linuxcncicon.svg (and linux-logo.svg , not sure if this is used anywhere). Then you could include the other icons in their respective documentation packages. That would solve #1655

havardAasen · 2022-07-30T18:20:09Z

debian/configure

 MAIN_PACKAGE_NAME=linuxcnc-uspace
 OTHER_MAIN_PACKAGE_NAME=linuxcnc


If your already in and removing things, MAIN_PACKAGE_NAME, and OTHER_MAIN_PACKAGE_NAME is duplicated.

petterreinholdtsen · 2022-07-30T18:33:13Z

[Håvard]

If your already in and removing things, `MAIN_PACKAGE_NAME`, and `OTHER_MAIN_PACKAGE_NAME` is duplicated.

I would instead recommend to not include the removal of stuff in d/configure in this pull request, and do such cleanup in a separate pull reqeust. I already did so in <URL: #1835 >.

…

-- Happy hacking Petter Reinholdtsen

smoe · 2022-08-01T13:12:14Z

The build failure is

../docs/src/Submakefile:761: *** Cannot build documents, missing AsciiDoc or some other required program, or explicitly disabled in configure.  Stop.

which looks like a missing build dependency?

smoe

A comment on the explicit debian/*install files: Cannot we somehow use wildcards, still? Or just specify the directory only? If we cannot make it simpler than what d/rules implemented before then we are doing something wrong somewhere.

petterreinholdtsen · 2022-08-03T05:09:46Z

The reason all the bin/ files are listed explicitly, if I am not mistaken, is that one of them should go in one package (halcompile), and the rest in another. Any idea how to do this with wildcards?

smoe · 2022-08-03T09:16:38Z

If dh_install would work like the IP routing then it would notice the more detailed instruction for halcompile :) Is the order important in install file? Not aware of those semantics, I would move halcompile in d/rules as an exception, I think.

SebKuzminsky · 2022-08-06T19:46:10Z

The reason all the bin/ files are listed explicitly, if I am not mistaken, is that one of them should go in one package (halcompile), and the rest in another. Any idea how to do this with wildcards?

Yeah, that's right: usr/bin/halcompile belongs in linuxcnc-uspace-dev, everything else in usr/bin/* belongs in linuxcnc-uspace (and likewise with the manpages).

This is one way in which the now-deprecated dh_movefiles was easier to use - you could explicitly move halcompile to linuxcnc-uspace-dev, then move * (i.e. everything else) to linuxcnc-uspace.

SebKuzminsky · 2022-08-06T23:16:50Z

looks like a missing build dependency?

Looks like that, but it was actually me breaking the relationship between the default and docs make targets, resulting in a confusing error message. Fixed now.

silopolis · 2022-08-07T12:57:33Z

Speaking of packaging, I've reported in #1893 some lintian errors got by @Tom_L and @jethornton building master on Bullseye which, nevertheless, succeeded! Community has been consuming quite some energy lately trying to build 2.9 on Stable. Is there something in our reach to help? Bullseye target on buildbot? Proper Debian backport? Have a nice sunday friends J

smoe · 2022-08-07T13:15:42Z

I'd suggest a backport.

silopolis · 2022-08-07T14:12:19Z

Le dim. 7 août 2022 à 15:15, Steffen Möller ***@***.***> a écrit :

I'd suggest a backport.

My preference too

smoe

I am happy with what you have done. My only request would be that you integrate the additional uploads listed in https://sources.debian.org/src/linuxcnc/2.9.0~pre0%2Bgit20220402.2500863908-4/debian/changelog/ in debian/changelog. This eliminates an older PR of mine somewhere.

smoe · 2022-08-08T20:28:56Z

@sebastian, we are just collectively agreeing while still on Jitsie that you please merge this!

The tools have gotten better, we don't need this clumsy work-around any more.

This is mostly to help the debian packaging build just the architecture-dependent parts (the software, via `dpkg-buildpackage -B`) or just the architecture-independent parts (the docs, via `dpkg-buildpackage -A`).

… packages

Install docs with dh_installdocs, other files (like .desktop entries) with dh_install. Install all docs in /usr/share/doc/linuxcnc, not /usr/share/doc/linuxcnc-uspace, because that's where the .desktop files look for the docs. Handle each lang explicitly because we'll need to different special things for -en vs all the others.

The new translation infrastructure means we need to build the translated docs to generate the g-code quick refs. Since we have separate "-arch" and "-indep" targets in debian/rules now, we don't build the docs when building linuxcnc-uspace, so the g-code refs need to move to the doc debs.

We need to list everything we want in linuxcnc-uspace explicitly now, since we changed DESTDIR to install into debian/tmp.

The sample configs need to live in /usr/share/doc/linuxcnc (not /usr/share/doc/linuxcnc-uspace), because that's where the linuxcnc launcher script looks for them. Handle example nc_files/ symlink with dh_link rather than "by hand".

…d vice versa Some documentation files (gcode*.html) moved from linuxcnc-uspace to linuxcnc-doc-{en,es,fr} (but none moved to -zh-cn). Thus the new linuxcnc-doc-{en,es,fr} debs Break old linuxcnc-uspace, and Replace old linuxcnc-uspace, and the new linuxcnc-uspace Breaks old linuxcnc-doc-{en,es,fr}.

jepler approved these changes Jul 30, 2022

View reviewed changes

petterreinholdtsen requested changes Jul 30, 2022

View reviewed changes

debian/.gitignore Outdated Show resolved Hide resolved

debian/configure Show resolved Hide resolved

havardAasen reviewed Jul 30, 2022

View reviewed changes

smoe reviewed Aug 1, 2022

View reviewed changes

smoe approved these changes Aug 7, 2022

View reviewed changes

smoe mentioned this pull request Aug 9, 2022

Handle all debian/configure tasks using build profiles and options #1835

Open

SebKuzminsky force-pushed the dh_install branch from f4cbec8 to 20d714b Compare August 15, 2022 17:14

smoe mentioned this pull request Aug 16, 2022

Gmoccapy not starting "out of the box" on Linux (or WSL) #1933

Closed

SebKuzminsky added 10 commits August 16, 2022 10:49

Makefile: generate and install the {pnc,step}conf desktop files

a6bc92c

d/configure: get rid of EXTRAS, we don't use it anymore

aa77f2a

d/configure: get rid of EXTRA_FILES, it's not used

728c832

d/rules: simplify validation of *.desktop files

dfb16c8

The tools have gotten better, we don't need this clumsy work-around any more.

d/rules: remove dead code

e896b41

Makefiles: new targets to build & install just software or just docs

9f4e940

This is mostly to help the debian packaging build just the architecture-dependent parts (the software, via `dpkg-buildpackage -B`) or just the architecture-independent parts (the docs, via `dpkg-buildpackage -A`).

d/rules: only build the software (no docs) for architecture-dependent…

fe3d7f6

… packages

d/rules: sort dh_auto_install stuff into -arch and -indep

ebc55fa

linuxcnc-uspace: use dh_install to install the appropriate 'extra' files

2579992

linuxcnc-uspace: include the optional axis config files & README

97e3e29

SebKuzminsky added 10 commits August 16, 2022 10:51

linuxcnc-uspace: use dh_installdocs to include a missing doc

223bf76

d/rules: change DESTDIR to debian/tmp

2022c4e

move LinuxCNC_Developer doc from -dev to -doc-en

7aa8362

linuxcnc-uspace: dh_install stuff from debian/tmp

9e3c5f1

We need to list everything we want in linuxcnc-uspace explicitly now, since we changed DESTDIR to install into debian/tmp.

linuxcnc-uspace-dev: install with dh_install

51cb55c

linuxcnc-uspace: handle sample configs as docs

dfd4ab3

The sample configs need to live in /usr/share/doc/linuxcnc (not /usr/share/doc/linuxcnc-uspace), because that's where the linuxcnc launcher script looks for them. Handle example nc_files/ symlink with dh_link rather than "by hand".

bump debhelper to 12 (available in buster), no longer need --parallel

5932f22

SebKuzminsky force-pushed the dh_install branch from 20d714b to 5932f22 Compare August 16, 2022 16:52

SebKuzminsky merged commit 36b83c6 into master Aug 17, 2022

SebKuzminsky deleted the dh_install branch August 17, 2022 14:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update debian packaging #1887

Update debian packaging #1887

SebKuzminsky commented Jul 30, 2022

jepler left a comment

petterreinholdtsen commented Jul 30, 2022 via email

havardAasen Jul 30, 2022

havardAasen Jul 30, 2022

petterreinholdtsen commented Jul 30, 2022 via email

smoe commented Aug 1, 2022

smoe left a comment •

edited

Loading

petterreinholdtsen commented Aug 3, 2022

smoe commented Aug 3, 2022

SebKuzminsky commented Aug 6, 2022

SebKuzminsky commented Aug 6, 2022

silopolis commented Aug 7, 2022 via email

smoe commented Aug 7, 2022

silopolis commented Aug 7, 2022 via email

smoe left a comment

smoe commented Aug 8, 2022

		MAIN_PACKAGE_NAME=linuxcnc-uspace
		OTHER_MAIN_PACKAGE_NAME=linuxcnc

Update debian packaging #1887

Update debian packaging #1887

Conversation

SebKuzminsky commented Jul 30, 2022

jepler left a comment

Choose a reason for hiding this comment

petterreinholdtsen commented Jul 30, 2022 via email

havardAasen Jul 30, 2022

Choose a reason for hiding this comment

havardAasen Jul 30, 2022

Choose a reason for hiding this comment

petterreinholdtsen commented Jul 30, 2022 via email

smoe commented Aug 1, 2022

smoe left a comment • edited Loading

Choose a reason for hiding this comment

petterreinholdtsen commented Aug 3, 2022

smoe commented Aug 3, 2022

SebKuzminsky commented Aug 6, 2022

SebKuzminsky commented Aug 6, 2022

silopolis commented Aug 7, 2022 via email

smoe commented Aug 7, 2022

silopolis commented Aug 7, 2022 via email

smoe left a comment

Choose a reason for hiding this comment

smoe commented Aug 8, 2022

smoe left a comment •

edited

Loading