Skip to contentSkip to conversation

debian updates

PATCH In review Bastian Germann 2 participants 6 messages Sep 28, 2021 – Oct 4, 2021

lore
Share & tools
lore
#0 lore raw

cover debian updates

These are three independent changes for xfsprogs' debianization.

Bastian Germann (3):
debian: Update Uploaders list
debian: Pass --build and --host to configure
debian: Tag xfslibs-dev "Multi-Arch: same"

 debian/changelog | 10 ++++++++++
 debian/control   |  3 ++-
 debian/rules     |  9 +++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)
Signature · 1 line
2.33.0
#1 lore raw

PATCH 1/3 debian: Update Uploaders list

Set Bastian's debian.org email address.

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
debian/control +1 -1
index e4ec897c..57131bb4 100644
@@ -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
 Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
Signature · 1 line
2.33.0
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] debian: Update Uploaders list

Quoted 3 lines · Bastian Germann

Set Bastian's debian.org email address.

LGTM

--D

Quoted 20 lines
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
debian/control +1 -1
index e4ec897c..57131bb4 100644
@@ -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
 Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
Signature · 1 line
2.33.0
#3 lore raw

PATCH 2/3 debian: Pass --build and --host to configure

In reply to Bastian Germann

xfsprogs 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/changelog | 8 ++++++++
 debian/rules     | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
debian/changelog +8 -0
index 4f09e2ca..8b5c6037 100644
@@ -1,3 +1,11 @@
+xfsprogs (5.13.0-2) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS (Closes: #794158)
+    + Pass --build and --host to configure
+
+ -- Bastian Germann <[email protected]>  Tue, 28 Sep 2021 00:42:50 +0200
+
 xfsprogs (5.13.0-1) unstable; urgency=medium
 
   * New upstream release
debian/rules +7 -2
index fe9a1c3a..e12814b3 100755
@@ -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.0
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] debian: Pass --build and --host to configure

Quoted 8 lines · Bastian Germann

xfsprogs 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.

Thanks for fixing this longstanding bug. :/

/me has had a similar patch (that keeps falling out of my tree because I don't do cross builds all that often) so...

--D

Quoted 54 lines
---
 debian/changelog | 8 ++++++++
 debian/rules     | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
debian/changelog +8 -0
index 4f09e2ca..8b5c6037 100644
@@ -1,3 +1,11 @@
+xfsprogs (5.13.0-2) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS (Closes: #794158)
+    + Pass --build and --host to configure
+
+ -- Bastian Germann <[email protected]>  Tue, 28 Sep 2021 00:42:50 +0200
+
 xfsprogs (5.13.0-1) unstable; urgency=medium
 
   * New upstream release
debian/rules +7 -2
index fe9a1c3a..e12814b3 100755
@@ -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.0
#5 lore raw

PATCH 3/3 debian: Tag xfslibs-dev "Multi-Arch: same"

In reply to Bastian Germann

Tag the binary package xfslibs-dev "Multi-Arch: same" because it has all properties that qualify for this tag.

---
 debian/changelog | 2 ++
 debian/control   | 1 +
 2 files changed, 3 insertions(+)
debian/changelog +2 -0
index 8b5c6037..b1414369 100644
@@ -1,5 +1,7 @@
 xfsprogs (5.13.0-2) unstable; urgency=medium
 
+  * Tag xfslibs-dev "Multi-Arch: same"
+
   [ Helmut Grohne ]
   * Fix FTCBFS (Closes: #794158)
     + Pass --build and --host to configure
debian/control +1 -0
index 57131bb4..11f8cf08 100644
@@ -32,6 +32,7 @@ Section: libdevel
 Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends}
 Breaks: xfsprogs (<< 3.0.0)
 Architecture: linux-any
+Multi-Arch: same
 Description: XFS filesystem-specific static libraries and headers
  xfslibs-dev contains the libraries and header files needed to
  develop XFS filesystem-specific programs.
Signature · 1 line
2.33.0