Преглед на файлове

package/lvm2: fix libaio handling

libaio is only needed for standard install

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: fix check-package]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine преди 1 година
родител
ревизия
ee9c92e4a4
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 1 1
      package/lvm2/Config.in
  2. 2 1
      package/lvm2/lvm2.mk

+ 1 - 1
package/lvm2/Config.in

@@ -3,7 +3,6 @@ config BR2_PACKAGE_LVM2
 	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
@@ -27,6 +26,7 @@ if BR2_PACKAGE_LVM2
 config BR2_PACKAGE_LVM2_STANDARD_INSTALL
 config BR2_PACKAGE_LVM2_STANDARD_INSTALL
 	bool "standard install instead of only dmsetup"
 	bool "standard install instead of only dmsetup"
 	default y
 	default y
+	select BR2_PACKAGE_LIBAIO
 	help
 	help
 	  Install the standard suite of lvm2 programs. When this option
 	  Install the standard suite of lvm2 programs. When this option
 	  is not set, only dmsetup is installed.
 	  is not set, only dmsetup is installed.

+ 2 - 1
package/lvm2/lvm2.mk

@@ -25,7 +25,7 @@ LVM2_CONF_OPTS += \
 	--disable-nls \
 	--disable-nls \
 	--with-symvers=no
 	--with-symvers=no
 
 
-LVM2_DEPENDENCIES += host-pkgconf libaio
+LVM2_DEPENDENCIES += host-pkgconf
 
 
 # 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.
@@ -49,6 +49,7 @@ LVM2_CONF_OPTS += --disable-selinux
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y)
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y)
+LVM2_DEPENDENCIES += libaio
 LVM2_INSTALL_STAGING_OPTS += install
 LVM2_INSTALL_STAGING_OPTS += install
 LVM2_INSTALL_TARGET_OPTS += install
 LVM2_INSTALL_TARGET_OPTS += install
 ifeq ($(BR2_INIT_SYSTEMD),y)
 ifeq ($(BR2_INIT_SYSTEMD),y)