diff options
| author | Alex Maclean <monkeh@monkeh.net> | 2017-10-23 13:47:33 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-10-27 11:19:38 +0200 |
| commit | 855d210f656961cb989c2741748942414dbdefb7 (patch) | |
| tree | 12fd7f65b2604ad08dbdba22db5c34d5493363c4 | |
| parent | 4a5de1f4309fe2de6a9af8c4d1b0e7b65372cee9 (diff) | |
| download | upstream-855d210f656961cb989c2741748942414dbdefb7.tar.gz upstream-855d210f656961cb989c2741748942414dbdefb7.tar.bz2 upstream-855d210f656961cb989c2741748942414dbdefb7.zip | |
tools/mtd-utils: include sysmacros.h explicitly
glibc is moving to remove the include of sys/sysmacros.h from
sys/types.h, and some distros have done this early. Other libcs may
already lack this include. Include sysmacros.h explicitly.
Fixes: FS#1015
Signed-off-by: Alex Maclean <monkeh@monkeh.net>
[refresh patches]
Signed-off-by: Mathias Kresin <dev@kresin.me>
| -rw-r--r-- | tools/mtd-utils/patches/120-include_sysmacros.patch | 25 | ||||
| -rw-r--r-- | tools/mtd-utils/patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch | 6 |
2 files changed, 27 insertions, 4 deletions
diff --git a/tools/mtd-utils/patches/120-include_sysmacros.patch b/tools/mtd-utils/patches/120-include_sysmacros.patch new file mode 100644 index 0000000000..81ba1cfb2b --- /dev/null +++ b/tools/mtd-utils/patches/120-include_sysmacros.patch @@ -0,0 +1,25 @@ +From 9a06f45ec71116d76ee4b268ebe1b33d45b06fc0 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 16 Apr 2016 22:10:43 -0400 +Subject: [PATCH mtd-utils] include sys/sysmacros.h for major/minor/makedev + +These functions have always been defined in sys/sysmacros.h under +Linux C libraries. For some, including sys/types.h implicitly +includes that as well, but glibc wants to deprecate that, and some +others already have. Include the header explicitly for the funcs. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/common.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/include/common.h ++++ b/include/common.h +@@ -27,6 +27,7 @@ + #include <fcntl.h> + #include <errno.h> + #include <inttypes.h> ++#include <sys/sysmacros.h> + #include "version.h" + + #ifndef PROGRAM_NAME diff --git a/tools/mtd-utils/patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch b/tools/mtd-utils/patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch index 46014e7a32..70e6a7e360 100644 --- a/tools/mtd-utils/patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch +++ b/tools/mtd-utils/patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch @@ -1,7 +1,5 @@ -Index: mtd-utils-1.5.2/mkfs.jffs2.c -=================================================================== ---- mtd-utils-1.5.2.orig/mkfs.jffs2.c -+++ mtd-utils-1.5.2/mkfs.jffs2.c +--- a/mkfs.jffs2.c ++++ b/mkfs.jffs2.c @@ -108,7 +108,7 @@ static char *rootdir = default_rootdir; static int verbose = 0; static int squash_uids = 0; |