diff options
| -rw-r--r-- | meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch | 10 | ||||
| -rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 4 |
2 files changed, 7 insertions, 7 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 087a0501e0..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 @@ | |||
| 1 | From cfa37411fa2ebe8ade94742ee00f86d0e386a651 Mon Sep 17 00:00:00 2001 | 1 | From 65a04547541894b3ec56bd70510b164810cd64b3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dengke Du <dengke.du@windriver.com> | 2 | From: Dengke Du <dengke.du@windriver.com> |
| 3 | Date: Tue, 25 Oct 2016 11:49:40 +0000 | 3 | Date: Tue, 25 Oct 2016 11:49:40 +0000 |
| 4 | Subject: [PATCH] implement libc specific reopen_stream | 4 | Subject: [PATCH] implement libc specific reopen_stream |
| @@ -45,10 +45,10 @@ index 90905e629..ed69662d0 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 | { |
| 47 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c | 47 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c |
| 48 | index 4af6adc83..fbab70988 100644 | 48 | index 22ae1e3bb..b0928bc04 100644 |
| 49 | --- a/tools/lvmcmdline.c | 49 | --- a/tools/lvmcmdline.c |
| 50 | +++ b/tools/lvmcmdline.c | 50 | +++ b/tools/lvmcmdline.c |
| 51 | @@ -3395,7 +3395,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 4af6adc83..fbab70988 100644 | |||
| 57 | if (err) | 57 | if (err) |
| 58 | perror("stdin stream open"); | 58 | perror("stdin stream open"); |
| 59 | else | 59 | else |
| 60 | @@ -3405,7 +3405,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 4af6adc83..fbab70988 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 | @@ -3413,7 +3413,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) && |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index bff075d400..7a87baf5c3 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
| @@ -18,9 +18,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ | |||
| 18 | file://0001-include-libgen.h-for-basename.patch \ | 18 | file://0001-include-libgen.h-for-basename.patch \ |
| 19 | " | 19 | " |
| 20 | 20 | ||
| 21 | SRCREV = "3a6e221c569eb253fa38a772b15e53b5de65b5d1" | 21 | SRCREV = "8817523c5682a7fd83770d3f58a99c436f7e73f7" |
| 22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
| 23 | PV = "2.03.31" | 23 | PV = "2.03.32" |
| 24 | 24 | ||
| 25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" |
| 26 | 26 | ||
