tags 1071297 +patch
thanks
It looks like e2fsprogs 1.47.1 renamed the inode_includes macro to
ext2fs_inode_includes.
A debdiff for the upload I made to raspbian to deal with this is
attached.
diff -Nru btrfs-progs-6.6.3/debian/changelog btrfs-progs-6.6.3/debian/changelog
--- btrfs-progs-6.6.3/debian/changelog 2024-02-28 05:21:59.000000000 +0000
+++ btrfs-progs-6.6.3/debian/changelog 2024-06-12 11:42:41.000000000 +0000
@@ -1,3 +1,10 @@
+btrfs-progs (6.6.3-1.1+rpi1) trixie-staging; urgency=medium
+
+ * Change inode_includes to ext2fs_inode_includes (Closes: #1071297)
+ * Bump dependency on libext2fs-dev.
+
+ -- Peter Michael Green <plugw...@raspbian.org> Wed, 12 Jun 2024 11:42:41
+0000
+
btrfs-progs (6.6.3-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru btrfs-progs-6.6.3/debian/control btrfs-progs-6.6.3/debian/control
--- btrfs-progs-6.6.3/debian/control 2024-02-28 05:21:59.000000000 +0000
+++ btrfs-progs-6.6.3/debian/control 2024-06-12 11:42:41.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Adam Borowski <kilob...@angband.pl>
Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
- libext2fs-dev,
+ libext2fs-dev (>= 1.47.1),
pkg-config,
libacl1-dev,
libblkid-dev,
diff -Nru btrfs-progs-6.6.3/debian/patches/debian-changes
btrfs-progs-6.6.3/debian/patches/debian-changes
--- btrfs-progs-6.6.3/debian/patches/debian-changes 1970-01-01
00:00:00.000000000 +0000
+++ btrfs-progs-6.6.3/debian/patches/debian-changes 2024-06-12
11:42:41.000000000 +0000
@@ -0,0 +1,27 @@
+Description: 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.
+Forwarded: not-needed
+
+---
+--- btrfs-progs-6.6.3.orig/convert/source-ext2.c
++++ btrfs-progs-6.6.3/convert/source-ext2.c
+@@ -730,7 +730,7 @@ static inline void ext4_decode_extra_tim
+ #define EXT4_COPY_XTIME(xtime, dst, tv_sec, tv_nsec)
\
+ do {
\
+ tv_sec = src->i_ ## xtime ;
\
+- if (inode_includes(inode_size, i_ ## xtime ## _extra)) {
\
++ if (ext2fs_inode_includes(inode_size, i_ ## xtime ## _extra)) {
\
+ tv_sec = src->i_ ## xtime ;
\
+ ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_ ## xtime ##
_extra); \
+ btrfs_set_stack_timespec_sec(&dst->xtime , tv_sec);
\
+@@ -771,7 +771,7 @@ static int ext4_copy_inode_timespec_extr
+ EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec);
+
+ tv_sec = src->i_crtime;
+- if (inode_includes(inode_size, i_crtime_extra)) {
++ if (ext2fs_inode_includes(inode_size, i_crtime_extra)) {
+ tv_sec = src->i_crtime;
+ ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_crtime_extra);
+ btrfs_set_stack_timespec_sec(&dst->otime, tv_sec);
diff -Nru btrfs-progs-6.6.3/debian/patches/series
btrfs-progs-6.6.3/debian/patches/series
--- btrfs-progs-6.6.3/debian/patches/series 1970-01-01 00:00:00.000000000
+0000
+++ btrfs-progs-6.6.3/debian/patches/series 2024-06-12 11:42:41.000000000
+0000
@@ -0,0 +1 @@
+debian-changes
