Browse Source

lvm2: update to 2.03.08

Add PKG_BUILD_PARALLEL for faster compilation.

Replace '  ' with TAB for consistency between packages.

Refresh patches and remove outdated ones.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 5 years ago
parent
commit
78360ebdda
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
5 changed files with 16 additions and 36 deletions
  1. +9
    -7
      utils/lvm2/Makefile
  2. +0
    -11
      utils/lvm2/patches/000-compile.patch
  3. +0
    -11
      utils/lvm2/patches/001-include_fix.patch
  4. +6
    -6
      utils/lvm2/patches/002-const-stdio.patch
  5. +1
    -1
      utils/lvm2/patches/004-device-include-goto-lable-as-well.patch

+ 9
- 7
utils/lvm2/Makefile View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=LVM2 PKG_NAME:=LVM2
PKG_VERSION:=2.03.05
PKG_VERSION:=2.03.08
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2 PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2
PKG_HASH:=ca52815c999b20c6d25e3192f142f081b93d01f07b9d787e99664b169dba2700
PKG_HASH:=6e0261dc9f6ab0ef1fc4a63d105a73e06eb536a273a9d6c2ccc414548c8e1ec8
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
@ -22,6 +22,8 @@ PKG_LICENSE:=GPL-2.0 LGPL-2.1
PKG_LICENSE_FILES:=COPYING COPYING.lib PKG_LICENSE_FILES:=COPYING COPYING.lib
PKG_CPE_ID:=cpe:/a:heinz_mauelshagen:lvm2 PKG_CPE_ID:=cpe:/a:heinz_mauelshagen:lvm2
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/libdevmapper define Package/libdevmapper
@ -53,11 +55,11 @@ define Package/lvm2/description
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-o_direct \
--with-default-pid-dir=/var/run \
--with-default-dm-run-dir=/var/run \
--with-default-run-dir=/var/run/lvm \
--with-default-locking-dir=/var/lock/lvm
--disable-o_direct \
--with-default-pid-dir=/var/run \
--with-default-dm-run-dir=/var/run \
--with-default-run-dir=/var/run/lvm \
--with-default-locking-dir=/var/lock/lvm
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \


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

@ -1,11 +0,0 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -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.
-CC ?= @CC@
+CC = @CC@
# If $(CC) holds the usual built-in default value of 'cc' then replace it with
# the configured value.

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

@ -1,11 +0,0 @@
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -25,7 +25,7 @@
#include <ctype.h>
#ifdef BLKID_WIPING_SUPPORT
-#include <blkid.h>
+#include <blkid/blkid.h>
#endif
#ifdef UDEV_SYNC_SUPPORT

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

@ -1,6 +1,6 @@
--- a/lib/commands/toolcontext.c --- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c
@@ -1649,7 +1649,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
@@ -1599,7 +1599,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);
@ -9,10 +9,10 @@
/* Set in/out stream buffering before glibc */ /* Set in/out stream buffering before glibc */
if (set_buffering if (set_buffering
#ifdef SYS_gettid #ifdef SYS_gettid
@@ -2031,7 +2031,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);
@@ -1980,7 +1980,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
if (cmd->pending_delete_mem)
dm_pool_destroy(cmd->pending_delete_mem);
-#ifndef VALGRIND_POOL -#ifndef VALGRIND_POOL
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL) +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
if (cmd->linebuffer) { if (cmd->linebuffer) {
@ -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
@@ -3055,6 +3055,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
@@ -3230,6 +3230,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) &&
@@ -3081,6 +3082,12 @@ static int _check_standard_fds(void)
@@ -3256,6 +3257,12 @@ static int _check_standard_fds(void)
strerror(errno)); strerror(errno));
return 0; return 0;
} }


+ 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 --- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c +++ b/lib/device/dev-io.c
@@ -564,7 +564,7 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet)
@@ -374,7 +374,7 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet)
return 0; return 0;
} }


Loading…
Cancel
Save