Browse Source

lvm2: update to version 2.02.130

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
lilik-openwrt-22.03
Daniel Golle 9 years ago
parent
commit
ab413cbcf5
2 changed files with 8 additions and 8 deletions
  1. +2
    -2
      utils/lvm2/Makefile
  2. +6
    -6
      utils/lvm2/patches/002-const-stdio.patch

+ 2
- 2
utils/lvm2/Makefile View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=LVM2 PKG_NAME:=LVM2
PKG_VERSION:=2.02.129
PKG_VERSION:=2.02.130
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 LGPL-2.1 PKG_LICENSE:=GPL-2.0 LGPL-2.1
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2 PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2
PKG_MD5SUM:=7ddcbf6eee4970068a0ca598fc775a75
PKG_MD5SUM:=e7ae07e413120713549cc6dd2a558c75
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)


+ 6
- 6
utils/lvm2/patches/002-const-stdio.patch View File

@ -1,7 +1,7 @@
--- a/lib/commands/toolcontext.c --- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c
@@ -1686,8 +1686,10 @@ struct cmd_context *create_toolcontext(u
unsigned threaded)
@@ -1728,8 +1728,10 @@ struct cmd_context *create_toolcontext(u
unsigned set_filters)
{ {
struct cmd_context *cmd; struct cmd_context *cmd;
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL) +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
@ -11,7 +11,7 @@
#ifdef M_MMAP_MAX #ifdef M_MMAP_MAX
mallopt(M_MMAP_MAX, 0); mallopt(M_MMAP_MAX, 0);
@@ -1723,7 +1725,7 @@ struct cmd_context *create_toolcontext(u
@@ -1765,7 +1767,7 @@ struct cmd_context *create_toolcontext(u
/* FIXME Make this configurable? */ /* FIXME Make this configurable? */
reset_lvm_errno(1); reset_lvm_errno(1);
@ -20,7 +20,7 @@
/* Set in/out stream buffering before glibc */ /* Set in/out stream buffering before glibc */
if (set_buffering) { if (set_buffering) {
/* Allocate 2 buffers */ /* Allocate 2 buffers */
@@ -2096,7 +2098,7 @@ void destroy_toolcontext(struct cmd_cont
@@ -2148,7 +2150,7 @@ void destroy_toolcontext(struct cmd_cont
if (cmd->libmem) if (cmd->libmem)
dm_pool_destroy(cmd->libmem); dm_pool_destroy(cmd->libmem);
@ -31,7 +31,7 @@
if (is_valid_fd(STDIN_FILENO) && if (is_valid_fd(STDIN_FILENO) &&
--- a/tools/lvmcmdline.c --- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c
@@ -1722,6 +1722,7 @@ int lvm_split(char *str, int *argc, char
@@ -1735,6 +1735,7 @@ int lvm_split(char *str, int *argc, char
/* Make sure we have always valid filedescriptors 0,1,2 */ /* Make sure we have always valid filedescriptors 0,1,2 */
static int _check_standard_fds(void) static int _check_standard_fds(void)
{ {
@ -39,7 +39,7 @@
int err = is_valid_fd(STDERR_FILENO); int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) && if (!is_valid_fd(STDIN_FILENO) &&
@@ -1748,6 +1749,12 @@ static int _check_standard_fds(void)
@@ -1761,6 +1762,12 @@ static int _check_standard_fds(void)
strerror(errno)); strerror(errno));
return 0; return 0;
} }


Loading…
Cancel
Save