jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/lvm2: bump version to 2.02.180

Browse Source 
lvm2 starting from version 2.02.178 depends on libaio library.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Marcin Niestroj 2018-07-26 19:15:24 +02:00 committed by Thomas Petazzoni
parent 4744923bb7
commit 8e666bf29e
9 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/cryptsetup/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_CRYPTSETUP config BR2_PACKAGE_CRYPTSETUP
bool "cryptsetup" bool "cryptsetup"
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS # lvm2
depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2
@ -17,5 +18,6 @@ config BR2_PACKAGE_CRYPTSETUP
comment "cryptsetup needs a toolchain w/ threads, dynamic library" comment "cryptsetup needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

2
package/dmraid/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_DMRAID config BR2_PACKAGE_DMRAID
bool "dmraid" bool "dmraid"
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS # lvm2
depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2
@ -14,4 +15,5 @@ config BR2_PACKAGE_DMRAID
comment "dmraid needs a toolchain w/ threads, dynamic library" comment "dmraid needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

1
package/docker-engine/Config.in
View File

@ -44,6 +44,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER
bool "devicemapper filesystem driver" bool "devicemapper filesystem driver"
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS # lvm2
depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2

2
package/luksmeta/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_LUKSMETA config BR2_PACKAGE_LUKSMETA
bool "luksmeta" bool "luksmeta"
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS # cryptsetup -> lvm2
depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2
depends on BR2_USE_MMU # cryptsetup -> lvm2 depends on BR2_USE_MMU # cryptsetup -> lvm2
depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2
@ -13,5 +14,6 @@ config BR2_PACKAGE_LUKSMETA
comment "luksmeta needs a toolchain w/ threads, dynamic library" comment "luksmeta needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

55
package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
View File

@ -1,4 +1,4 @@
From f563334a76e31442f7b8693d2d350e6981c51c46 Mon Sep 17 00:00:00 2001 From 94d71c49eb1682a73465eb162b0a059561168bb2 Mon Sep 17 00:00:00 2001
From: Marcin Niestroj <m.niestroj@grinn-global.com> From: Marcin Niestroj <m.niestroj@grinn-global.com>
Date: Fri, 20 Jul 2018 14:26:44 +0200 Date: Fri, 20 Jul 2018 14:26:44 +0200
Subject: [PATCH] configure: Introduce --enable-symvers option Subject: [PATCH] configure: Introduce --enable-symvers option
@ -27,7 +27,7 @@ library.
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
--- ---
configure | 32 ++++++++++++++++++++++++++++++-- configure | 32 ++++++++++++++++++++++++++++++--
configure.in | 28 +++++++++++++++++++++++++--- configure.ac | 28 +++++++++++++++++++++++++---
include/configure.h.in | 3 +++ include/configure.h.in | 3 +++
lib/misc/lib.h | 10 +++++----- lib/misc/lib.h | 10 +++++-----
libdm/datastruct/bitset.c | 5 +---- libdm/datastruct/bitset.c | 5 +----
@ -37,10 +37,10 @@ Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
8 files changed, 67 insertions(+), 17 deletions(-) 8 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/configure b/configure diff --git a/configure b/configure
index e1ae0e884..c5d11c1b6 100755 index 7d945dfa8..94cd6b1ea 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -985,6 +985,7 @@ enable_fsadm @@ -975,6 +975,7 @@ enable_fsadm
enable_blkdeactivate enable_blkdeactivate
enable_dmeventd enable_dmeventd
enable_selinux enable_selinux
@ -48,7 +48,7 @@ index e1ae0e884..c5d11c1b6 100755
enable_nls enable_nls
with_localedir with_localedir
with_confdir with_confdir
@@ -1729,6 +1730,9 @@ Optional Features: @@ -1725,6 +1726,9 @@ Optional Features:
--disable-blkdeactivate disable blkdeactivate --disable-blkdeactivate disable blkdeactivate
--enable-dmeventd enable the device-mapper event daemon --enable-dmeventd enable the device-mapper event daemon
--disable-selinux disable selinux support --disable-selinux disable selinux support
@ -58,15 +58,15 @@ index e1ae0e884..c5d11c1b6 100755
--enable-nls enable Native Language Support --enable-nls enable Native Language Support
Optional Packages: Optional Packages:
@@ -3169,7 +3173,6 @@ if test -z "$CFLAGS"; then : @@ -3156,7 +3160,6 @@ if test -z "$CFLAGS"; then :
fi fi
case "$host_os" in case "$host_os" in
linux*) linux*)
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" - CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
# equivalent to -rdynamic
ELDFLAGS="-Wl,--export-dynamic" ELDFLAGS="-Wl,--export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym # FIXME Generate list and use --dynamic-list=.dlopen.sym
CLDWHOLEARCHIVE="-Wl,-whole-archive" @@ -3178,7 +3181,6 @@ case "$host_os" in
@@ -3190,7 +3193,6 @@ case "$host_os" in
;; ;;
darwin*) darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@ -74,7 +74,7 @@ index e1ae0e884..c5d11c1b6 100755
ELDFLAGS= ELDFLAGS=
CLDWHOLEARCHIVE="-all_load" CLDWHOLEARCHIVE="-all_load"
CLDNOWHOLEARCHIVE= CLDNOWHOLEARCHIVE=
@@ -14609,6 +14611,32 @@ done @@ -14401,6 +14403,32 @@ done
LIBS=$lvm_saved_libs LIBS=$lvm_saved_libs
fi fi
@ -107,15 +107,16 @@ index e1ae0e884..c5d11c1b6 100755
################################################################################ ################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalisation" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalisation" >&5
$as_echo_n "checking whether to enable internationalisation... " >&6; } $as_echo_n "checking whether to enable internationalisation... " >&6; }
diff --git a/configure.in b/configure.in diff --git a/configure.ac b/configure.ac
index 2e5e015c8..09c390850 100644 index e427708cd..2e8712f92 100644
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -30,12 +30,10 @@ AC_CANONICAL_TARGET([]) @@ -30,13 +30,11 @@ AC_CANONICAL_TARGET([])
AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
case "$host_os" in case "$host_os" in
linux*) linux*)
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" - CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
# equivalent to -rdynamic
ELDFLAGS="-Wl,--export-dynamic" ELDFLAGS="-Wl,--export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym # FIXME Generate list and use --dynamic-list=.dlopen.sym
CLDWHOLEARCHIVE="-Wl,-whole-archive" CLDWHOLEARCHIVE="-Wl,-whole-archive"
@ -124,7 +125,7 @@ index 2e5e015c8..09c390850 100644
LIB_SUFFIX=so LIB_SUFFIX=so
DEVMAPPER=yes DEVMAPPER=yes
BUILD_LVMETAD=no BUILD_LVMETAD=no
@@ -51,7 +49,6 @@ case "$host_os" in @@ -52,7 +50,6 @@ case "$host_os" in
;; ;;
darwin*) darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@ -132,7 +133,7 @@ index 2e5e015c8..09c390850 100644
ELDFLAGS= ELDFLAGS=
CLDWHOLEARCHIVE="-all_load" CLDWHOLEARCHIVE="-all_load"
CLDNOWHOLEARCHIVE= CLDNOWHOLEARCHIVE=
@@ -1742,6 +1739,31 @@ package as well (which may be called readline-devel or something similar).]) @@ -1656,6 +1653,31 @@ package as well (which may be called readline-devel or something similar).])
LIBS=$lvm_saved_libs LIBS=$lvm_saved_libs
fi fi
@ -165,10 +166,10 @@ index 2e5e015c8..09c390850 100644
dnl -- Internationalisation stuff dnl -- Internationalisation stuff
AC_MSG_CHECKING(whether to enable internationalisation) AC_MSG_CHECKING(whether to enable internationalisation)
diff --git a/include/configure.h.in b/include/configure.h.in diff --git a/include/configure.h.in b/include/configure.h.in
index 51726506c..3fc181b1e 100644 index 15fd150ed..7a07a10ef 100644
--- a/include/configure.h.in --- a/include/configure.h.in
+++ b/include/configure.h.in +++ b/include/configure.h.in
@@ -151,6 +151,9 @@ @@ -147,6 +147,9 @@
/* Path to fsadm binary. */ /* Path to fsadm binary. */
#undef FSADM_PATH #undef FSADM_PATH
@ -179,10 +180,10 @@ index 51726506c..3fc181b1e 100644
#undef HAVE_ALARM #undef HAVE_ALARM
diff --git a/lib/misc/lib.h b/lib/misc/lib.h diff --git a/lib/misc/lib.h b/lib/misc/lib.h
index 8ed06f81d..9b3ce8a03 100644 index d7fa5c721..7cf98f932 100644
--- a/lib/misc/lib.h --- a/lib/misc/lib.h
+++ b/lib/misc/lib.h +++ b/lib/misc/lib.h
@@ -42,16 +42,16 @@ @@ -41,16 +41,16 @@
* macro DM_EXPORT_SYMBOL to export the function and bind it to the * macro DM_EXPORT_SYMBOL to export the function and bind it to the
* specified version string. * specified version string.
* *
@ -203,7 +204,7 @@ index 8ed06f81d..9b3ce8a03 100644
* // Backward compatible dm_foo() version 1.02.104 * // Backward compatible dm_foo() version 1.02.104
* int dm_foo_v1_02_104(void); * int dm_foo_v1_02_104(void);
* int dm_foo_v1_02_104(void) * int dm_foo_v1_02_104(void)
@@ -68,7 +68,7 @@ @@ -67,7 +67,7 @@
* versions of library symbols prior to the introduction of symbol * versions of library symbols prior to the introduction of symbol
* versioning: it must never be used for new symbols. * versioning: it must never be used for new symbols.
*/ */
@ -234,10 +235,10 @@ index b0826e1eb..2ec3f8f84 100644
- -
#endif #endif
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index c47e08467..b98afb15d 100644 index 769b69c1b..28e2eadee 100644
--- a/libdm/ioctl/libdm-iface.c --- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c
@@ -2137,7 +2137,7 @@ void dm_lib_exit(void) @@ -2145,7 +2145,7 @@ void dm_lib_exit(void)
_version_checked = 0; _version_checked = 0;
} }
@ -247,10 +248,10 @@ index c47e08467..b98afb15d 100644
* Maintain binary backward compatibility. * Maintain binary backward compatibility.
* Version script mechanism works with 'gcc' compatible compilers only. * Version script mechanism works with 'gcc' compatible compilers only.
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index cf4fd62e7..474871da5 100644 index ab0545659..00651c0b2 100644
--- a/libdm/libdm-deptree.c --- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c
@@ -4110,7 +4110,7 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode, @@ -3797,7 +3797,7 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode,
dnode->callback_data = data; dnode->callback_data = data;
} }
@ -260,10 +261,10 @@ index cf4fd62e7..474871da5 100644
* Backward compatible implementations. * Backward compatible implementations.
* *
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index bc498675f..d424928c7 100644 index 94ad380e0..76efbbe35 100644
--- a/libdm/libdm-stats.c --- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c +++ b/libdm/libdm-stats.c
@@ -5064,7 +5064,7 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, @@ -5065,7 +5065,7 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
* current dm_stats_create_region() version. * current dm_stats_create_region() version.
*/ */

3
package/lvm2/Config.in
View File

@ -1,8 +1,10 @@
config BR2_PACKAGE_LVM2 config BR2_PACKAGE_LVM2
bool "lvm2 & device mapper" bool "lvm2 & device mapper"
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # needs fork() depends on BR2_USE_MMU # needs fork()
depends on !BR2_STATIC_LIBS # It fails to build statically depends on !BR2_STATIC_LIBS # It fails to build statically
select BR2_PACKAGE_LIBAIO
help help
This is LVM2, the rewrite of The Linux Logical Volume Manager. This is LVM2, the rewrite of The Linux Logical Volume Manager.
LVM supports enterprise level volume management of disk and LVM supports enterprise level volume management of disk and
@ -50,4 +52,5 @@ endif
comment "lvm2 needs a toolchain w/ threads, dynamic library" comment "lvm2 needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

4
package/lvm2/lvm2.hash
View File

@ -1,5 +1,5 @@
# From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum # From ftp://sources.redhat.com/pub/lvm2/sha512.sum
sha512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e LVM2.2.02.173.tgz sha512 6e0a10ab48be4f0c751447c6ab88b8f9fa1dcd1d703de77966e8507b173df70b1987fa0be252c31dfce9e0ee70e5f439db58c8f534e24144a70f254c091554ee LVM2.2.02.180.tgz
# Locally computed sha256 checksums # Locally computed sha256 checksums
sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB

6
package/lvm2/lvm2.mk
View File

@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
LVM2_VERSION = 2.02.173 LVM2_VERSION = 2.02.180
LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_SITE = ftp://sources.redhat.com/pub/lvm2
LVM2_INSTALL_STAGING = YES LVM2_INSTALL_STAGING = YES
LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE = GPL-2.0, LGPL-2.1
LVM2_LICENSE_FILES = COPYING COPYING.LIB LVM2_LICENSE_FILES = COPYING COPYING.LIB
@ -22,7 +22,7 @@ LVM2_CONF_OPTS += \
--disable-nls \ --disable-nls \
--disable-symvers --disable-symvers
LVM2_DEPENDENCIES += host-pkgconf LVM2_DEPENDENCIES += host-pkgconf libaio
# LVM2 uses autoconf, but not automake, and the build system does not # LVM2 uses autoconf, but not automake, and the build system does not
# take into account the toolchain passed at configure time. # take into account the toolchain passed at configure time.

3
package/udisks/Config.in
View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_UDISKS config BR2_PACKAGE_UDISKS
bool "udisks" bool "udisks"
depends on BR2_PACKAGE_HAS_UDEV depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS # lvm2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2
depends on BR2_TOOLCHAIN_USES_GLIBC # polkit, lvm2 depends on BR2_TOOLCHAIN_USES_GLIBC # polkit, lvm2
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
@ -38,9 +39,11 @@ endif
comment "udisks needs udev /dev management" comment "udisks needs udev /dev management"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on !BR2_PACKAGE_HAS_UDEV depends on !BR2_PACKAGE_HAS_UDEV
comment "udisks needs a glibc toolchain w/ wchar, threads, dynamic library" comment "udisks needs a glibc toolchain w/ wchar, threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC