package/e2fsprogs: version bump for bug fix.

PATCH New Dagg Stompler 4 participants 5 messages Aug 11, 2017 – Sep 5, 2017

Share & tools

Dagg Stompler

author

2017-08-11 11:05 UTC #0 lore raw

PATCH v2 1/1 package/e2fsprogs: version bump for bug fix.

when compiling host e2fsprogs on my system (gentoo amd64, glibc 2.25) the build fails with this error:
../lib/libext2fs.a(ismounted.o): In function `check_mntent_file':
ismounted.c:(.text+0x224): undefined reference to `major'

bumping versions fixes the issue (actual commit id 3fb715b55426875902dfef3056b2cf7335953178).

Signed-off-by Dagg Stompler <[email protected]>

---

v1 -> v2:
add commit reference (Baruch Siach)

 package/e2fsprogs/e2fsprogs.hash | 4 ++--
 package/e2fsprogs/e2fsprogs.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/e2fsprogs/e2fsprogs.hash +2 -2

index cf41e3a3d5..ac420dd825 100644
@@ -1,2 +1,2 @@
-# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.4/sha256sums.asc
-sha256 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24  e2fsprogs-1.43.4.tar.xz
+# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.5/sha256sums.asc
+sha256 261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17  e2fsprogs-1.43.5.tar.xz

package/e2fsprogs/e2fsprogs.mk +1 -1

index 75e9213351..7627a1f589 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-E2FSPROGS_VERSION = 1.43.4
+E2FSPROGS_VERSION = 1.43.5
 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
 E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
 E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)

Signature · 1 line

2.14.1

Arnout Vandecappelle (Essensium/Mind)

2017-08-12 16:22 UTC #1 lore raw

PATCH 1/1 e2fsprogs: add patch for recent glibc

Recent glibc have deprecated the implicit include of sys/sysmacros.h from sys/types.h. That means that the macros major and minor are no longer defined unless this header is included.

This problem was observed for host-e2fsprogs when building on a host with recent glibc.

Add an upstream patch that includes sys/sysmacros.h when needed.

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Cc Dagg Stompler <[email protected]>

Cc Baruch Siach <[email protected]>

---
Dagg, I prefer to cherry-pick this single commit on master instead of bumping the package, since the bump does quite a lot more than just this single change. Can you undo the bump, apply this patch, and see if that fixes the issue for you? If yes, please add your Tested-by.

I'll then apply the version bump to next.

---
 .../0002-include-sys-sysmacros.h-as-needed.patch   | 129 +++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch

package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch new file +129 -0

new file mode 100644
index 0000000000..c58fcb3217
@@ -0,0 +1,129 @@
+From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <[email protected]>
+Date: Fri, 19 May 2017 13:25:59 -0400
+Subject: [PATCH] include sys/sysmacros.h as needed
+
+The minor/major/makedev macros are not entirely standard.  glibc has had
+the definitions in sys/sysmacros.h since the start, and wants to move away
+from always defining them implicitly via sys/types.h (as this pollutes the
+namespace in violation of POSIX).  Other C libraries have already dropped
+them.  Since the configure script already checks for this header, use that
+to pull in the header in files that use these macros.
+
+Signed-off-by: Mike Frysinger <[email protected]>
+Signed-off-by: Theodore Ts'o <[email protected]>
+
+Upstream commit 3fb715b55426875902dfef3056b2cf7335953178
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
+---
+ debugfs/debugfs.c      | 3 +++
+ lib/blkid/devname.c    | 3 +++
+ lib/blkid/devno.c      | 3 +++
+ lib/ext2fs/finddev.c   | 3 +++
+ lib/ext2fs/ismounted.c | 3 +++
+ misc/create_inode.c    | 4 ++++
+ misc/mk_hugefiles.c    | 3 +++
+ 7 files changed, 22 insertions(+)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+index 059ddc39..453f5b52 100644
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -26,6 +26,9 @@ extern char *optarg;
+ #include <errno.h>
+ #endif
+ #include <fcntl.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "debugfs.h"
+ #include "uuid/uuid.h"
+diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
+index 3e2efa9d..671e781f 100644
+--- a/lib/blkid/devname.c
++++ b/lib/blkid/devname.c
+@@ -36,6 +36,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <time.h>
+ 
+ #include "blkidP.h"
+diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
+index aa6eb907..480030f2 100644
+--- a/lib/blkid/devno.c
++++ b/lib/blkid/devno.c
+@@ -31,6 +31,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "blkidP.h"
+ 
+diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
+index 311608de..62fa0dbe 100644
+--- a/lib/ext2fs/finddev.c
++++ b/lib/ext2fs/finddev.c
+@@ -31,6 +31,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
+index bcac0f15..7d524715 100644
+--- a/lib/ext2fs/ismounted.c
++++ b/lib/ext2fs/ismounted.c
+@@ -49,6 +49,9 @@
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+diff --git a/misc/create_inode.c b/misc/create_inode.c
+index ae22ff6f..8ce3fafa 100644
+--- a/misc/create_inode.c
++++ b/misc/create_inode.c
+@@ -22,6 +22,10 @@
+ #include <attr/xattr.h>
+ #endif
+ #include <sys/ioctl.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
++
+ #include <ext2fs/ext2fs.h>
+ #include <ext2fs/ext2_types.h>
+ #include <ext2fs/fiemap.h>
+diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
+index 049c6f41..5882394d 100644
+--- a/misc/mk_hugefiles.c
++++ b/misc/mk_hugefiles.c
+@@ -35,6 +35,9 @@ extern int optind;
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <libgen.h>
+ #include <limits.h>
+ #include <blkid/blkid.h>
+-- 
+2.13.3
+

Signature · 1 line

2.13.3

daggs

author

2017-08-12 19:06 UTC #2 lore raw

PATCH 1/1 e2fsprogs: add patch for recent glibc

Greetings Arnout,

Quoted 173 lines

Sent: Saturday, August 12, 2017 at 7:22 PM
From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
To: buildroot at buildroot.org
Cc: "Dagg Stompler" <[email protected]>
Subject: [Buildroot] [PATCH] e2fsprogs: add patch for recent glibc

Recent glibc have deprecated the implicit include of sys/sysmacros.h from sys/types.h. That means that the macros major and minor are no longer defined unless this header is included.

This problem was observed for host-e2fsprogs when building on a host with recent glibc.

Add an upstream patch that includes sys/sysmacros.h when needed.

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Cc Dagg Stompler <[email protected]>

Cc Baruch Siach <[email protected]>

I'll then apply the version bump to next.

---
 .../0002-include-sys-sysmacros.h-as-needed.patch   | 129 +++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch

package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch new file +129 -0

new file mode 100644
index 0000000000..c58fcb3217
@@ -0,0 +1,129 @@
+From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <[email protected]>
+Date: Fri, 19 May 2017 13:25:59 -0400
+Subject: [PATCH] include sys/sysmacros.h as needed
+
+The minor/major/makedev macros are not entirely standard.  glibc has had
+the definitions in sys/sysmacros.h since the start, and wants to move away
+from always defining them implicitly via sys/types.h (as this pollutes the
+namespace in violation of POSIX).  Other C libraries have already dropped
+them.  Since the configure script already checks for this header, use that
+to pull in the header in files that use these macros.
+
+Signed-off-by: Mike Frysinger <[email protected]>
+Signed-off-by: Theodore Ts'o <[email protected]>
+
+Upstream commit 3fb715b55426875902dfef3056b2cf7335953178
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
+---
+ debugfs/debugfs.c      | 3 +++
+ lib/blkid/devname.c    | 3 +++
+ lib/blkid/devno.c      | 3 +++
+ lib/ext2fs/finddev.c   | 3 +++
+ lib/ext2fs/ismounted.c | 3 +++
+ misc/create_inode.c    | 4 ++++
+ misc/mk_hugefiles.c    | 3 +++
+ 7 files changed, 22 insertions(+)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+index 059ddc39..453f5b52 100644
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -26,6 +26,9 @@ extern char *optarg;
+ #include <errno.h>
+ #endif
+ #include <fcntl.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "debugfs.h"
+ #include "uuid/uuid.h"
+diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
+index 3e2efa9d..671e781f 100644
+--- a/lib/blkid/devname.c
++++ b/lib/blkid/devname.c
+@@ -36,6 +36,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <time.h>
+ 
+ #include "blkidP.h"
+diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
+index aa6eb907..480030f2 100644
+--- a/lib/blkid/devno.c
++++ b/lib/blkid/devno.c
+@@ -31,6 +31,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "blkidP.h"
+ 
+diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
+index 311608de..62fa0dbe 100644
+--- a/lib/ext2fs/finddev.c
++++ b/lib/ext2fs/finddev.c
+@@ -31,6 +31,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
+index bcac0f15..7d524715 100644
+--- a/lib/ext2fs/ismounted.c
++++ b/lib/ext2fs/ismounted.c
+@@ -49,6 +49,9 @@
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+diff --git a/misc/create_inode.c b/misc/create_inode.c
+index ae22ff6f..8ce3fafa 100644
+--- a/misc/create_inode.c
++++ b/misc/create_inode.c
+@@ -22,6 +22,10 @@
+ #include <attr/xattr.h>
+ #endif
+ #include <sys/ioctl.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
++
+ #include <ext2fs/ext2fs.h>
+ #include <ext2fs/ext2_types.h>
+ #include <ext2fs/fiemap.h>
+diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
+index 049c6f41..5882394d 100644
+--- a/misc/mk_hugefiles.c
++++ b/misc/mk_hugefiles.c
+@@ -35,6 +35,9 @@ extern int optind;
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <libgen.h>
+ #include <limits.h>
+ #include <blkid/blkid.h>
+-- 
+2.13.3
+

Signature · 6 lines

2.13.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Tested-by Dagg Stompler <[email protected]>

Thomas Petazzoni

Applied

2017-08-14 21:04 UTC #3 lore raw

PATCH 1/1 e2fsprogs: add patch for recent glibc

In reply to Arnout Vandecappelle (Essensium/Mind)

Hello,

Quoted 9 lines · Arnout Vandecappelle (Essensium/Mind)

Recent glibc have deprecated the implicit include of sys/sysmacros.h from sys/types.h. That means that the macros major and minor are no longer defined unless this header is included.
This problem was observed for host-e2fsprogs when building on a host with recent glibc.
Add an upstream patch that includes sys/sysmacros.h when needed.

Quoted 8 lines

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Cc Dagg Stompler <[email protected]>
Cc Baruch Siach <[email protected]>
---
Dagg, I prefer to cherry-pick this single commit on master instead of bumping the package, since the bump does quite a lot more than just this single change. Can you undo the bump, apply this patch, and see if that fixes the issue for you? If yes, please add your Tested-by.

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2017-09-05 22:35 UTC #4 lore raw

PATCH 1/1 e2fsprogs: add patch for recent glibc

In reply to Arnout Vandecappelle (Essensium/Mind)

Quoted 11 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:
Recent glibc have deprecated the implicit include of sys/sysmacros.h from sys/types.h. That means that the macros major and minor are no longer defined unless this header is included.
This problem was observed for host-e2fsprogs when building on a host with recent glibc.
Add an upstream patch that includes sys/sysmacros.h when needed.

Quoted 8 lines

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Cc Dagg Stompler <[email protected]>
Cc Baruch Siach <[email protected]>
---
Dagg, I prefer to cherry-pick this single commit on master instead of bumping the package, since the bump does quite a lot more than just this single change. Can you undo the bump, apply this patch, and see if that fixes the issue for you? If yes, please add your Tested-by.

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard