From 00d63a153decb668d67547600ca9032de7205c8b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 16 Nov 2018 08:40:43 +0200 Subject: [PATCH] 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 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/libnftnl/Config.in | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c3df37ddd9..a5e0c9fe4f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -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" diff --git a/package/libnftnl/Config.in b/package/libnftnl/Config.in index d4c9a1bb54..347223ce22 100644 --- a/package/libnftnl/Config.in +++ b/package/libnftnl/Config.in @@ -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