Browse Source

lvm2: update to version 2.02.138

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

+ 2
- 2
utils/lvm2/Makefile View File

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


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

@ -1,6 +1,6 @@
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1740,8 +1740,10 @@ struct cmd_context *create_toolcontext(u
@@ -1741,8 +1741,10 @@ struct cmd_context *create_toolcontext(u
unsigned set_filters)
{
struct cmd_context *cmd;
@ -11,7 +11,7 @@
#ifdef M_MMAP_MAX
mallopt(M_MMAP_MAX, 0);
@@ -1777,7 +1779,7 @@ struct cmd_context *create_toolcontext(u
@@ -1778,7 +1780,7 @@ struct cmd_context *create_toolcontext(u
/* FIXME Make this configurable? */
reset_lvm_errno(1);
@ -20,7 +20,7 @@
/* Set in/out stream buffering before glibc */
if (set_buffering) {
/* Allocate 2 buffers */
@@ -2160,7 +2162,7 @@ void destroy_toolcontext(struct cmd_cont
@@ -2161,7 +2163,7 @@ void destroy_toolcontext(struct cmd_cont
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);


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

@ -1,6 +1,6 @@
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -161,12 +161,15 @@ static void _allocate_memory(void)
@@ -169,12 +169,15 @@ static void _allocate_memory(void)
* memory on free(), this is good enough for our purposes.
*/
while (missing > 0) {
@ -16,7 +16,7 @@
inf = mallinfo();
if (hblks < inf.hblks) {
@@ -176,9 +179,12 @@ static void _allocate_memory(void)
@@ -184,9 +187,12 @@ static void _allocate_memory(void)
free(areas[area]);
_size_malloc_tmp /= 2;
} else {
@ -29,7 +29,7 @@
if (area == max_areas && missing > 0) {
/* Too bad. Warn the user and proceed, as things are
@@ -467,8 +473,13 @@ static void _lock_mem(struct cmd_context
@@ -475,8 +481,13 @@ static void _lock_mem(struct cmd_context
* will not block memory locked thread
* Note: assuming _memlock_count_daemon is updated before _memlock_count
*/


Loading…
Cancel
Save