From patchwork Fri Nov 16 04:33:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 998752 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tkos.co.il Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42x53c4ZmRz9s8F for ; Fri, 16 Nov 2018 15:34:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EF4B623EA3; Fri, 16 Nov 2018 04:34:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ljPBY52lppdo; Fri, 16 Nov 2018 04:34:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9B50F22CCE; Fri, 16 Nov 2018 04:34:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D93B61BF4E3 for ; Fri, 16 Nov 2018 04:34:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D4C8D882BB for ; Fri, 16 Nov 2018 04:34:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GDLzktCGH6Mr for ; Fri, 16 Nov 2018 04:34:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9DE0188298 for ; Fri, 16 Nov 2018 04:34:10 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id 60436440072; Fri, 16 Nov 2018 06:34:08 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Fri, 16 Nov 2018 06:33:53 +0200 Message-Id: X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] libnftnl: drop useless BR2_PACKAGE_LIBNFTNL_XML X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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 | 5 +++++ package/libnftnl/Config.in | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c3df37ddd9cb..9aafd624ea36 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -232,6 +232,11 @@ 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 + 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 d4c9a1bb54e3..65390011a983 100644 --- a/package/libnftnl/Config.in +++ b/package/libnftnl/Config.in @@ -22,13 +22,6 @@ 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