浏览代码

package/lvm2: drop BR2_PACKAGE_LVM2_APP_LIBRARY

The application library (liblvm2app) has been dropped since version
2.03.00 and
https://github.com/lvmteam/lvm2/commit/0d22b58172808f050abeacdb5d6a7b7132b91a8c

It should be noted that lvm2 support must be dropped from udisks until
a bump to at least version 2.7.0 and
https://github.com/storaged-project/udisks/commit/4c0709a893be49a0db5b2839e4766621e2c1bb98

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr:
  - slightly expand help text for legacy BR2_PACKAGE_UDISKS_LVM2
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine 4 年之前
父节点
当前提交
eb251b3008
共有 5 个文件被更改,包括 15 次插入38 次删除
  1. 14 0
      Config.in.legacy
  2. 0 11
      package/lvm2/Config.in
  3. 0 7
      package/lvm2/lvm2.mk
  4. 0 15
      package/udisks/Config.in
  5. 1 5
      package/udisks/udisks.mk

+ 14 - 0
Config.in.legacy

@@ -146,6 +146,20 @@ endif
 
 
 comment "Legacy options removed in 2021.05"
 comment "Legacy options removed in 2021.05"
 
 
+config BR2_PACKAGE_UDISKS_LVM2
+	bool "udisks lvm2 support removed"
+	select BR2_LEGACY
+	help
+	  The lvm2 support was removed because udisks < 2.7.0 still
+	  depends on lvm2 application library, which was removed
+	  in was removed lvm2.
+
+config BR2_PACKAGE_LVM2_APP_LIBRARY
+	bool "lvm2 application library removed"
+	select BR2_LEGACY
+	help
+	  The lvm2 application library was removed upstream.
+
 config BR2_PACKAGE_LVM2_LVMETAD
 config BR2_PACKAGE_LVM2_LVMETAD
 	bool "lvm2 lvmetad removed"
 	bool "lvm2 lvmetad removed"
 	select BR2_LEGACY
 	select BR2_LEGACY

+ 0 - 11
package/lvm2/Config.in

@@ -36,17 +36,6 @@ config BR2_PACKAGE_LVM2_STANDARD_INSTALL
 comment "lvm2 standard install needs a glibc or uClibc toolchain"
 comment "lvm2 standard install needs a glibc or uClibc toolchain"
 	depends on BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_TOOLCHAIN_USES_MUSL
 
 
-config BR2_PACKAGE_LVM2_APP_LIBRARY
-	bool "install application library"
-	# http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html
-	depends on !BR2_TOOLCHAIN_USES_MUSL
-	select BR2_PACKAGE_LVM2_STANDARD_INSTALL
-	help
-	  Install application library (liblvm2app).
-
-comment "lvm2 application library needs a glibc or uClibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
-
 endif
 endif
 
 
 comment "lvm2 needs a toolchain w/ threads, dynamic library"
 comment "lvm2 needs a toolchain w/ threads, dynamic library"

+ 0 - 7
package/lvm2/lvm2.mk

@@ -55,12 +55,6 @@ LVM2_INSTALL_STAGING_OPTS += install
 LVM2_INSTALL_TARGET_OPTS += install
 LVM2_INSTALL_TARGET_OPTS += install
 endif
 endif
 
 
-ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y)
-LVM2_CONF_OPTS += --enable-applib
-else
-LVM2_CONF_OPTS += --disable-applib
-endif
-
 ifeq ($(BR2_INIT_SYSTEMD),y)
 ifeq ($(BR2_INIT_SYSTEMD),y)
 LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
 LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
 endif
 endif
@@ -75,7 +69,6 @@ HOST_LVM2_CONF_OPTS = \
 	--enable-pkgconfig \
 	--enable-pkgconfig \
 	--disable-cmdlib \
 	--disable-cmdlib \
 	--disable-dmeventd \
 	--disable-dmeventd \
-	--disable-applib \
 	--disable-fsadm \
 	--disable-fsadm \
 	--disable-readline \
 	--disable-readline \
 	--disable-selinux
 	--disable-selinux

+ 0 - 15
package/udisks/Config.in

@@ -31,21 +31,6 @@ config BR2_PACKAGE_UDISKS
 
 
 	  http://www.freedesktop.org/wiki/Software/udisks
 	  http://www.freedesktop.org/wiki/Software/udisks
 
 
-if BR2_PACKAGE_UDISKS
-
-config BR2_PACKAGE_UDISKS_LVM2
-	bool "lvm2 support"
-	# The lvm app library can't compile against musl
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	select BR2_PACKAGE_LVM2_APP_LIBRARY
-	help
-	  Enable LVM2 support
-
-comment "lvm2 support needs a glibc toolchain"
-	depends on !BR2_TOOLCHAIN_USES_GLIBC
-
-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_HAS_UDEV
 	depends on !BR2_PACKAGE_HAS_UDEV

+ 1 - 5
package/udisks/udisks.mk

@@ -24,10 +24,6 @@ UDISKS_DEPENDENCIES = \
 	sg3_utils \
 	sg3_utils \
 	udev
 	udev
 
 
-UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
-
-ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
-UDISKS_CONF_OPTS += --enable-lvm2
-endif
+UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages --disable-lvm2
 
 
 $(eval $(autotools-package))
 $(eval $(autotools-package))