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 <lu...@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.
From f5e071ffa2672e72d80de23486621cf9a8e381a8 Mon Sep 17 00:00:00 2001 From: David Roman <dro...@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
From 4dd851a2e5eb6a1a74d24005389b13612cfb3299 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <s...@debian.org> Date: Fri, 16 May 2025 17:23:10 -0400 Subject: [PATCH 2/3] release 1.5-1.1 to unstable --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6ebf526..01b51ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +btrfs-compsize (1.5-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix ftbfs with David Roman's patch (Closes: #1091561). + + -- Nicholas D Steeves <s...@debian.org> Fri, 16 May 2025 17:26:22 -0400 + btrfs-compsize (1.5-1) unstable; urgency=medium * New upstream release (with a massive speed increase!). -- 2.39.5
From 0385eaf1111481cb6956fa5d79f315e5f247607d Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <s...@debian.org> Date: Fri, 16 May 2025 17:31:20 -0400 Subject: [PATCH 3/3] Commit Debian 3.0 (quilt) metadata [dgit (10.7+deb12u3) quilt-fixup] --- debian/patches/debian-changes | 62 ++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 0a5eceb..17dc179 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -1,30 +1,7 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - btrfs-compsize (1.3-2) unstable; urgency=medium - . - * Fix cross builds [Helmut Grohne]. Closes: #924292. - * Drop a pre-stretch-bpo B-Dep. - * dh 12. -Author: Adam Borowski <kilob...@angband.pl> -Bug-Debian: https://bugs.debian.org/924292 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: https://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: 2019-07-22 +This is an autogenerated patch header for a single-debian-patch file. The +delta against upstream is either kept as a single patch, or maintained +in some VCS, and exported as a single patch instead of more manageable +atomic patches. --- btrfs-compsize-1.5.orig/compsize.8 +++ btrfs-compsize-1.5/compsize.8 @@ -34,3 +11,34 @@ Last-Update: 2019-07-22 This program doesn't currently support filesystems above 8TB on 32-bit -machines \*- but neither do other btrfs tools. +machines \(em but neither do other btrfs tools. +--- btrfs-compsize-1.5.orig/compsize.c ++++ btrfs-compsize-1.5/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> +--- btrfs-compsize-1.5.orig/radix-tree.h ++++ btrfs-compsize-1.5/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
signature.asc
Description: PGP signature
