From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@infradead.org>, Carlos Maiolino <cem@kernel.org>
Cc: xfs <linux-xfs@vger.kernel.org>, Dave Chinner <david@fromorbit.com>
Subject: [PATCH] debian: fix package configuration after removing platform_defs.h.in
Date: Tue, 26 Mar 2024 12:24:48 -0700 [thread overview]
Message-ID: <20240326192448.GI6414@frogsfrogsfrogs> (raw)
From: Darrick J. Wong <djwong@kernel.org>
In commit 0fa9dcb61b4f, we made platform_defs.h a static header file
instead of generating it from platform_defs.h.in. Unfortunately, it
turns out that the debian packaging rules use "make
include/platform_defs.h" to run configure with the build options
set via LOCAL_CONFIGURE_OPTIONS.
Since platform_defs.h is no longer generated, the make command in
debian/rules does nothing, which means that the binaries don't get built
the way the packaging scripts specify. This breaks multiarch for
libhandle.so, as well as libeditline and libblkid support for
xfs_db/io/spaceman.
Fix this by correcting debian/rules to make include/builddefs, which
will start ./configure with the desired options. This needs to go in
before 6.7.
Fixes: 0fa9dcb61b4f ("include: stop generating platform_defs.h")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
debian/rules | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index bfe83b4c3bdc..185765b16140 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,15 +61,17 @@ config: .gitcensus
$(checkdir)
AUTOHEADER=/bin/true dh_autoreconf
dh_update_autotools_config
- $(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
+ # runs configure with $(options)
+ $(options) $(MAKE) $(PMAKEFLAGS) include/builddefs
cp -f include/install-sh .
touch .gitcensus
dibuild:
$(checkdir)
@echo "== dpkg-buildpackage: installer" 1>&2
+ # runs configure with $(options)
if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \
- $(diopts) $(MAKE) include/platform_defs.h; \
+ $(diopts) $(MAKE) include/builddefs; \
mkdir -p include/xfs; \
for dir in include libxfs; do \
$(MAKE) $(PMAKEFLAGS) -C $$dir NODEP=1 install-headers; \
next reply other threads:[~2024-03-26 19:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-26 19:24 Darrick J. Wong [this message]
2024-03-26 19:27 ` [PATCH] debian: fix package configuration after removing platform_defs.h.in Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240326192448.GI6414@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).