* [PATCH 0/3] debian: minor fixes
@ 2021-02-05 0:31 Bastian Germann
2021-02-05 0:31 ` [PATCH 1/3] debian: Drop unused dh-python from Build-Depends Bastian Germann
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Bastian Germann @ 2021-02-05 0:31 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
This series contains unrelated changes for the xfsprogs Debian package.
Bastian Germann (3):
debian: Drop unused dh-python from Build-Depends
debian: Only build for Linux
debian: Prevent installing duplicate changelog
debian/changelog | 8 ++++++++
debian/control | 8 ++++----
debian/rules | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
--
2.30.0
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] debian: Drop unused dh-python from Build-Depends 2021-02-05 0:31 [PATCH 0/3] debian: minor fixes Bastian Germann @ 2021-02-05 0:31 ` Bastian Germann 2021-02-05 0:51 ` Darrick J. Wong 2021-02-05 0:31 ` [PATCH 2/3] debian: Only build for Linux Bastian Germann 2021-02-05 0:31 ` [PATCH 3/3] debian: Prevent installing duplicate changelog Bastian Germann 2 siblings, 1 reply; 10+ messages in thread From: Bastian Germann @ 2021-02-05 0:31 UTC (permalink / raw) To: linux-xfs; +Cc: Bastian Germann, Helmut Grohne xfsprogs participates in dependency loops relevant to architecture bootstrap. Identifying easily droppable dependencies, it was found that xfsprogs does not use dh-python in any way. Reported-by: Helmut Grohne <helmut@subdivi.de> Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ce4a224d..7b0120c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfsprogs (5.10.0-3) unstable; urgency=medium + + * Drop unused dh-python from Build-Depends (Closes: #981361) + + -- Bastian Germann <bastiangermann@fishpost.de> Fri, 05 Feb 2021 00:18:31 +0100 + xfsprogs (5.10.0-2) unstable; urgency=low * Team upload diff --git a/debian/control b/debian/control index b0eb1566..8975bd13 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: XFS Development Team <linux-xfs@vger.kernel.org> Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bastiangermann@fishpost.de> -Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config +Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config Standards-Version: 4.0.0 Homepage: https://xfs.wiki.kernel.org/ -- 2.30.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] debian: Drop unused dh-python from Build-Depends 2021-02-05 0:31 ` [PATCH 1/3] debian: Drop unused dh-python from Build-Depends Bastian Germann @ 2021-02-05 0:51 ` Darrick J. Wong 2021-02-05 4:49 ` Eric Sandeen 2021-02-05 18:05 ` Bastian Germann 0 siblings, 2 replies; 10+ messages in thread From: Darrick J. Wong @ 2021-02-05 0:51 UTC (permalink / raw) To: Bastian Germann; +Cc: linux-xfs, Helmut Grohne On Fri, Feb 05, 2021 at 01:31:23AM +0100, Bastian Germann wrote: > xfsprogs participates in dependency loops relevant to architecture > bootstrap. Identifying easily droppable dependencies, it was found > that xfsprogs does not use dh-python in any way. scrub/xfs_scrub_all.in and tools/xfsbuflock.py are the only python scripts in xfsprogs. We ship the first one as-is in the xfsprogs package and we don't ship the second one at all (it's a debugger tool). AFAICT neither of them really use dh-python, right? --D > > Reported-by: Helmut Grohne <helmut@subdivi.de> > Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> > --- > debian/changelog | 6 ++++++ > debian/control | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/debian/changelog b/debian/changelog > index ce4a224d..7b0120c2 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,3 +1,9 @@ > +xfsprogs (5.10.0-3) unstable; urgency=medium > + > + * Drop unused dh-python from Build-Depends (Closes: #981361) > + > + -- Bastian Germann <bastiangermann@fishpost.de> Fri, 05 Feb 2021 00:18:31 +0100 > + > xfsprogs (5.10.0-2) unstable; urgency=low > > * Team upload > diff --git a/debian/control b/debian/control > index b0eb1566..8975bd13 100644 > --- a/debian/control > +++ b/debian/control > @@ -3,7 +3,7 @@ Section: admin > Priority: optional > Maintainer: XFS Development Team <linux-xfs@vger.kernel.org> > Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bastiangermann@fishpost.de> > -Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config > +Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config > Standards-Version: 4.0.0 > Homepage: https://xfs.wiki.kernel.org/ > > -- > 2.30.0 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] debian: Drop unused dh-python from Build-Depends 2021-02-05 0:51 ` Darrick J. Wong @ 2021-02-05 4:49 ` Eric Sandeen 2021-02-05 18:05 ` Bastian Germann 1 sibling, 0 replies; 10+ messages in thread From: Eric Sandeen @ 2021-02-05 4:49 UTC (permalink / raw) To: Darrick J. Wong, Bastian Germann; +Cc: linux-xfs, Helmut Grohne On 2/4/21 6:51 PM, Darrick J. Wong wrote: > On Fri, Feb 05, 2021 at 01:31:23AM +0100, Bastian Germann wrote: >> xfsprogs participates in dependency loops relevant to architecture >> bootstrap. Identifying easily droppable dependencies, it was found >> that xfsprogs does not use dh-python in any way. > > scrub/xfs_scrub_all.in and tools/xfsbuflock.py are the only python > scripts in xfsprogs. We ship the first one as-is in the xfsprogs > package and we don't ship the second one at all (it's a debugger tool). > > AFAICT neither of them really use dh-python, right? right, hence the dependency drop, so I think you're in violent agreement and as one of our resident debian-heads you could RVB this one too, Darrick? ;) -Eric ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] debian: Drop unused dh-python from Build-Depends 2021-02-05 0:51 ` Darrick J. Wong 2021-02-05 4:49 ` Eric Sandeen @ 2021-02-05 18:05 ` Bastian Germann 2021-02-05 18:18 ` Darrick J. Wong 1 sibling, 1 reply; 10+ messages in thread From: Bastian Germann @ 2021-02-05 18:05 UTC (permalink / raw) To: Darrick J. Wong; +Cc: linux-xfs Am 05.02.21 um 01:51 schrieb Darrick J. Wong: > On Fri, Feb 05, 2021 at 01:31:23AM +0100, Bastian Germann wrote: >> xfsprogs participates in dependency loops relevant to architecture >> bootstrap. Identifying easily droppable dependencies, it was found >> that xfsprogs does not use dh-python in any way. > > scrub/xfs_scrub_all.in and tools/xfsbuflock.py are the only python > scripts in xfsprogs. We ship the first one as-is in the xfsprogs > package and we don't ship the second one at all (it's a debugger tool). > > AFAICT neither of them really use dh-python, right? That is right. dh-python is generally used at build time to generate packages with Python modules, i.e., with files in /usr/lib/python3/dist-packages. That is not the case in xfsprogs. For xfsprogs, python3 is only a runtime dependency and that is defined in the control file as well. > --D > >> >> Reported-by: Helmut Grohne <helmut@subdivi.de> >> Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] debian: Drop unused dh-python from Build-Depends 2021-02-05 18:05 ` Bastian Germann @ 2021-02-05 18:18 ` Darrick J. Wong 0 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2021-02-05 18:18 UTC (permalink / raw) To: Bastian Germann; +Cc: linux-xfs On Fri, Feb 05, 2021 at 07:05:12PM +0100, Bastian Germann wrote: > Am 05.02.21 um 01:51 schrieb Darrick J. Wong: > > On Fri, Feb 05, 2021 at 01:31:23AM +0100, Bastian Germann wrote: > > > xfsprogs participates in dependency loops relevant to architecture > > > bootstrap. Identifying easily droppable dependencies, it was found > > > that xfsprogs does not use dh-python in any way. > > > > scrub/xfs_scrub_all.in and tools/xfsbuflock.py are the only python > > scripts in xfsprogs. We ship the first one as-is in the xfsprogs > > package and we don't ship the second one at all (it's a debugger tool). > > > > AFAICT neither of them really use dh-python, right? > > That is right. dh-python is generally used at build time to generate > packages with Python modules, i.e., with files in > /usr/lib/python3/dist-packages. That is not the case in xfsprogs. > > For xfsprogs, python3 is only a runtime dependency and that is defined in > the control file as well. <nod> /me finally figures out exactly what dh_python does--I thought it was required for any package shipping any python anything, but I guess it's only for building and prepping library code and hence not needed for our single python script in /usr/sbin, so: Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > > > --D > > > > > > > > Reported-by: Helmut Grohne <helmut@subdivi.de> > > > Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/3] debian: Only build for Linux 2021-02-05 0:31 [PATCH 0/3] debian: minor fixes Bastian Germann 2021-02-05 0:31 ` [PATCH 1/3] debian: Drop unused dh-python from Build-Depends Bastian Germann @ 2021-02-05 0:31 ` Bastian Germann 2021-02-05 0:48 ` Darrick J. Wong 2021-02-05 0:31 ` [PATCH 3/3] debian: Prevent installing duplicate changelog Bastian Germann 2 siblings, 1 reply; 10+ messages in thread From: Bastian Germann @ 2021-02-05 0:31 UTC (permalink / raw) To: linux-xfs; +Cc: Bastian Germann Use architecture linux-any to exclude kfreebsd and hurd from building the package. Those will always fail. Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> --- debian/changelog | 1 + debian/control | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b0120c2..2da58f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xfsprogs (5.10.0-3) unstable; urgency=medium * Drop unused dh-python from Build-Depends (Closes: #981361) + * Only build for Linux -- Bastian Germann <bastiangermann@fishpost.de> Fri, 05 Feb 2021 00:18:31 +0100 diff --git a/debian/control b/debian/control index 8975bd13..1da8093d 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Provides: fsck-backend Suggests: xfsdump, acl, attr, quota Breaks: xfsdump (<< 3.0.0) Replaces: xfsdump (<< 3.0.0) -Architecture: any +Architecture: linux-any Description: Utilities for managing the XFS filesystem A set of commands to use the XFS filesystem, including mkfs.xfs. . @@ -31,7 +31,7 @@ Package: xfslibs-dev Section: libdevel Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends} Breaks: xfsprogs (<< 3.0.0) -Architecture: any +Architecture: linux-any Description: XFS filesystem-specific static libraries and headers xfslibs-dev contains the libraries and header files needed to develop XFS filesystem-specific programs. @@ -49,7 +49,7 @@ Description: XFS filesystem-specific static libraries and headers Package: xfsprogs-udeb Package-Type: udeb Section: debian-installer -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Description: A stripped-down version of xfsprogs, for debian-installer This package is an xfsprogs package built for reduced size, so that it -- 2.30.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] debian: Only build for Linux 2021-02-05 0:31 ` [PATCH 2/3] debian: Only build for Linux Bastian Germann @ 2021-02-05 0:48 ` Darrick J. Wong 0 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2021-02-05 0:48 UTC (permalink / raw) To: Bastian Germann; +Cc: linux-xfs On Fri, Feb 05, 2021 at 01:31:24AM +0100, Bastian Germann wrote: > Use architecture linux-any to exclude kfreebsd and hurd from building > the package. Those will always fail. > > Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> Yep, we dropped support for hurd and bsd and macos a while ago... Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > debian/changelog | 1 + > debian/control | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/debian/changelog b/debian/changelog > index 7b0120c2..2da58f30 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,6 +1,7 @@ > xfsprogs (5.10.0-3) unstable; urgency=medium > > * Drop unused dh-python from Build-Depends (Closes: #981361) > + * Only build for Linux > > -- Bastian Germann <bastiangermann@fishpost.de> Fri, 05 Feb 2021 00:18:31 +0100 > > diff --git a/debian/control b/debian/control > index 8975bd13..1da8093d 100644 > --- a/debian/control > +++ b/debian/control > @@ -13,7 +13,7 @@ Provides: fsck-backend > Suggests: xfsdump, acl, attr, quota > Breaks: xfsdump (<< 3.0.0) > Replaces: xfsdump (<< 3.0.0) > -Architecture: any > +Architecture: linux-any > Description: Utilities for managing the XFS filesystem > A set of commands to use the XFS filesystem, including mkfs.xfs. > . > @@ -31,7 +31,7 @@ Package: xfslibs-dev > Section: libdevel > Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends} > Breaks: xfsprogs (<< 3.0.0) > -Architecture: any > +Architecture: linux-any > Description: XFS filesystem-specific static libraries and headers > xfslibs-dev contains the libraries and header files needed to > develop XFS filesystem-specific programs. > @@ -49,7 +49,7 @@ Description: XFS filesystem-specific static libraries and headers > Package: xfsprogs-udeb > Package-Type: udeb > Section: debian-installer > -Architecture: any > +Architecture: linux-any > Depends: ${shlibs:Depends}, ${misc:Depends} > Description: A stripped-down version of xfsprogs, for debian-installer > This package is an xfsprogs package built for reduced size, so that it > -- > 2.30.0 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] debian: Prevent installing duplicate changelog 2021-02-05 0:31 [PATCH 0/3] debian: minor fixes Bastian Germann 2021-02-05 0:31 ` [PATCH 1/3] debian: Drop unused dh-python from Build-Depends Bastian Germann 2021-02-05 0:31 ` [PATCH 2/3] debian: Only build for Linux Bastian Germann @ 2021-02-05 0:31 ` Bastian Germann 2021-02-05 0:49 ` Darrick J. Wong 2 siblings, 1 reply; 10+ messages in thread From: Bastian Germann @ 2021-02-05 0:31 UTC (permalink / raw) To: linux-xfs; +Cc: Bastian Germann The doc/CHANGES file is both processed by dh_installdocs and dh_installchangelogs. So it ends up as changelog.gz and CHANGES.gz. Prevent that by excluding it from dh_installdocs. Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2da58f30..5421aed6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xfsprogs (5.10.0-3) unstable; urgency=medium * Drop unused dh-python from Build-Depends (Closes: #981361) * Only build for Linux + * Prevent installing duplicate changelog (Closes: #570704) -- Bastian Germann <bastiangermann@fishpost.de> Fri, 05 Feb 2021 00:18:31 +0100 diff --git a/debian/rules b/debian/rules index 7304222c..c6ca5491 100755 --- a/debian/rules +++ b/debian/rules @@ -87,7 +87,7 @@ binary-arch: checkroot built rm -f debian/xfslibs-dev/lib/libhandle.la rm -f debian/xfslibs-dev/lib/libhandle.a rm -fr debian/xfslibs-dev/usr/lib - dh_installdocs + dh_installdocs -XCHANGES dh_installchangelogs dh_strip dh_compress -- 2.30.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] debian: Prevent installing duplicate changelog 2021-02-05 0:31 ` [PATCH 3/3] debian: Prevent installing duplicate changelog Bastian Germann @ 2021-02-05 0:49 ` Darrick J. Wong 0 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2021-02-05 0:49 UTC (permalink / raw) To: Bastian Germann; +Cc: linux-xfs On Fri, Feb 05, 2021 at 01:31:25AM +0100, Bastian Germann wrote: > The doc/CHANGES file is both processed by dh_installdocs and > dh_installchangelogs. So it ends up as changelog.gz and CHANGES.gz. > Prevent that by excluding it from dh_installdocs. > > Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> /me wonders if a wider cleanup (isn't debhelper up to v12 now?) is in order but for now, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > debian/changelog | 1 + > debian/rules | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/debian/changelog b/debian/changelog > index 2da58f30..5421aed6 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -2,6 +2,7 @@ xfsprogs (5.10.0-3) unstable; urgency=medium > > * Drop unused dh-python from Build-Depends (Closes: #981361) > * Only build for Linux > + * Prevent installing duplicate changelog (Closes: #570704) > > -- Bastian Germann <bastiangermann@fishpost.de> Fri, 05 Feb 2021 00:18:31 +0100 > > diff --git a/debian/rules b/debian/rules > index 7304222c..c6ca5491 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -87,7 +87,7 @@ binary-arch: checkroot built > rm -f debian/xfslibs-dev/lib/libhandle.la > rm -f debian/xfslibs-dev/lib/libhandle.a > rm -fr debian/xfslibs-dev/usr/lib > - dh_installdocs > + dh_installdocs -XCHANGES > dh_installchangelogs > dh_strip > dh_compress > -- > 2.30.0 > ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-02-05 18:24 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-02-05 0:31 [PATCH 0/3] debian: minor fixes Bastian Germann 2021-02-05 0:31 ` [PATCH 1/3] debian: Drop unused dh-python from Build-Depends Bastian Germann 2021-02-05 0:51 ` Darrick J. Wong 2021-02-05 4:49 ` Eric Sandeen 2021-02-05 18:05 ` Bastian Germann 2021-02-05 18:18 ` Darrick J. Wong 2021-02-05 0:31 ` [PATCH 2/3] debian: Only build for Linux Bastian Germann 2021-02-05 0:48 ` Darrick J. Wong 2021-02-05 0:31 ` [PATCH 3/3] debian: Prevent installing duplicate changelog Bastian Germann 2021-02-05 0:49 ` Darrick J. Wong
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.