* [PATCH 0/3] debian updates
@ 2021-09-28 0:25 Bastian Germann
2021-09-28 0:25 ` [PATCH 1/3] debian: Update Uploaders list Bastian Germann
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Bastian Germann @ 2021-09-28 0:25 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
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(-)
--
2.33.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] debian: Update Uploaders list
2021-09-28 0:25 [PATCH 0/3] debian updates Bastian Germann
@ 2021-09-28 0:25 ` Bastian Germann
2021-10-04 18:18 ` Darrick J. Wong
2021-09-28 0:25 ` [PATCH 2/3] debian: Pass --build and --host to configure Bastian Germann
2021-09-28 0:25 ` [PATCH 3/3] debian: Tag xfslibs-dev "Multi-Arch: same" Bastian Germann
2 siblings, 1 reply; 6+ messages in thread
From: Bastian Germann @ 2021-09-28 0:25 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
Set Bastian's debian.org email address.
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index e4ec897c..57131bb4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfsprogs
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>
+Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bage@debian.org>
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/
--
2.33.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] debian: Pass --build and --host to configure
2021-09-28 0:25 [PATCH 0/3] debian updates Bastian Germann
2021-09-28 0:25 ` [PATCH 1/3] debian: Update Uploaders list Bastian Germann
@ 2021-09-28 0:25 ` Bastian Germann
2021-10-04 18:27 ` Darrick J. Wong
2021-09-28 0:25 ` [PATCH 3/3] debian: Tag xfslibs-dev "Multi-Arch: same" Bastian Germann
2 siblings, 1 reply; 6+ messages in thread
From: Bastian Germann @ 2021-09-28 0:25 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann, Helmut Grohne
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.
Link: https://bugs.debian.org/794158
Reported-by: Helmut Grohne <helmut@subdivi.de>
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/changelog | 8 ++++++++
debian/rules | 9 +++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4f09e2ca..8b5c6037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <bage@debian.org> Tue, 28 Sep 2021 00:42:50 +0200
+
xfsprogs (5.13.0-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/rules b/debian/rules
index fe9a1c3a..e12814b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
--
2.33.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] debian: Tag xfslibs-dev "Multi-Arch: same"
2021-09-28 0:25 [PATCH 0/3] debian updates Bastian Germann
2021-09-28 0:25 ` [PATCH 1/3] debian: Update Uploaders list Bastian Germann
2021-09-28 0:25 ` [PATCH 2/3] debian: Pass --build and --host to configure Bastian Germann
@ 2021-09-28 0:25 ` Bastian Germann
2 siblings, 0 replies; 6+ messages in thread
From: Bastian Germann @ 2021-09-28 0:25 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
Tag the binary package xfslibs-dev "Multi-Arch: same" because it has all
properties that qualify for this tag.
Link: https://wiki.debian.org/MultiArch/Hints#ma-same
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/changelog | 2 ++
debian/control | 1 +
2 files changed, 3 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8b5c6037..b1414369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 57131bb4..11f8cf08 100644
--- a/debian/control
+++ b/debian/control
@@ -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.
--
2.33.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] debian: Update Uploaders list
2021-09-28 0:25 ` [PATCH 1/3] debian: Update Uploaders list Bastian Germann
@ 2021-10-04 18:18 ` Darrick J. Wong
0 siblings, 0 replies; 6+ messages in thread
From: Darrick J. Wong @ 2021-10-04 18:18 UTC (permalink / raw)
To: Bastian Germann; +Cc: linux-xfs, Bastian Germann
On Tue, Sep 28, 2021 at 02:25:50AM +0200, Bastian Germann wrote:
> Set Bastian's debian.org email address.
>
> Signed-off-by: Bastian Germann <bage@debian.org>
LGTM
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> debian/control | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/debian/control b/debian/control
> index e4ec897c..57131bb4 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,7 +2,7 @@ Source: xfsprogs
> 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>
> +Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bage@debian.org>
> 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/
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] debian: Pass --build and --host to configure
2021-09-28 0:25 ` [PATCH 2/3] debian: Pass --build and --host to configure Bastian Germann
@ 2021-10-04 18:27 ` Darrick J. Wong
0 siblings, 0 replies; 6+ messages in thread
From: Darrick J. Wong @ 2021-10-04 18:27 UTC (permalink / raw)
To: Bastian Germann; +Cc: linux-xfs, Bastian Germann, Helmut Grohne
On Tue, Sep 27, 2021 at 02:25:51AM +0200, Bastian Germann wrote:
> 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.
>
> Link: https://bugs.debian.org/794158
> Reported-by: Helmut Grohne <helmut@subdivi.de>
> Signed-off-by: Bastian Germann <bage@debian.org>
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...
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> debian/changelog | 8 ++++++++
> debian/rules | 9 +++++++--
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index 4f09e2ca..8b5c6037 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -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 <bage@debian.org> Tue, 28 Sep 2021 00:42:50 +0200
> +
> xfsprogs (5.13.0-1) unstable; urgency=medium
>
> * New upstream release
> diff --git a/debian/rules b/debian/rules
> index fe9a1c3a..e12814b3 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -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
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-10-04 18:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28 0:25 [PATCH 0/3] debian updates Bastian Germann
2021-09-28 0:25 ` [PATCH 1/3] debian: Update Uploaders list Bastian Germann
2021-10-04 18:18 ` Darrick J. Wong
2021-09-28 0:25 ` [PATCH 2/3] debian: Pass --build and --host to configure Bastian Germann
2021-10-04 18:27 ` Darrick J. Wong
2021-09-28 0:25 ` [PATCH 3/3] debian: Tag xfslibs-dev "Multi-Arch: same" Bastian Germann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).