Skip to contentSkip to conversation

libnftnl: drop useless BR2_PACKAGE_LIBNFTNL_XML

PATCH New Baruch Siach 2 participants 2 messages Nov 16, 2018 – Nov 19, 2018

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH v4 1/1 libnftnl: drop useless BR2_PACKAGE_LIBNFTNL_XML

Commit fa0d1ebff99 (libnftnl: bump to version 1.0.9) removed the mxml dependency. Remove the redundant BR2_PACKAGE_LIBNFTNL_XML config symbol as well.

Cc Yegor Yefremov <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
v4: Add missing 'bool' type to the legacy entry

v3: Remove the dependency comment as well

v2: Add Config.in.legacy entry (Thomas, Arnout)

Note: the legacy entry is under 2018.11. If this patch is backported to stable branch it should probably move to an appropriate place per branch.

---
 Config.in.legacy           |  6 ++++++
 package/libnftnl/Config.in | 10 ----------
 2 files changed, 6 insertions(+), 10 deletions(-)
Config.in.legacy +6 -0
index c3df37ddd9cb..a5e0c9fe4fe0 100644
@@ -232,6 +232,12 @@ config BR2_KERNEL_HEADERS_4_17
 	  Version 4.17.x of the Linux kernel headers are no longer
 	  maintained upstream and are now removed.
 
+config BR2_PACKAGE_LIBNFTNL_XML
+	bool "libnftl no longer supports XML output"
+	select BR2_LEGACY
+	help
+	  libnftnl removed integration with libmxml.
+
 ###############################################################################
 comment "Legacy options removed in 2018.08"
package/libnftnl/Config.in +0 -10
index d4c9a1bb54e3..347223ce22a0 100644
@@ -22,14 +22,4 @@ config BR2_PACKAGE_LIBNFTNL_JSON
 	help
 	  Enable JSON parsing support
 
-config BR2_PACKAGE_LIBNFTNL_XML
-	bool "enable XML support"
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_MXML
-	help
-	  Enable XML parsing support
-
-comment "libnftnl XML parsing support needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
 endif
Signature · 1 line
2.19.1
Applied
#1 lore raw

PATCH v4 1/1 libnftnl: drop useless BR2_PACKAGE_LIBNFTNL_XML

Hello,

Quoted 8 lines · Baruch Siach

Commit fa0d1ebff99 (libnftnl: bump to version 1.0.9) removed the mxml dependency. Remove the redundant BR2_PACKAGE_LIBNFTNL_XML config symbol as well.

Cc Yegor Yefremov <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
v4: Add missing 'bool' type to the legacy entry

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com