Skip to contentSkip to conversation

lvm2: 2.02.138 -> 2.02.166

PATCH New Dengke Du 1 participant 1 message Nov 16, 2016

lore
Share & tools
lore

Dengke Du

author
#0 lore raw

PATCH 1/1 lvm2: 2.02.138 -> 2.02.166

---
 meta-oe/recipes-support/lvm2/lvm2.inc              |  12 +-
 ...01-implement-libc-specific-_reopen_stream.patch | 139 ---------------------
 ...001-implement-libc-specific-reopen_stream.patch |  80 ++++++++++++
 ...002-Guard-use-of-mallinfo-with-__GLIBC__.patch} |  19 +--
 ..._MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch |  44 -------
 ...ntl.h-for-O_-defines-and-fcntl-signature.patch} |  15 +--
 ...004-tweak-MODPROBE_CMD-for-cross-compile.patch} |  22 ++--
 meta-oe/recipes-support/lvm2/lvm2_2.02.166.bb      |   6 +
 8 files changed, 120 insertions(+), 217 deletions(-)
 delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-_reopen_stream.patch
 create mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch
 rename meta-oe/recipes-support/lvm2/lvm2/{0003-Guard-use-of-mallinfo-with-__GLIBC__.patch => 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch} (53%)
 delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0002-use-PTHREAD_MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch
 rename meta-oe/recipes-support/lvm2/lvm2/{0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch => 0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch} (64%)
 rename meta-oe/recipes-support/lvm2/lvm2/{0005-tweak-MODPROBE_CMD-for-cross-compile.patch => 0004-tweak-MODPROBE_CMD-for-cross-compile.patch} (70%)
 create mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.166.bb
meta-oe/recipes-support/lvm2/lvm2.inc +5 -7
index 74b7211..7bd26c0 100644
@@ -2,18 +2,16 @@ SECTION = "utils"
 DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
 DEPENDS = "udev"
 LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \
                     file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
 
 SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
            file://lvm.conf \
-           file://0001-implement-libc-specific-_reopen_stream.patch \
-           file://0002-use-PTHREAD_MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch \
-           file://0003-Guard-use-of-mallinfo-with-__GLIBC__.patch \
-           file://0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
-           file://0005-tweak-MODPROBE_CMD-for-cross-compile.patch \
+           file://0001-implement-libc-specific-reopen_stream.patch \
+           file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
+           file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
+           file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \
            "
-
 S = "${WORKDIR}/LVM2.${PV}"
 
 inherit autotools-brokensep pkgconfig systemd
meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-_reopen_stream.patch deleted +0 -139

139 lines not on this page · raw message

meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch new file +80 -0

80 lines not on this page · raw message

meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch renamed from meta-oe/recipes-support/lvm2/lvm2/0003-Guard-use-of-mallinfo-with-__GLIBC__.patch +10 -9
similarity index 53%
rename from meta-oe/recipes-support/lvm2/lvm2/0003-Guard-use-of-mallinfo-with-__GLIBC__.patch
rename to meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
index 3d71767..5baafab 100644
@@ -1,30 +1,31 @@
-From e018d055603389b22cbc3bd68b1525f3048ebee7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 20 Jan 2016 04:50:26 +0000
-Subject: [PATCH 3/4] Guard use of mallinfo() with __GLIBC__
+From 8706a6d33753d8b2cf5bb2a12bd6880b371ce337 Mon Sep 17 00:00:00 2001
+From: Dengke Du <[email protected]>
+Date: Tue, 25 Oct 2016 11:52:44 +0000
+Subject: [PATCH 2/4] Guard use of mallinfo() with __GLIBC__
 
 This API is glibc-only
 
 Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Dengke Du <[email protected]>
 ---
 Upstream-Status: Pending
-
+---
  lib/mm/memlock.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
-index 969f1d7..405a7c0 100644
+index da90144..c1bf8fb 100644
 --- a/lib/mm/memlock.c
 +++ b/lib/mm/memlock.c
-@@ -145,7 +145,7 @@ static void _touch_memory(void *mem, size_t size)
+@@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size)
  
  static void _allocate_memory(void)
  {
 -#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
++#ifndef VALGRIND_POOL && defined(__GLIBC__)
  	void *stack_mem;
  	struct rlimit limit;
  	int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
 -- 
-2.7.0
+2.9.3
 
meta-oe/recipes-support/lvm2/lvm2/0002-use-PTHREAD_MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch deleted +0 -44

44 lines not on this page · raw message

meta-oe/recipes-support/lvm2/lvm2/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch renamed from meta-oe/recipes-support/lvm2/lvm2/0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch +8 -7
similarity index 64%
rename from meta-oe/recipes-support/lvm2/lvm2/0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch
rename to meta-oe/recipes-support/lvm2/lvm2/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch
index 2a3b843..9ab1c06 100644
@@ -1,19 +1,20 @@
-From 9b793d5b4adc5d8b3684e7f66943e236eae7c2db Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 20 Jan 2016 04:52:59 +0000
-Subject: [PATCH 4/4] include fcntl.h for O_* defines and fcntl() signature
+From b1ad91a059d99afd1ce25823b7c0a8d3ac63d2fd Mon Sep 17 00:00:00 2001
+From: Dengke Du <[email protected]>
+Date: Tue, 25 Oct 2016 11:55:49 +0000
+Subject: [PATCH 3/4] include fcntl.h for O_* defines and fcntl() signature
 
 On glibc _somehow_ this header gets pulled in indirectly
 
 Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Dengke Du <[email protected]>
 ---
 Upstream-Status: Pending
-
+---
  libdaemon/server/daemon-server.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
-index d9d60d1..433d100 100644
+index 6af6de9..a9590e7 100644
 --- a/libdaemon/server/daemon-server.c
 +++ b/libdaemon/server/daemon-server.c
 @@ -18,6 +18,7 @@
@@ -25,5 +26,5 @@ index d9d60d1..433d100 100644
  #include <errno.h>
  #include <pthread.h>
 -- 
-2.7.0
+2.9.3
 
meta-oe/recipes-support/lvm2/lvm2/0004-tweak-MODPROBE_CMD-for-cross-compile.patch renamed from meta-oe/recipes-support/lvm2/lvm2/0005-tweak-MODPROBE_CMD-for-cross-compile.patch +11 -11
similarity index 70%
rename from meta-oe/recipes-support/lvm2/lvm2/0005-tweak-MODPROBE_CMD-for-cross-compile.patch
rename to meta-oe/recipes-support/lvm2/lvm2/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
index 8db320d..aaeaa72 100644
@@ -1,7 +1,7 @@
-From 72866782f83c8cf85b10017df461128af90cae6e Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 30 Aug 2016 22:33:47 -0400
-Subject: [PATCH] tweak MODPROBE_CMD for cross compile
+From 0012ea63f6070a5d41fa380970f9c30b953237d2 Mon Sep 17 00:00:00 2001
+From: Dengke Du <[email protected]>
+Date: Tue, 25 Oct 2016 11:59:40 +0000
+Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile
 
 Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
 is incorrect.
@@ -16,23 +16,23 @@ filter=["r|/loop1$|","r|/loop2$|","r|/loop3$|","r|/loop4$|","r|/loop5$|","r|/loo
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Hongxu Jia <[email protected]>
+Signed-off-by: Dengke Du <[email protected]>
 ---
- configure.in | 2 --
- 1 file changed, 2 deletions(-)
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/configure.in b/configure.in
-index 8e04782..77681b0 100644
+index cc77aab..a3579f2 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1779,8 +1779,6 @@ if test "$UDEV_SYNC" = yes; then
+@@ -1853,7 +1853,6 @@ if test "$UDEV_SYNC" = yes; then
  fi
  
  ################################################################################
 -AC_PATH_TOOL(MODPROBE_CMD, modprobe)
--
+ 
  if test -n "$MODPROBE_CMD"; then
  	AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
- fi
 -- 
-2.8.1
+2.9.3
 
meta-oe/recipes-support/lvm2/lvm2_2.02.166.bb new file +6 -0
new file mode 100644
index 0000000..8476b01
@@ -0,0 +1,6 @@
+require lvm2.inc
+
+SRC_URI[md5sum] = "c5a54ee0b86703daaad6e856439e115a"
+SRC_URI[sha256sum] = "e120b066b85b224552efda40204488c5123de068725676fd6e5c8bc655051b94"
+
+DEPENDS += "autoconf-archive"
Signature · 1 line
2.7.4