Browse Source

Merge pull request #7331 from neheb/lvm2

lvm2: Update to 2.03.01
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
8baa3571e9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
  1. +4
    -4
      utils/lvm2/Makefile
  2. +1
    -1
      utils/lvm2/patches/000-compile.patch
  3. +1
    -1
      utils/lvm2/patches/001-include_fix.patch
  4. +4
    -4
      utils/lvm2/patches/002-const-stdio.patch
  5. +1
    -1
      utils/lvm2/patches/003-no-mallinfo.patch
  6. +1
    -1
      utils/lvm2/patches/004-device-include-goto-lable-as-well.patch

+ 4
- 4
utils/lvm2/Makefile View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=LVM2
PKG_VERSION:=2.02.181
PKG_VERSION:=2.03.01
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 LGPL-2.1
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2
PKG_HASH:=400fead33b3abc2d82bd631b63f644b646e83040699f2e8f91ff5779119bb89e
PKG_HASH:=424e58b074195ec08e0315fa1aff2550590998c33aea5c43bdceb8c1d135530b
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
@ -26,7 +26,7 @@ define Package/libdevmapper
CATEGORY:=Libraries
TITLE:=The Linux Kernel Device Mapper userspace library
URL:=https://sourceware.org/dm/
DEPENDS:=+kmod-dm +libpthread +libuuid +librt
DEPENDS:=+kmod-dm +libpthread +libuuid +librt +libblkid
endef
define Package/libdevmapper/description
@ -40,7 +40,7 @@ define Package/lvm2
SUBMENU:=Disc
TITLE:=The Linux Logical Volume Manager
URL:=https://sourceware.org/lvm2/
DEPENDS:=+libdevmapper +libblkid +libreadline +libncurses +libaio
DEPENDS:=+libdevmapper +libreadline +libncurses +libaio
endef
define Package/lvm2/description


+ 1
- 1
utils/lvm2/patches/000-compile.patch View File

@ -1,6 +1,6 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -25,7 +25,7 @@ SHELL = @SHELL@
@@ -29,7 +29,7 @@ SHELL = @SHELL@
# Allow environment to override any built-in default value for CC.
# If there is a built-in default, CC is NOT set to @CC@ here.


+ 1
- 1
utils/lvm2/patches/001-include_fix.patch View File

@ -1,6 +1,6 @@
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -24,7 +24,7 @@
@@ -25,7 +25,7 @@
#include <ctype.h>
#ifdef BLKID_WIPING_SUPPORT


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

@ -1,6 +1,6 @@
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1860,7 +1860,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
@@ -1649,7 +1649,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
/* FIXME Make this configurable? */
reset_lvm_errno(1);
@ -9,7 +9,7 @@
/* Set in/out stream buffering before glibc */
if (set_buffering
#ifdef SYS_gettid
@@ -2254,7 +2254,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
@@ -2031,7 +2031,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);
@ -20,7 +20,7 @@
if (is_valid_fd(STDIN_FILENO) &&
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3109,6 +3109,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
@@ -3055,6 +3055,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
/* Make sure we have always valid filedescriptors 0,1,2 */
static int _check_standard_fds(void)
{
@ -28,7 +28,7 @@
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@@ -3135,6 +3136,12 @@ static int _check_standard_fds(void)
@@ -3081,6 +3082,12 @@ static int _check_standard_fds(void)
strerror(errno));
return 0;
}


+ 1
- 1
utils/lvm2/patches/003-no-mallinfo.patch View File

@ -29,7 +29,7 @@
if (area == max_areas && missing > 0) {
/* Too bad. Warn the user and proceed, as things are
@@ -521,8 +527,13 @@ static void _lock_mem(struct cmd_context
@@ -521,8 +527,13 @@ static void _lock_mem(struct cmd_context *cmd)
* will not block memory locked thread
* Note: assuming _memlock_count_daemon is updated before _memlock_count
*/


+ 1
- 1
utils/lvm2/patches/004-device-include-goto-lable-as-well.patch View File

@ -15,7 +15,7 @@ on standard C libraries without O_DIRECT_SUPPORT.
--- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c
@@ -570,7 +570,7 @@ int dev_open_flags(struct device *dev, i
@@ -564,7 +564,7 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet)
return 0;
}


Loading…
Cancel
Save