On 6/18/20 11:47 PM, Darrick J. Wong wrote: > On Fri, Jun 19, 2020 at 05:05:00AM +0100, peter green wrote: >> (original message was sent to nathans@xxxxxxxxxx >> 953537@xxxxxxxxxxxxxxx and linux-xfs@xxxxxxxxxxxxxxx re-sending as >> plain-text only to linux-xfs@xxxxxxxxxxxxxxx) >> >> This bug has now caused xfsdump to be kicked out of testing which is >> making amanda unbuildable in testing. > > Uhoh... > >> >> >>> Yes, what's really needed here is for a change to be merged upstream >>> (as all other deb packaging artifacts are) otherwise this will keep >>> getting lost in time. >> To make it easier to upstream this I whipped up a patch that should >> solve the issue while only modifying the debian packaging and not >> touching the upstream makefiles. It is attached to this message and if >> I get no response I will likely do some further testing and then NMU >> it in Debian. >> >> One issue I noticed is it's not all all obvious who upstream is. The >> sgi website listed in README seems to be long dead and there are no >> obvious upstream results in a google search for xfsdump. Gentoos page >> on xfsdump links to https://xfs.wiki.kernel.org but that page makes no >> mention of xfsdump. >> >> I eventually poked around on git.kernel.org and my best guess is that >> https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/ is the upstream >> git repository and linux-xfs@xxxxxxxxxxxxxxx is the appropriate >> mailing list, I would appreciate comments on whether or not this is >> correct and updates to the documentation to reflect whatever the >> correct location is. > > Yep, you've found us. :) > > Uh... seeing how /sbin seems to be a symlink to /usr/sbin on more and > more distros now, how about we just change the upstream makefile to dump > them in /usr/sbin and forget all about the symlinks? > > (He says, wondering what the actual maintainer will say...) I wonder too :P So, FWIW, fedora/rhel packaging also hacks this up :( xfsdump does: %install rm -rf $RPM_BUILD_ROOT make DIST_ROOT=$RPM_BUILD_ROOT install # remove non-versioned docs location rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsdump/ # Bit of a hack to move files from /sbin to /usr/sbin (cd $RPM_BUILD_ROOT/%{_sbindir}; rm xfsdump xfsrestore) (cd $RPM_BUILD_ROOT/%{_sbindir}; mv ../../sbin/xfsdump .) (cd $RPM_BUILD_ROOT/%{_sbindir}; mv ../../sbin/xfsrestore .) xfsprogs does: %install make DIST_ROOT=$RPM_BUILD_ROOT install install-dev \ PKG_ROOT_SBIN_DIR=%{_sbindir} PKG_ROOT_LIB_DIR=%{_libdir} Both of these work around the default location of /sbin: # grep PKG_ROOT_SBIN_DIR xfsprogs-maint/include/builddefs xfsdump/include/builddefs xfsprogs-maint/include/builddefs:PKG_ROOT_SBIN_DIR = /sbin xfsdump/include/builddefs:PKG_ROOT_SBIN_DIR = /sbin On one hand, it'd be easy enough to change the upstream defaults I guess. On the other hand, I think the PKG_ROOT_SBIN_DIR method is easy too. How does debian fix this for xfsprogs? Doesn't the same issue exist? -Eric
