Changeset 14726


Ignorieren:
Zeitstempel:
12.06.2018 20:14:03 (vor 4 Monaten)
Autor:
er13
Nachricht:

e2fsprogs: update sysmacros-patch once again (debugfs/dump.c was missing)

rediff/reorder other patches
refs #2961

Ort:
trunk
Dateien:
1 hinzugefügt
5 bearbeitet
2 verschoben

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/e2fsprogs/patches/044-no_inline_funcs.patch

    r14725 r14726  
    11--- configure 
    22+++ configure 
    3 @@ -13527,7 +13527,7 @@ 
     3@@ -13529,7 +13529,7 @@ 
    44 # Let make expand exec_prefix. 
    55 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' 
  • trunk/make/e2fsprogs/patches/905-blkid_mtdworkaround.patch

    r8878 r14726  
    11--- lib/blkid/devname.c 
    22+++ lib/blkid/devname.c 
    3 @@ -54,6 +54,9 @@ 
     3@@ -57,6 +57,9 @@ 
    44    if (!cache || !devname) 
    55        return NULL; 
  • trunk/tools/make/e2fsprogs-host/patches/001-sysmacros_3fb715b55426875902dfef3056b2cf7335953178.upstream.patch

    r14725 r14726  
    1313Signed-off-by: Mike Frysinger <vapier@gentoo.org> 
    1414Signed-off-by: Theodore Ts'o <tytso@mit.edu> 
    15 --- 
    16  lib/blkid/devname.c    | 3 +++ 
    17  lib/blkid/devno.c      | 3 +++ 
    18  lib/ext2fs/finddev.c   | 3 +++ 
    19  lib/ext2fs/ismounted.c | 3 +++ 
    20  misc/mk_hugefiles.c    | 3 +++ 
    21  5 files changed, 15 insertions(+) 
    2215 
    23 diff --git lib/blkid/devname.c lib/blkid/devname.c 
    24 index 3e2efa9..671e781 100644 
    2516--- lib/blkid/devname.c 
    2617+++ lib/blkid/devname.c 
     
    3526  
    3627 #include "blkidP.h" 
    37 diff --git lib/blkid/devno.c lib/blkid/devno.c 
    38 index aa6eb90..480030f 100644 
    3928--- lib/blkid/devno.c 
    4029+++ lib/blkid/devno.c 
     
    4938 #include "blkidP.h" 
    5039  
    51 diff --git lib/ext2fs/finddev.c lib/ext2fs/finddev.c 
    52 index 311608d..62fa0db 100644 
    5340--- lib/ext2fs/finddev.c 
    5441+++ lib/ext2fs/finddev.c 
     
    6350 #include "ext2_fs.h" 
    6451 #include "ext2fs.h" 
    65 diff --git lib/ext2fs/ismounted.c lib/ext2fs/ismounted.c 
    66 index bcac0f1..7d52471 100644 
    6752--- lib/ext2fs/ismounted.c 
    6853+++ lib/ext2fs/ismounted.c 
     
    7762 #include "ext2_fs.h" 
    7863 #include "ext2fs.h" 
    79 diff --git misc/mk_hugefiles.c misc/mk_hugefiles.c 
    80 index 049c6f4..5882394 100644 
    8164--- misc/mk_hugefiles.c 
    8265+++ misc/mk_hugefiles.c 
     
    9174 #include <limits.h> 
    9275 #include <blkid/blkid.h> 
     76--- debugfs/dump.c 
     77+++ debugfs/dump.c 
     78@@ -21,6 +21,9 @@ 
     79 #endif 
     80 #include <sys/types.h> 
     81 #include <sys/stat.h> 
     82+#ifdef HAVE_SYS_SYSMACROS_H 
     83+#include <sys/sysmacros.h> 
     84+#endif 
     85 #include <fcntl.h> 
     86 #include <utime.h> 
     87 #ifdef HAVE_GETOPT_H 
  • trunk/tools/make/e2fsprogs-host/patches/020-ignore_mkdir_errors_while_creating_root_directory.patch

    r13233 r14726  
    11--- debugfs/dump.c 
    22+++ debugfs/dump.c 
    3 @@ -285,8 +285,12 @@ 
     3@@ -288,8 +288,12 @@ 
    44         * expect to have to create entries it.  Then fix its perms 
    55         * once we've done the traversal. */ 
  • trunk/tools/make/e2fsprogs-host/patches/030-dump_files_of_all_types.patch

    r13238 r14726  
    66--- debugfs/dump.c 
    77+++ debugfs/dump.c 
    8 @@ -278,7 +278,8 @@ 
     8@@ -281,7 +281,8 @@ 
    99            goto errout; 
    1010        } 
     
    1616  
    1717        /* Create the directory with 0700 permissions, because we 
    18 @@ -299,8 +300,36 @@ 
     18@@ -302,8 +303,36 @@ 
    1919            com_err("rdump", retval, "while dumping %s", fullname); 
    2020  
  • trunk/tools/make/e2fsprogs-host/patches/031-ignore_non_fatal_errors_in_non_root_mode.patch

    r13300 r14726  
    44--- debugfs/dump.c 
    55+++ debugfs/dump.c 
    6 @@ -67,6 +67,14 @@ 
     6@@ -70,6 +70,14 @@ 
    77    return mode; 
    88 } 
     
    1919              int fd, const char *name) 
    2020 { 
    21 @@ -88,7 +96,7 @@ 
     21@@ -91,7 +99,7 @@ 
    2222    else 
    2323        i = chown(name, inode->i_uid, inode->i_gid); 
     
    2828  
    2929    ut.actime = inode->i_atime; 
    30 @@ -315,13 +323,13 @@ 
     30@@ -318,13 +326,13 @@ 
    3131        } 
    3232  
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.