From: Martin Bark <martin@barkynet.com>
Date: Sat, 6 May 2017 13:19:12 +0000 (+0100)
Subject: package/nodejs: remove support for express
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=096f8b13ac423377310b9dabee3bc7bf94476f3e;p=buildroot.git

package/nodejs: remove support for express

BR2_PACKAGE_NODEJS_MODULES_EXPRESS has been deprecated.  To continue using
add express to BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL

Fixes:
http://autobuild.buildroot.org/results/fcfa38e98c22c8809452f7d0ee86dfe2e9d2482f
http://autobuild.buildroot.org/results/946996fa78c7814d1e0ea0ef1239c6eb0c7aa8dd
http://autobuild.buildroot.org/results/df920e7b17617f1e4867d94eda52cab38f7b0622

Signed-off-by: Martin Bark <martin@barkynet.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/Config.in.legacy b/Config.in.legacy
index bc14bf2a61..501581c6fc 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,14 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.05"
 
+config BR2_PACKAGE_NODEJS_MODULES_EXPRESS
+	bool "Express web application framework option has been removed"
+	select BR2_LEGACY
+	help
+	  The option to enable the NodeJS Express web application
+	  framework has been removed. To continue using it, add
+	  "express" to BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL.
+
 config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL
 	bool "bluez5_utils gatttool install option removed"
 	select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 4810d59de9..d5034cca4d 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -44,16 +44,6 @@ config BR2_PACKAGE_NODEJS_NPM
 
 	  Note that NPM is always built for the buildroot host.
 
-config BR2_PACKAGE_NODEJS_MODULES_EXPRESS
-	bool "Express web application framework"
-	help
-	  Express is a minimal and flexible node.js web application
-	  framework, providing a robust set of features for building
-	  single and multi-page, and hybrid web applications.
-
-	  http://www.expressjs.com
-	  https://github.com/visionmedia/express
-
 config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT
 	bool "CoffeeScript"
 	help
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 1a195022d6..ba6ee4e743 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -143,7 +143,6 @@ endef
 # popular modules, as well as the "additional modules" list.
 #
 NODEJS_MODULES_LIST= $(call qstrip,\
-	$(if $(BR2_PACKAGE_NODEJS_MODULES_EXPRESS),express) \
 	$(if $(BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT),coffee-script) \
 	$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL))