xfsprogs debian updates
PATCH v2 4/4 debian: Add changelog entry for 5.14.0-rc1-1
In reply to Bastian GermannThis holds all package changes since v5.13.0.
Add Closes tags that will autoclose related bugs.
--- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
debian/changelog +15 -0
@@ -1,3 +1,18 @@ +xfsprogs (5.14.0-rc1-1) unstable; urgency=medium + + [ Dave Chinner ] + * New build dependency: liburcu-dev + + [ Helmut Grohne ] + * Fix FTCBFS (Closes: #794158) + + Pass --build and --host to configure + + [ Boian Bonev ] + * Fix FTBFS (Closes: #997656) + + Keep custom install-sh after autogen + + -- Bastian Germann <[email protected]> Sun, 14 Nov 2021 23:18:22 +0100 + xfsprogs (5.13.0-1) unstable; urgency=medium * New upstream release
Signature · 1 line
2.33.1
PATCH v2 1/4 debian: Update Uploaders list
In reply to Bastian GermannSet Bastian's debian.org email address.
--- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
debian/control +1 -1
@@ -2,7 +2,7 @@ Source: xfsprogs Section: admin Priority: optional Maintainer: XFS Development Team <[email protected]> -Uploaders: Nathan Scott <[email protected]>, Anibal Monsalve Salazar <[email protected]>, Bastian Germann <[email protected]> +Uploaders: Nathan Scott <[email protected]>, Anibal Monsalve Salazar <[email protected]>, Bastian Germann <[email protected]> Build-Depends: libinih-dev (>= 53), 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, liburcu-dev Standards-Version: 4.0.0 Homepage: https://xfs.wiki.kernel.org/
Signature · 1 line
2.33.1
v2 cover xfsprogs debian updates
Hi,
As my Debian package changes were not included with the rc1, I resend them with modifications and a new patch by Boian Bonev that fixes the current RC build issue in Debian.
I ask you to apply them asap so that I can upload a fixed version.
Thanks,
Bastian
Changelog:
v2: - Collect Review tags
- Rebase 1st patch on the liburcu-dev addition
- Drop debian/changelog changes from 2nd patch
- Drop Multi-Arch patch (did not receive feedback in 1.5 months)
- Add FTBFS fixing patch by Boian Bonev
- Add patch with changelog entry
Bastian Germann (3):
debian: Update Uploaders list
debian: Pass --build and --host to configure
debian: Add changelog entry for 5.14.0-rc1-1
Boian Bonev (1):
debian: Fix FTBFS
debian/changelog | 15 +++++++++++++++ debian/control | 2 +- debian/rules | 10 ++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-)
Signature · 1 line
2.33.1
PATCH v2 3/4 debian: Fix FTBFS
From: Boian Bonev <[email protected]>
With newer autotools install-sh is regenerated by libtoolize. Copy the package's version after autogen.
--- debian/rules | 1 + 1 file changed, 1 insertion(+)
debian/rules +1 -0
@@ -50,6 +50,7 @@ config: .census AUTOHEADER=/bin/true dh_autoreconf dh_update_autotools_config $(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h + cp -f include/install-sh . touch .census dibuild:
Signature · 1 line
2.33.1
PATCH v2 2/4 debian: Pass --build and --host to configure
In reply to Bastian Germannxfsprogs fails to cross build because it fails to pass --host to configure. Thus it selects the build architecture as host architecture and fails configure, because the requested libraries are only installed for the host architecture.
--- debian/rules | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
debian/rules +7 -2
@@ -11,6 +11,9 @@ package = xfsprogs develop = xfslibs-dev bootpkg = xfsprogs-udeb +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + version = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1) target ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) udebpkg = $(bootpkg)_$(version)_$(target).udeb
@@ -23,11 +26,13 @@ pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; pkgdi = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT; stdenv = @GZIP=-q; export GZIP; +configure_options = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) + options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ INSTALL_USER=root INSTALL_GROUP=root \ - LOCAL_CONFIGURE_OPTIONS="--enable-editline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ; + LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-editline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ; diopts = $(options) \ - export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ; + export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-gettext=no --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ; checkdir = test -f debian/rules build: build-arch build-indep
Signature · 1 line
2.33.1
Re: [PATCH v2 3/4] debian: Fix FTBFS
In reply to Bastian GermannQuoted 8 lines · Bastian Germann
From: Boian Bonev <[email protected]>
With newer autotools install-sh is regenerated by libtoolize. Copy the package's version after autogen.
Signed-off-by Boian Bonev <[email protected]>Signed-off-by Bastian Germann <[email protected]>
/me wonders what exactly about our install-sh is so unique -- I guess it's DIST_ROOT (being picked up from DESTDIR?) and copying things to different locations?
As a strict "just keep the keys out of the fire hose" measure this looks ok to me though.
--D
Quoted 20 lines
--- debian/rules | 1 + 1 file changed, 1 insertion(+)debian/rules +1
-0@@ -50,6 +50,7 @@ config: .census AUTOHEADER=/bin/true dh_autoreconf dh_update_autotools_config $(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h + cp -f include/install-sh . touch .census dibuild:Signature · 1 line
2.33.1
Re: [PATCH v2 4/4] debian: Add changelog entry for 5.14.0-rc1-1
In reply to Bastian GermannQuoted 4 lines · Bastian Germann
This holds all package changes since v5.13.0.
Add Closes tags that will autoclose related bugs.Signed-off-by Bastian Germann <[email protected]>
Thanks for cleaning up all FT*BFS problems!
--D
Quoted 31 lines
--- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+)debian/changelog +15
-0@@ -1,3 +1,18 @@ +xfsprogs (5.14.0-rc1-1) unstable; urgency=medium + + [ Dave Chinner ] + * New build dependency: liburcu-dev + + [ Helmut Grohne ] + * Fix FTCBFS (Closes: #794158) + + Pass --build and --host to configure + + [ Boian Bonev ] + * Fix FTBFS (Closes: #997656) + + Keep custom install-sh after autogen + + -- Bastian Germann <[email protected]> Sun, 14 Nov 2021 23:18:22 +0100 + xfsprogs (5.13.0-1) unstable; urgency=medium * New upstream releaseSignature · 1 line
2.33.1
Re: [PATCH v2 3/4] debian: Fix FTBFS
In reply to Darrick J. Wong-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi Darrick,
Quoted 6 lines · Darrick J. Wong
Quoted 5 lines · Bastian Germann
From: Boian Bonev <[email protected]>
With newer autotools install-sh is regenerated by libtoolize. Copy the package's version after autogen.
Quoted 7 lines
Quoted 3 lines
Signed-off-by Boian Bonev <[email protected]>Signed-off-by Bastian Germann <[email protected]>/me wonders what exactly about our install-sh is so unique -- I guess it's
DIST_ROOT(being picked up from DESTDIR?) and copying things to different locations?
I also saw these are not supported in the libtoolize provided install-sh:
include/buildmacros: ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai
$(PKG_ROOT_LIB_DIR); \include/buildmacros: ../$(INSTALL) -T so_dot_current $(LIBNAME).lai
$(PKG_ROOT_LIB_DIR)include/buildmacros: ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai
$(PKG_LIB_DIR); \include/buildmacros: ../$(INSTALL) -T so_base $(LIBNAME).lai
$(PKG_ROOT_LIB_DIR); \include/buildmacros: ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai
$(PKG_LIB_DIR)
Maybe there are more, I didn't dig too deep.
Quoted 3 lines
As a strict "just keep the keys out of the fire hose" measure this looks ok to me though.
Reviewed-by Darrick J. Wong <[email protected]>
Thanks for your reviews :)
With best regards,
b.
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEumC8IPN+WURNbSUAE2VyCRPS8i0FAmGSoYcACgkQE2VyCRPS 8i2pXxAAhhPUBZ7+vDcRx4VO98VeHe5jpadlW+RwJjrGIDZlb+RDGFD/DmJOZxQl /pCxsFZL6MCqL6aJmG/mBfkD8Yzv17PKM7duV9/xf2Af60xyOfGDR9hP+/A5jsZL kOOgyAfh+rUy0yguh4iD7c5ptegX4tb+xqYGNlUqcfVMu1SGWjkrsiNGvNKadPQq ZQvTr7sfihXLy+GGqBBzhOD5WqXVThHntsj8krPfIb8U0m/FRTpTyzfoJr/QEBPX TevaFH+cdS+ENHzLs3iVFBIVGKjelyYb52rMauvAqyaF2dZuSTr4V86jex5TsfJk 3RB0Yri299mqqnoe8gmcF84XNMCO4MjfV1aSHVke43UPpb8gTnaU/NC5XNxjZzY6 f6iTE7yRTIxu2QIrY1Odkqm4qQUM3cnZfybpzbr+QluM6GnH42md8XS30SJAQvqx gGo4HifPu+iyVEOjoFYSdlEtw8mA0DNHSVGk7HtWN6mwhNAj90rfq5LJeZwWO08D sK5aKzKDBibL/7Glv0LOyVMk92MrKT5KBQ1S4qZm7DjNthz5yPvmaXNaOe4UJ6nt EVw8DOz0nWD9aqALZGmsIjQd8BH5iTIzsSCTiVWjrJDG9SrkXezs6TnGrW5yH1+J ZIaMA8e3ElHsAf57I+ahPMTUAUXy0MPuA2Kq96R2U9mpUbASQJ0= =TAAn
-----END PGP SIGNATURE-----
Quoted 5 lines · Bastian Germann
Hi,
As my Debian package changes were not included with the rc1, I resend them with modifications and a new patch by Boian Bonev that fixes the current RC build issue in Debian.
Sorry about that, and thanks for the resend. Thank you for watching out for the rc1. I see Darrick is reviewing them, and I trust him to assess Debian changes, so I'll pull them in when they're reviewed.
Thanks!
-Eric
Quoted 26 lines
I ask you to apply them asap so that I can upload a fixed version.
Thanks,
BastianChangelog:
v2: - Collect Review tags
- Rebase 1st patch on the liburcu-dev addition
- Drop debian/changelog changes from 2nd patch
- Drop Multi-Arch patch (did not receive feedback in 1.5 months)
- Add FTBFS fixing patch by Boian Bonev
- Add patch with changelog entryBastian Germann (3):
debian: Update Uploaders list
debian: Pass --build and --host to configure
debian: Add changelog entry for 5.14.0-rc1-1Boian Bonev (1):
debian: Fix FTBFSdebian/changelog | 15 +++++++++++++++ debian/control | 2 +- debian/rules | 10 ++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-)