--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Control: tag -1 patch
Control: retitle -1 Bug#1091561: btrfs-compsize: FTBFS: radix-tree.h:51:9: error: unknown type name ‘gfp_t’

Lucas Nussbaum <lucas@debian.org> writes:

During a rebuild of all packages in sid, this package failed to build
on i386.

This package currently has binary packages on i386, so this is a regression.

This isn't i386 specific. I've created, tested, and attached a
Debianised version of David Roman's patch; this patch is used upstream.

Unfortunately the dgit repository seems to be misconfigured, and I fundamentally disagree with single-debian-patch, so 0003-Commit-Debian-3.0-quilt-metadata.patch shouldn't exist in my mind.

At any rate, I've done a 0-day NMU because there hasn't been any
movement on this bug in over six months, and because I haven't been able
to contact Adam for something like a year now. Dgit-generated nmudiff
is attached.


--=-=-Content-Type: text/x-diff
Content-Disposition: attachment;
filename 01-fix-build-with-btrfs-progs-6.10.1.patch
Content-Transfer-Encoding: quoted-printable

From f5e071ffa2672e72d80de23486621cf9a8e381a8 Mon Sep 17 00:00:00 2001
From: David Roman <droman@ifae.es>
Date: Mon, 25 Nov 2024 14:10:16 +0100
Subject: [PATCH 1/3] fix build with btrfs-progs >= 6.10.1

Bug: https://github.com/kilobyte/compsize/issues/52
Forwarded: https://github.com/kilobyte/compsize/pull/54
---
compsize.c | 2 ++
radix-tree.h | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compsize.c b/compsize.c
index a1e48c5..6d6d835 100644
--- a/compsize.c
+++ b/compsize.c
@@ -5,12 +5,14 @@
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
+#include "kerncompat.h"
#include <btrfs/ioctl.h>
#include <btrfs/ctree.h>
#include <stdarg.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <inttypes.h>
+#include <errno.h>
#include <linux/limits.h>
#include <getopt.h>
#include <signal.h>
diff --git a/radix-tree.h b/radix-tree.h
index bf96d83..d99ea7e 100644
--- a/radix-tree.h
+++ b/radix-tree.h
@@ -37,11 +37,7 @@
#ifndef _LINUX_RADIX_TREE_H
#define _LINUX_RADIX_TREE_H

-#if BTRFS_FLAT_INCLUDES
#include "kerncompat.h"
-#else
-#include <btrfs/kerncompat.h>
-#endif /* BTRFS_FLAT_INCLUDES */

#define RADIX_TREE_MAX_TAGS 2

--
2.39.5


--=-=-Content-Type: text/x-diff
Content-Disposition: attachment;
filename 02-release