summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch')
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
index e11ac5ac08..1f6b89f2b6 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
@@ -1,4 +1,4 @@
1From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 1From 65a04547541894b3ec56bd70510b164810cd64b3 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 25 Oct 2016 11:49:40 +0000 3Date: Tue, 25 Oct 2016 11:49:40 +0000
4Subject: [PATCH] implement libc specific reopen_stream 4Subject: [PATCH] implement libc specific reopen_stream
@@ -21,7 +21,7 @@ Upstream-Status: Pending
21 2 files changed, 9 insertions(+), 3 deletions(-) 21 2 files changed, 9 insertions(+), 3 deletions(-)
22 22
23diff --git a/lib/log/log.c b/lib/log/log.c 23diff --git a/lib/log/log.c b/lib/log/log.c
24index 7b88252f0..e1720098a 100644 24index 90905e629..ed69662d0 100644
25--- a/lib/log/log.c 25--- a/lib/log/log.c
26+++ b/lib/log/log.c 26+++ b/lib/log/log.c
27@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ 27@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
@@ -45,10 +45,10 @@ index 7b88252f0..e1720098a 100644
45 void init_log_fn(lvm2_log_fn_t log_fn) 45 void init_log_fn(lvm2_log_fn_t log_fn)
46 { 46 {
47diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c 47diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
48index 3fd23a521..c2ee39905 100644 48index 22ae1e3bb..b0928bc04 100644
49--- a/tools/lvmcmdline.c 49--- a/tools/lvmcmdline.c
50+++ b/tools/lvmcmdline.c 50+++ b/tools/lvmcmdline.c
51@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) 51@@ -3407,7 +3407,7 @@ static int _check_standard_fds(void)
52 int err = is_valid_fd(STDERR_FILENO); 52 int err = is_valid_fd(STDERR_FILENO);
53 53
54 if (!is_valid_fd(STDIN_FILENO) && 54 if (!is_valid_fd(STDIN_FILENO) &&
@@ -57,7 +57,7 @@ index 3fd23a521..c2ee39905 100644
57 if (err) 57 if (err)
58 perror("stdin stream open"); 58 perror("stdin stream open");
59 else 59 else
60@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) 60@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
61 } 61 }
62 62
63 if (!is_valid_fd(STDOUT_FILENO) && 63 if (!is_valid_fd(STDOUT_FILENO) &&
@@ -66,7 +66,7 @@ index 3fd23a521..c2ee39905 100644
66 if (err) 66 if (err)
67 perror("stdout stream open"); 67 perror("stdout stream open");
68 /* else no stdout */ 68 /* else no stdout */
69@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) 69@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void)
70 } 70 }
71 71
72 if (!is_valid_fd(STDERR_FILENO) && 72 if (!is_valid_fd(STDERR_FILENO) &&