On 10/15/2017 01:18 PM, Robert Woodcock wrote: > On 10/15/2017 10:50 AM, Samuel Henrique wrote: >> Hello everyone, >> >> I've just applied an updated version of Helmut's patch on another >> branch[1] >> But as you can see (if you build that branch), we have a problem >> because the packages will be installed under usr/sbin instead of >> usr/bin. >> >> I believe this behavior is provided by >> "--sbindir=`pwd`/debian/tmp/usr/bin " and the old >> override_dh_installdirs-arch override (that is, before patching), but >> i still did not find a way of fixing this*, so anyone please feel >> free to submit the fix or point me to the right direction. >> >> I believe this is the only blocker right now for 0.92, as soon as we >> fix this, we will release the new version. >> >> * to simply pass "--sbindir=`pwd`/debian/tmp/usr/bin" on >> auto_configure didn't work, i'm still trying to understand what is >> happening, but my bet is that i need to work with >> override_dh_installdirs-arch. >> >> [1]https://anonscm.debian.org/git/collab-maint/mtr.git/commit/?h=debian/ftcbfs-helmut&id=c9e2825163d171e10ff7e1b74d17819a61c92ee6 >> >> >> >> -- >> Samuel Henrique <samueloph> > I'll take a stab at that in the next few days. > > Also, before we release - I'm not at all sold on the value of creating > a separate mtr-packet package - I'm pretty sure I want to put that > back, but we can discuss. It's only a few kb of disk savings on the > mirrors and it's disk wasted on an installed system. Currently we have > overlapping files between the mtr and mtr-packet packages and that > wouldn't even be a problem if we just folded mtr-packet in with the > mtr and mtr-tiny packages. At minimum, we need to get back to building > mtr twice rather than three times. > > I tracked down the /usr/sbin install paths to Makefile.am. Here's a patch:
--- a/Makefile.am 2016-12-31 10:15:00.000000000 -0800 +++ b/Makefile.am 2017-10-16 15:11:09.000000000 -0700 @@ -5,7 +5,8 @@ img/mtr_icon.xpm $(TEST_FILES) -sbin_PROGRAMS = mtr mtr-packet +# We don't want these in /usr/sbin - rcw +bin_PROGRAMS = mtr mtr-packet TESTS = \ test/cmdparse.py \ test/param.py \ @@ -41,8 +42,8 @@ PATHFILES += man/mtr.8 man/mtr-packet.8 install-exec-hook: - `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ - || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet + `setcap cap_net_raw+ep $(DESTDIR)$(bindir)/mtr-packet` \ + || chmod u+s $(DESTDIR)$(bindir)/mtr-packet mtr_SOURCES = ui/mtr.c ui/mtr.h \ ui/net.c ui/net.h \
