Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

LVM2: Update to 2.02.81

Browse source 
Switch to upstream URL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2018-07-30 16:16:20 -07:00
parent 7bbec3b06b
commit 307ac69e60
6 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
utils/lvm2/Makefile
View file

@ -9,14 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=LVM2 PKG_NAME:=LVM2
PKG_VERSION:=2.02.177 PKG_VERSION:=2.02.181
PKG_RELEASE:=2 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/releases \ PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2
http://ftp.gwdg.de/pub/linux/sources.redhat.com/lvm2/ PKG_HASH:=400fead33b3abc2d82bd631b63f644b646e83040699f2e8f91ff5779119bb89e
PKG_HASH:=4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2
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)
@ -26,7 +25,7 @@ define Package/libdevmapper
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=The Linux Kernel Device Mapper userspace library TITLE:=The Linux Kernel Device Mapper userspace library
URL:=http://sourceware.org/dm/ URL:=https://sourceware.org/dm/
DEPENDS:=+kmod-dm +libpthread +libuuid +librt DEPENDS:=+kmod-dm +libpthread +libuuid +librt
endef endef
@ -40,8 +39,8 @@ define Package/lvm2
CATEGORY:=Utilities CATEGORY:=Utilities
SUBMENU:=Disc SUBMENU:=Disc
TITLE:=The Linux Logical Volume Manager TITLE:=The Linux Logical Volume Manager
URL:=http://sourceware.org/lvm2/ URL:=https://sourceware.org/lvm2/
DEPENDS:=+libdevmapper +libblkid +libreadline +libncurses DEPENDS:=+libdevmapper +libblkid +libreadline +libncurses +libaio
endef endef
define Package/lvm2/description define Package/lvm2/description

2
utils/lvm2/patches/000-compile.patch
View file

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

2
utils/lvm2/patches/001-include_fix.patch
View file

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

12
utils/lvm2/patches/002-const-stdio.patch
View file

@ -1,15 +1,15 @@
--- a/lib/commands/toolcontext.c --- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c
@@ -1869,7 +1869,7 @@ struct cmd_context *create_toolcontext(u @@ -1860,7 +1860,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
/* FIXME Make this configurable? */ /* FIXME Make this configurable? */
reset_lvm_errno(1); reset_lvm_errno(1);
-#ifndef VALGRIND_POOL -#ifndef VALGRIND_POOL
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL) +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
/* Set in/out stream buffering before glibc */ /* Set in/out stream buffering before glibc */
if (set_buffering) { if (set_buffering
/* Allocate 2 buffers */ #ifdef SYS_gettid
@@ -2249,7 +2249,7 @@ void destroy_toolcontext(struct cmd_cont @@ -2254,7 +2254,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
if (cmd->libmem) if (cmd->libmem)
dm_pool_destroy(cmd->libmem); dm_pool_destroy(cmd->libmem);
@ -20,7 +20,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
@@ -3074,6 +3074,7 @@ int lvm_split(char *str, int *argc, char @@ -3109,6 +3109,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
/* 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)
{ {
@ -28,7 +28,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) &&
@@ -3100,6 +3101,12 @@ static int _check_standard_fds(void) @@ -3135,6 +3136,12 @@ static int _check_standard_fds(void)
strerror(errno)); strerror(errno));
return 0; return 0;
} }

6
utils/lvm2/patches/003-no-mallinfo.patch
View file

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

2
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 --- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c +++ b/lib/device/dev-io.c
@@ -529,7 +529,7 @@ int dev_open_flags(struct device *dev, i @@ -570,7 +570,7 @@ int dev_open_flags(struct device *dev, i
return 0; return 0;
} }