[Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options
@ 2018-05-13 19:07 Thomas Petazzoni
  2018-05-13 19:07 ` [Buildroot] [PATCH 1/8] bluez5_utils: rename options to have the proper suffix Thomas Petazzoni
                   ` (8 more replies)
  0 siblings, 9 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

Hello,

This series was started from Petr Vorel's patch fixing libmediaart
options, which had a wrong prefix. I started writing an additional
check in check-package for this mistake, and thanks to it, I
discovered a number of other issues, fixed by this patch series.

Best regards,

Thomas

Petr Vorel (1):
  libmediaart: rename options to have proper prefix

Thomas Petazzoni (7):
  bluez5_utils: rename options to have the proper suffix
  jquery-ui-themes: rename options to have proper prefix
  libftdi: rename option to have proper prefix
  ipsec-tools: rename options to have proper prefix
  janus-gateway: rename options to have proper prefix
  ti-sgx-km: rename options to have proper prefix
  utils/check-package: verify the prefix of package Config.in options

 Config.in.legacy                       | 467 +++++++++++++++++++++++++++++++++
 package/bluez5_utils/Config.in         |  10 +-
 package/bluez5_utils/bluez5_utils.mk   |  10 +-
 package/ipsec-tools/Config.in          |   8 +-
 package/ipsec-tools/ipsec-tools.mk     |   6 +-
 package/janus-gateway/Config.in        |  28 +-
 package/janus-gateway/janus-gateway.mk |  28 +-
 package/jquery-ui-themes/Config.in     |  96 +++----
 package/libftdi/Config.in              |   2 +-
 package/libftdi/libftdi.mk             |   2 +-
 package/libmediaart/Config.in          |   8 +-
 package/libmediaart/libmediaart.mk     |   6 +-
 package/ti-sgx-km/Config.in            |  10 +-
 package/ti-sgx-km/ti-sgx-km.mk         |   8 +-
 utils/checkpackagelib/lib_config.py    |  75 ++++++
 15 files changed, 653 insertions(+), 111 deletions(-)

-- 
2.14.3

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 1/8] bluez5_utils: rename options to have the proper suffix
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-13 19:18   ` Yann E. MORIN
  2018-05-13 19:07 ` [Buildroot] [PATCH 2/8] jquery-ui-themes: rename options to have proper prefix Thomas Petazzoni
                   ` (7 subsequent siblings)
  8 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

The bluez5_utils Config.in options had a bogus prefix:
BR2_PACKAGE_BLUEZ5 instead of the expected
BR2_PACKAGE_BLUEZ5_UTILS. This commit fixes that, and adds the
appropriate Config.in.legacy handling.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Config.in.legacy                     | 45 ++++++++++++++++++++++++++++++++++++
 package/bluez5_utils/Config.in       | 10 ++++----
 package/bluez5_utils/bluez5_utils.mk | 10 ++++----
 3 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 66d3a0c5a8..6d17f7de6d 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,51 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
+	bool "bluez5-utils health plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
+	bool "bluez5-utils midi plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
+	bool "bluez5-utils nfc plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_NFC has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
+	bool "bluez5-utils sap plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_SAP has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
+	bool "bluez5-utils sixaxis plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS.
+
 config BR2_PACKAGE_LIBKCAPI_APPS
 	bool "libkcapi test applications removed"
 	select BR2_LEGACY
diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
index 55831e9b61..c5e8dfbcf7 100644
--- a/package/bluez5_utils/Config.in
+++ b/package/bluez5_utils/Config.in
@@ -56,29 +56,29 @@ config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
 	help
 	  Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
 	bool "build health plugin"
 	help
 	  Build BlueZ 5.x health plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI
 	bool "build midi profile"
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_SEQ
 	help
 	  Build BlueZ 5.x midi plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC
 	bool "build nfc plugin"
 	help
 	  Build BlueZ 5.x nfc plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
 	bool "build sap plugin"
 	help
 	  Build BlueZ 5.x sap plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS
 	bool "build sixaxis plugin"
 	depends on BR2_PACKAGE_HAS_UDEV
 	help
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index 3189855624..aff1fd9796 100644
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -41,14 +41,14 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
 endif
 
 # enable health plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-health
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-health
 endif
 
 # enable midi profile
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-midi
 BLUEZ5_UTILS_DEPENDENCIES += alsa-lib
 else
@@ -56,21 +56,21 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-midi
 endif
 
 # enable nfc plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-nfc
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-nfc
 endif
 
 # enable sap plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-sap
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-sap
 endif
 
 # enable sixaxis plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 1/8] bluez5_utils: rename options to have the proper suffix
  2018-05-13 19:07 ` [Buildroot] [PATCH 1/8] bluez5_utils: rename options to have the proper suffix Thomas Petazzoni
@ 2018-05-13 19:18   ` Yann E. MORIN
  0 siblings, 0 replies; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-13 19:18 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
> The bluez5_utils Config.in options had a bogus prefix:
> BR2_PACKAGE_BLUEZ5 instead of the expected
> BR2_PACKAGE_BLUEZ5_UTILS. This commit fixes that, and adds the
> appropriate Config.in.legacy handling.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  Config.in.legacy                     | 45 ++++++++++++++++++++++++++++++++++++
>  package/bluez5_utils/Config.in       | 10 ++++----
>  package/bluez5_utils/bluez5_utils.mk | 10 ++++----
>  3 files changed, 55 insertions(+), 10 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 66d3a0c5a8..6d17f7de6d 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,51 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2018.05"
>  
> +config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
> +	bool "bluez5-utils health plugin option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH has been renamed to
> +	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH.
> +
> +config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
> +	bool "bluez5-utils midi plugin option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI has been renamed to
> +	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI.
> +
> +config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
> +	bool "bluez5-utils nfc plugin option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_BLUEZ5_PLUGINS_NFC has been renamed to
> +	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC.
> +
> +config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
> +	bool "bluez5-utils sap plugin option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_BLUEZ5_PLUGINS_SAP has been renamed to
> +	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP.
> +
> +config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
> +	bool "bluez5-utils sixaxis plugin option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS has been renamed to
> +	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS.
> +
>  config BR2_PACKAGE_LIBKCAPI_APPS
>  	bool "libkcapi test applications removed"
>  	select BR2_LEGACY
> diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
> index 55831e9b61..c5e8dfbcf7 100644
> --- a/package/bluez5_utils/Config.in
> +++ b/package/bluez5_utils/Config.in
> @@ -56,29 +56,29 @@ config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
>  	help
>  	  Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin
>  
> -config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
> +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
>  	bool "build health plugin"
>  	help
>  	  Build BlueZ 5.x health plugin
>  
> -config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
> +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI
>  	bool "build midi profile"
>  	select BR2_PACKAGE_ALSA_LIB
>  	select BR2_PACKAGE_ALSA_LIB_SEQ
>  	help
>  	  Build BlueZ 5.x midi plugin
>  
> -config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
> +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC
>  	bool "build nfc plugin"
>  	help
>  	  Build BlueZ 5.x nfc plugin
>  
> -config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
> +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
>  	bool "build sap plugin"
>  	help
>  	  Build BlueZ 5.x sap plugin
>  
> -config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
> +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS
>  	bool "build sixaxis plugin"
>  	depends on BR2_PACKAGE_HAS_UDEV
>  	help
> diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
> index 3189855624..aff1fd9796 100644
> --- a/package/bluez5_utils/bluez5_utils.mk
> +++ b/package/bluez5_utils/bluez5_utils.mk
> @@ -41,14 +41,14 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
>  endif
>  
>  # enable health plugin
> -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y)
> +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH),y)
>  BLUEZ5_UTILS_CONF_OPTS += --enable-health
>  else
>  BLUEZ5_UTILS_CONF_OPTS += --disable-health
>  endif
>  
>  # enable midi profile
> -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y)
> +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI),y)
>  BLUEZ5_UTILS_CONF_OPTS += --enable-midi
>  BLUEZ5_UTILS_DEPENDENCIES += alsa-lib
>  else
> @@ -56,21 +56,21 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-midi
>  endif
>  
>  # enable nfc plugin
> -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y)
> +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC),y)
>  BLUEZ5_UTILS_CONF_OPTS += --enable-nfc
>  else
>  BLUEZ5_UTILS_CONF_OPTS += --disable-nfc
>  endif
>  
>  # enable sap plugin
> -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y)
> +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP),y)
>  BLUEZ5_UTILS_CONF_OPTS += --enable-sap
>  else
>  BLUEZ5_UTILS_CONF_OPTS += --disable-sap
>  endif
>  
>  # enable sixaxis plugin
> -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y)
> +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS),y)
>  BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis
>  else
>  BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis
> -- 
> 2.14.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 2/8] jquery-ui-themes: rename options to have proper prefix
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
  2018-05-13 19:07 ` [Buildroot] [PATCH 1/8] bluez5_utils: rename options to have the proper suffix Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-13 19:19   ` Yann E. MORIN
  2018-05-13 19:07 ` [Buildroot] [PATCH 3/8] libftdi: rename option " Thomas Petazzoni
                   ` (6 subsequent siblings)
  8 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

The choice options to select the specific jquery-ui theme to install
had a prefix of BR2_PACKAGE_JQUERY_UI_THEME_ instead of
BR2_PACKAGE_JQUERY_UI_THEMES_. This commit fixes that, and adds
Config.in.legacy handling. It's worse mentioning that since those
options are part of a choice, the legacy handling cannot select the
new name of the option: we can simply inform the user about the
renaming.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Config.in.legacy                   | 216 +++++++++++++++++++++++++++++++++++++
 package/jquery-ui-themes/Config.in |  96 ++++++++---------
 2 files changed, 264 insertions(+), 48 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 6d17f7de6d..4283888c72 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,222 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+	bool "jquery-ui-themes option black-tie renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  black-tie theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+	bool "jquery-ui-themes option blitzer renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  blitzer theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_BLITZER to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+	bool "jquery-ui-themes option cupertino renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  cupertino theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+	bool "jquery-ui-themes option dark-hive renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  dark-hive theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+	bool "jquery-ui-themes option dot-luv renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  dot-luv theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+	bool "jquery-ui-themes option eggplant renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  eggplant theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+	bool "jquery-ui-themes option excite-bike renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  excite-bike theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+	bool "jquery-ui-themes option flick renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  flick theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_FLICK to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_FLICK.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+	bool "jquery-ui-themes option hot-sneaks renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  hot-sneaks theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+	bool "jquery-ui-themes option humanity renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  humanity theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+	bool "jquery-ui-themes option le-frog renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  le-frog theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+	bool "jquery-ui-themes option mint-choc renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  mint-choc theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+	bool "jquery-ui-themes option overcast renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  overcast theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+	bool "jquery-ui-themes option pepper-grinder renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  pepper-grinder theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+	bool "jquery-ui-themes option redmond renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  redmond theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_REDMOND to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+	bool "jquery-ui-themes option smoothness renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  smoothness theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+	bool "jquery-ui-themes option south-street renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  south-street theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_START
+	bool "jquery-ui-themes option start renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  start theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_START to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_START.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+	bool "jquery-ui-themes option sunny renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  sunny theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SUNNY to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+	bool "jquery-ui-themes option swanky-purse renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  swanky-purse theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+	bool "jquery-ui-themes option trontastic renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  trontastic theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+	bool "jquery-ui-themes option ui-darkness renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  ui-darkness theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+	bool "jquery-ui-themes option ui-lightness renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  ui-lightness theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_VADER
+	bool "jquery-ui-themes option vader renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  vader theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_VADER to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_VADER.
+
 config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
 	bool "bluez5-utils health plugin option renamed"
 	select BR2_LEGACY
diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in
index fde3014602..29359544ac 100644
--- a/package/jquery-ui-themes/Config.in
+++ b/package/jquery-ui-themes/Config.in
@@ -13,105 +13,105 @@ choice
 	help
 	  Specify the jQuery UI theme to install.
 
-config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+config BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE
 	bool "black-tie"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+config BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER
 	bool "blitzer"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+config BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO
 	bool "cupertino"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+config BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE
 	bool "dark-hive"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+config BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV
 	bool "dot-luv"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+config BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT
 	bool "eggplant"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+config BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE
 	bool "excite-bike"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+config BR2_PACKAGE_JQUERY_UI_THEMES_FLICK
 	bool "flick"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+config BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS
 	bool "hot-sneaks"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+config BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY
 	bool "humanity"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+config BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG
 	bool "le-frog"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+config BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC
 	bool "mint-choc"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+config BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST
 	bool "overcast"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+config BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER
 	bool "pepper-grinder"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+config BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND
 	bool "redmond"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+config BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS
 	bool "smoothness"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+config BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET
 	bool "south-street"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_START
+config BR2_PACKAGE_JQUERY_UI_THEMES_START
 	bool "start"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+config BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY
 	bool "sunny"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+config BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE
 	bool "swanky-purse"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+config BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC
 	bool "trontastic"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+config BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS
 	bool "ui-darkness"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+config BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS
 	bool "ui-lightness"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_VADER
+config BR2_PACKAGE_JQUERY_UI_THEMES_VADER
 	bool "vader"
 
 endchoice
 
 config BR2_PACKAGE_JQUERY_UI_THEMES_THEME
 	string
-	default "black-tie"		if BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
-	default "blitzer"		if BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
-	default "cupertino"		if BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
-	default "dark-hive"		if BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
-	default "dot-luv"		if BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
-	default "eggplant"		if BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
-	default "excite-bike"		if BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
-	default "flick"			if BR2_PACKAGE_JQUERY_UI_THEME_FLICK
-	default "hot-sneaks"		if BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
-	default "humanity"		if BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
-	default "le-frog"		if BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
-	default "mint-choc"		if BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
-	default "overcast"		if BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
-	default "pepper-grinder"	if BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
-	default "redmond"		if BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
-	default "smoothness"		if BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
-	default "south-street"		if BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
-	default "start"			if BR2_PACKAGE_JQUERY_UI_THEME_START
-	default "sunny"			if BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
-	default "swanky-purse"		if BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
-	default "trontastic"		if BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
-	default "ui-darkness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
-	default "ui-lightness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
-	default "vader"			if BR2_PACKAGE_JQUERY_UI_THEME_UI_VADER
+	default "black-tie"		if BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE
+	default "blitzer"		if BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER
+	default "cupertino"		if BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO
+	default "dark-hive"		if BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE
+	default "dot-luv"		if BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV
+	default "eggplant"		if BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT
+	default "excite-bike"		if BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE
+	default "flick"			if BR2_PACKAGE_JQUERY_UI_THEMES_FLICK
+	default "hot-sneaks"		if BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS
+	default "humanity"		if BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY
+	default "le-frog"		if BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG
+	default "mint-choc"		if BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC
+	default "overcast"		if BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST
+	default "pepper-grinder"	if BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER
+	default "redmond"		if BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND
+	default "smoothness"		if BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS
+	default "south-street"		if BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET
+	default "start"			if BR2_PACKAGE_JQUERY_UI_THEMES_START
+	default "sunny"			if BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY
+	default "swanky-purse"		if BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE
+	default "trontastic"		if BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC
+	default "ui-darkness"		if BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS
+	default "ui-lightness"		if BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS
+	default "vader"			if BR2_PACKAGE_JQUERY_UI_THEMES_UI_VADER
 
 endif
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 2/8] jquery-ui-themes: rename options to have proper prefix
  2018-05-13 19:07 ` [Buildroot] [PATCH 2/8] jquery-ui-themes: rename options to have proper prefix Thomas Petazzoni
@ 2018-05-13 19:19   ` Yann E. MORIN
  0 siblings, 0 replies; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-13 19:19 UTC (permalink / raw)
  To: buildroot

On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
> The choice options to select the specific jquery-ui theme to install
> had a prefix of BR2_PACKAGE_JQUERY_UI_THEME_ instead of
> BR2_PACKAGE_JQUERY_UI_THEMES_. This commit fixes that, and adds
> Config.in.legacy handling. It's worse mentioning that since those

s/worse/worth/

Otherwise:

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> options are part of a choice, the legacy handling cannot select the
> new name of the option: we can simply inform the user about the
> renaming.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  Config.in.legacy                   | 216 +++++++++++++++++++++++++++++++++++++
>  package/jquery-ui-themes/Config.in |  96 ++++++++---------
>  2 files changed, 264 insertions(+), 48 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 6d17f7de6d..4283888c72 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,222 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2018.05"
>  
> +config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
> +	bool "jquery-ui-themes option black-tie renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  black-tie theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
> +	bool "jquery-ui-themes option blitzer renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  blitzer theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_BLITZER to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
> +	bool "jquery-ui-themes option cupertino renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  cupertino theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
> +	bool "jquery-ui-themes option dark-hive renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  dark-hive theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
> +	bool "jquery-ui-themes option dot-luv renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  dot-luv theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
> +	bool "jquery-ui-themes option eggplant renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  eggplant theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
> +	bool "jquery-ui-themes option excite-bike renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  excite-bike theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
> +	bool "jquery-ui-themes option flick renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  flick theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_FLICK to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_FLICK.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
> +	bool "jquery-ui-themes option hot-sneaks renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  hot-sneaks theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
> +	bool "jquery-ui-themes option humanity renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  humanity theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
> +	bool "jquery-ui-themes option le-frog renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  le-frog theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
> +	bool "jquery-ui-themes option mint-choc renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  mint-choc theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
> +	bool "jquery-ui-themes option overcast renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  overcast theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
> +	bool "jquery-ui-themes option pepper-grinder renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  pepper-grinder theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
> +	bool "jquery-ui-themes option redmond renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  redmond theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_REDMOND to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
> +	bool "jquery-ui-themes option smoothness renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  smoothness theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
> +	bool "jquery-ui-themes option south-street renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  south-street theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_START
> +	bool "jquery-ui-themes option start renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  start theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_START to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_START.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
> +	bool "jquery-ui-themes option sunny renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  sunny theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_SUNNY to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
> +	bool "jquery-ui-themes option swanky-purse renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  swanky-purse theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
> +	bool "jquery-ui-themes option trontastic renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  trontastic theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
> +	bool "jquery-ui-themes option ui-darkness renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  ui-darkness theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
> +	bool "jquery-ui-themes option ui-lightness renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  ui-lightness theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS.
> +
> +config BR2_PACKAGE_JQUERY_UI_THEME_VADER
> +	bool "jquery-ui-themes option vader renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the jquery-ui-themes option for the
> +	  vader theme has been renamed from
> +	  BR2_PACKAGE_JQUERY_UI_THEME_VADER to
> +	  BR2_PACKAGE_JQUERY_UI_THEMES_VADER.
> +
>  config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
>  	bool "bluez5-utils health plugin option renamed"
>  	select BR2_LEGACY
> diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in
> index fde3014602..29359544ac 100644
> --- a/package/jquery-ui-themes/Config.in
> +++ b/package/jquery-ui-themes/Config.in
> @@ -13,105 +13,105 @@ choice
>  	help
>  	  Specify the jQuery UI theme to install.
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
> +config BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE
>  	bool "black-tie"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
> +config BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER
>  	bool "blitzer"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
> +config BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO
>  	bool "cupertino"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
> +config BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE
>  	bool "dark-hive"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
> +config BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV
>  	bool "dot-luv"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
> +config BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT
>  	bool "eggplant"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
> +config BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE
>  	bool "excite-bike"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
> +config BR2_PACKAGE_JQUERY_UI_THEMES_FLICK
>  	bool "flick"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
> +config BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS
>  	bool "hot-sneaks"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
> +config BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY
>  	bool "humanity"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
> +config BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG
>  	bool "le-frog"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
> +config BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC
>  	bool "mint-choc"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
> +config BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST
>  	bool "overcast"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
> +config BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER
>  	bool "pepper-grinder"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
> +config BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND
>  	bool "redmond"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
> +config BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS
>  	bool "smoothness"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
> +config BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET
>  	bool "south-street"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_START
> +config BR2_PACKAGE_JQUERY_UI_THEMES_START
>  	bool "start"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
> +config BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY
>  	bool "sunny"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
> +config BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE
>  	bool "swanky-purse"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
> +config BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC
>  	bool "trontastic"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
> +config BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS
>  	bool "ui-darkness"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
> +config BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS
>  	bool "ui-lightness"
>  
> -config BR2_PACKAGE_JQUERY_UI_THEME_VADER
> +config BR2_PACKAGE_JQUERY_UI_THEMES_VADER
>  	bool "vader"
>  
>  endchoice
>  
>  config BR2_PACKAGE_JQUERY_UI_THEMES_THEME
>  	string
> -	default "black-tie"		if BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
> -	default "blitzer"		if BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
> -	default "cupertino"		if BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
> -	default "dark-hive"		if BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
> -	default "dot-luv"		if BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
> -	default "eggplant"		if BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
> -	default "excite-bike"		if BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
> -	default "flick"			if BR2_PACKAGE_JQUERY_UI_THEME_FLICK
> -	default "hot-sneaks"		if BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
> -	default "humanity"		if BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
> -	default "le-frog"		if BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
> -	default "mint-choc"		if BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
> -	default "overcast"		if BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
> -	default "pepper-grinder"	if BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
> -	default "redmond"		if BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
> -	default "smoothness"		if BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
> -	default "south-street"		if BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
> -	default "start"			if BR2_PACKAGE_JQUERY_UI_THEME_START
> -	default "sunny"			if BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
> -	default "swanky-purse"		if BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
> -	default "trontastic"		if BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
> -	default "ui-darkness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
> -	default "ui-lightness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
> -	default "vader"			if BR2_PACKAGE_JQUERY_UI_THEME_UI_VADER
> +	default "black-tie"		if BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE
> +	default "blitzer"		if BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER
> +	default "cupertino"		if BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO
> +	default "dark-hive"		if BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE
> +	default "dot-luv"		if BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV
> +	default "eggplant"		if BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT
> +	default "excite-bike"		if BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE
> +	default "flick"			if BR2_PACKAGE_JQUERY_UI_THEMES_FLICK
> +	default "hot-sneaks"		if BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS
> +	default "humanity"		if BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY
> +	default "le-frog"		if BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG
> +	default "mint-choc"		if BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC
> +	default "overcast"		if BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST
> +	default "pepper-grinder"	if BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER
> +	default "redmond"		if BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND
> +	default "smoothness"		if BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS
> +	default "south-street"		if BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET
> +	default "start"			if BR2_PACKAGE_JQUERY_UI_THEMES_START
> +	default "sunny"			if BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY
> +	default "swanky-purse"		if BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE
> +	default "trontastic"		if BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC
> +	default "ui-darkness"		if BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS
> +	default "ui-lightness"		if BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS
> +	default "vader"			if BR2_PACKAGE_JQUERY_UI_THEMES_UI_VADER
>  
>  endif
> -- 
> 2.14.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 3/8] libftdi: rename option to have proper prefix
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
  2018-05-13 19:07 ` [Buildroot] [PATCH 1/8] bluez5_utils: rename options to have the proper suffix Thomas Petazzoni
  2018-05-13 19:07 ` [Buildroot] [PATCH 2/8] jquery-ui-themes: rename options to have proper prefix Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-13 19:19   ` Yann E. MORIN
  2018-05-13 19:07 ` [Buildroot] [PATCH 4/8] ipsec-tools: rename options " Thomas Petazzoni
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

The option name BR2_PACKAGE_LIBTFDI_CPP obviously had a typo: it
should have been named BR2_PACKAGE_LIBFTDI_CPP, and add the necessary
Config.in.legacy handling.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Config.in.legacy           | 9 +++++++++
 package/libftdi/Config.in  | 2 +-
 package/libftdi/libftdi.mk | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 4283888c72..72563031ce 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,15 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_LIBTFDI_CPP
+	bool "libftdi C++ bindings option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBFTDI_CPP
+	help
+	  The option BR2_PACKAGE_LIBTFDI_CPP was renamed to
+	  BR2_PACKAGE_LIBFTDI_CPP in order to fix a typo in the option
+	  name.
+
 config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
 	bool "jquery-ui-themes option black-tie renamed"
 	select BR2_LEGACY
diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in
index beb42d34c5..23dae1be1f 100644
--- a/package/libftdi/Config.in
+++ b/package/libftdi/Config.in
@@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBFTDI
 
 if BR2_PACKAGE_LIBFTDI
 
-config BR2_PACKAGE_LIBTFDI_CPP
+config BR2_PACKAGE_LIBFTDI_CPP
 	bool "C++ bindings"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index c1952ac68b..cdd77c2e68 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -15,7 +15,7 @@ LIBFTDI_AUTORECONF = YES
 LIBFTDI_CONF_OPTS = --without-examples
 
 # configure detect it automaticaly so we need to force it
-ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y)
+ifeq ($(BR2_PACKAGE_LIBFTDI_CPP),y)
 LIBFTDI_DEPENDENCIES += boost
 LIBFTDI_CONF_OPTS += --enable-libftdipp
 else
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 3/8] libftdi: rename option to have proper prefix
  2018-05-13 19:07 ` [Buildroot] [PATCH 3/8] libftdi: rename option " Thomas Petazzoni
@ 2018-05-13 19:19   ` Yann E. MORIN
  0 siblings, 0 replies; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-13 19:19 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
> The option name BR2_PACKAGE_LIBTFDI_CPP obviously had a typo: it
> should have been named BR2_PACKAGE_LIBFTDI_CPP, and add the necessary
> Config.in.legacy handling.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  Config.in.legacy           | 9 +++++++++
>  package/libftdi/Config.in  | 2 +-
>  package/libftdi/libftdi.mk | 2 +-
>  3 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 4283888c72..72563031ce 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,15 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2018.05"
>  
> +config BR2_PACKAGE_LIBTFDI_CPP
> +	bool "libftdi C++ bindings option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_LIBFTDI_CPP
> +	help
> +	  The option BR2_PACKAGE_LIBTFDI_CPP was renamed to
> +	  BR2_PACKAGE_LIBFTDI_CPP in order to fix a typo in the option
> +	  name.
> +
>  config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
>  	bool "jquery-ui-themes option black-tie renamed"
>  	select BR2_LEGACY
> diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in
> index beb42d34c5..23dae1be1f 100644
> --- a/package/libftdi/Config.in
> +++ b/package/libftdi/Config.in
> @@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBFTDI
>  
>  if BR2_PACKAGE_LIBFTDI
>  
> -config BR2_PACKAGE_LIBTFDI_CPP
> +config BR2_PACKAGE_LIBFTDI_CPP
>  	bool "C++ bindings"
>  	depends on BR2_INSTALL_LIBSTDCPP
>  	depends on BR2_USE_WCHAR
> diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
> index c1952ac68b..cdd77c2e68 100644
> --- a/package/libftdi/libftdi.mk
> +++ b/package/libftdi/libftdi.mk
> @@ -15,7 +15,7 @@ LIBFTDI_AUTORECONF = YES
>  LIBFTDI_CONF_OPTS = --without-examples
>  
>  # configure detect it automaticaly so we need to force it
> -ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y)
> +ifeq ($(BR2_PACKAGE_LIBFTDI_CPP),y)
>  LIBFTDI_DEPENDENCIES += boost
>  LIBFTDI_CONF_OPTS += --enable-libftdipp
>  else
> -- 
> 2.14.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 4/8] ipsec-tools: rename options to have proper prefix
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
                   ` (2 preceding siblings ...)
  2018-05-13 19:07 ` [Buildroot] [PATCH 3/8] libftdi: rename option " Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-13 19:21   ` Yann E. MORIN
  2018-05-13 19:07 ` [Buildroot] [PATCH 5/8] janus-gateway: " Thomas Petazzoni
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

A number of options in the ipsec-tools package had their Config.in
option prefixed by BR2_PACKAGE_IPSEC, while the prefix should be
BR2_PACKAGE_IPSEC_TOOLS. This commit fixes that, and adds the
necessary Config.in.legacy handling.

Since those options are part of a choice, the legacy handling cannot
select the new name of the options, so the legacy handling only
informs the user of the rename.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Config.in.legacy                   | 24 ++++++++++++++++++++++++
 package/ipsec-tools/Config.in      |  8 ++++----
 package/ipsec-tools/ipsec-tools.mk |  6 +++---
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 72563031ce..314e0578d8 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,30 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+	bool "ipsec-tools security context disable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_DISABLE was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE.
+
+config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
+	bool "ipsec-tools SELinux security context enable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_ENABLE was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE.
+
+config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
+	bool "ipsec-tools kernel security context enable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_KERNEL was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL.
+
 config BR2_PACKAGE_LIBTFDI_CPP
 	bool "libftdi C++ bindings option renamed"
 	select BR2_LEGACY
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 1635675a36..59154123e6 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -57,17 +57,17 @@ config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
 
 choice
 	prompt "Security context"
-	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+	default BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
 	help
 	  Selects whether or not to enable security context support.
 
-config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
 	bool "Disable security context support"
 
-config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE
 	bool "Enable SELinux security context support"
 
-config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL
 	bool "Enable kernel security context"
 
 endchoice
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index c0b180de55..ddae9a75f3 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -68,13 +68,13 @@ else
 IPSEC_TOOLS_CONF_OPTS += --disable-hybrid
 endif
 
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
 endif
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes
 endif
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel
 endif
 
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 4/8] ipsec-tools: rename options to have proper prefix
  2018-05-13 19:07 ` [Buildroot] [PATCH 4/8] ipsec-tools: rename options " Thomas Petazzoni
@ 2018-05-13 19:21   ` Yann E. MORIN
  0 siblings, 0 replies; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-13 19:21 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
> A number of options in the ipsec-tools package had their Config.in
> option prefixed by BR2_PACKAGE_IPSEC, while the prefix should be
> BR2_PACKAGE_IPSEC_TOOLS. This commit fixes that, and adds the
> necessary Config.in.legacy handling.
> 
> Since those options are part of a choice, the legacy handling cannot
> select the new name of the options, so the legacy handling only
> informs the user of the rename.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  Config.in.legacy                   | 24 ++++++++++++++++++++++++
>  package/ipsec-tools/Config.in      |  8 ++++----
>  package/ipsec-tools/ipsec-tools.mk |  6 +++---
>  3 files changed, 31 insertions(+), 7 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 72563031ce..314e0578d8 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,30 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2018.05"
>  
> +config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
> +	bool "ipsec-tools security context disable option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_IPSEC_SECCTX_DISABLE was renamed to
> +	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE.
> +
> +config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
> +	bool "ipsec-tools SELinux security context enable option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_IPSEC_SECCTX_ENABLE was renamed to
> +	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE.
> +
> +config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
> +	bool "ipsec-tools kernel security context enable option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_IPSEC_SECCTX_KERNEL was renamed to
> +	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL.
> +
>  config BR2_PACKAGE_LIBTFDI_CPP
>  	bool "libftdi C++ bindings option renamed"
>  	select BR2_LEGACY
> diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
> index 1635675a36..59154123e6 100644
> --- a/package/ipsec-tools/Config.in
> +++ b/package/ipsec-tools/Config.in
> @@ -57,17 +57,17 @@ config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
>  
>  choice
>  	prompt "Security context"
> -	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
> +	default BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
>  	help
>  	  Selects whether or not to enable security context support.
>  
> -config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
> +config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
>  	bool "Disable security context support"
>  
> -config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
> +config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE
>  	bool "Enable SELinux security context support"
>  
> -config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
> +config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL
>  	bool "Enable kernel security context"
>  
>  endchoice
> diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
> index c0b180de55..ddae9a75f3 100644
> --- a/package/ipsec-tools/ipsec-tools.mk
> +++ b/package/ipsec-tools/ipsec-tools.mk
> @@ -68,13 +68,13 @@ else
>  IPSEC_TOOLS_CONF_OPTS += --disable-hybrid
>  endif
>  
> -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
> +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE),y)
>  IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
>  endif
> -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
> +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE),y)
>  IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes
>  endif
> -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
> +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL),y)
>  IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel
>  endif
>  
> -- 
> 2.14.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 5/8] janus-gateway: rename options to have proper prefix
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
                   ` (3 preceding siblings ...)
  2018-05-13 19:07 ` [Buildroot] [PATCH 4/8] ipsec-tools: rename options " Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-13 19:22   ` Yann E. MORIN
  2018-05-14  4:00   ` Ricardo Martincoski
  2018-05-13 19:07 ` [Buildroot] [PATCH 6/8] ti-sgx-km: " Thomas Petazzoni
                   ` (3 subsequent siblings)
  8 siblings, 2 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

The sub-options of the janus-gateway package had their name option
prefixed by BR2_PACKAGE_JANUS, while the prefix should be
BR2_PACKAGE_JANUS_GATEWAY. This commit fixes that, and adds the
necessary Config.in.legacy handling.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Config.in.legacy                       | 117 +++++++++++++++++++++++++++++++++
 package/janus-gateway/Config.in        |  28 ++++----
 package/janus-gateway/janus-gateway.mk |  28 ++++----
 3 files changed, 145 insertions(+), 28 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 314e0578d8..981306f469 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,123 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
+	bool "janus-gateway audio-bridge option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_AUDIO_BRIDGE has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE.
+
+config BR2_PACKAGE_JANUS_ECHO_TEST
+	bool "janus-gateway echo-test option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_ECHO_TEST has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST.
+
+config BR2_PACKAGE_JANUS_RECORDPLAY
+	bool "janus-gateway recordplay option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_RECORDPLAY has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY.
+
+config BR2_PACKAGE_JANUS_SIP_GATEWAY
+	bool "janus-gateway sip-gateway option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_SIP_GATEWAY has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY.
+
+config BR2_PACKAGE_JANUS_STREAMING
+	bool "janus-gateway streaming option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_STREAMING
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_STREAMING has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_STREAMING.
+
+config BR2_PACKAGE_JANUS_TEXT_ROOM
+	bool "janus-gateway text-room option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_TEXT_ROOM has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM.
+
+config BR2_PACKAGE_JANUS_VIDEO_CALL
+	bool "janus-gateway video-call option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_VIDEO_CALL has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL.
+
+config BR2_PACKAGE_JANUS_VIDEO_ROOM
+	bool "janus-gateway video-room option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_VIDEO_ROOM has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM.
+
+config BR2_PACKAGE_JANUS_MQTT
+	bool "janus-gateway mqtt option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_MQTT
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_MQTT has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_MQTT.
+
+config BR2_PACKAGE_JANUS_RABBITMQ
+	bool "janus-gateway rabbitmq option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_RABBITMQ has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ.
+
+config BR2_PACKAGE_JANUS_REST
+	bool "janus-gateway rest option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_REST
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_REST has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_REST.
+
+config BR2_PACKAGE_JANUS_UNIX_SOCKETS
+	bool "janus-gateway unix-sockets option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_UNIX_SOCKETS has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS.
+
+config BR2_PACKAGE_JANUS_WEBSOCKETS
+	bool "janus-gateway websockets option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_WEBSOCKETS has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS.
+
 config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
 	bool "ipsec-tools security context disable option renamed"
 	select BR2_LEGACY
diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index 5bd4e9586b..071183dc5f 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -19,21 +19,21 @@ if BR2_PACKAGE_JANUS_GATEWAY
 
 comment "plugins"
 
-config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
+config BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE
 	bool "audio bridge"
 	select BR2_PACKAGE_OPUS
 
-config BR2_PACKAGE_JANUS_ECHO_TEST
+config BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST
 	bool "echo test"
 
-config BR2_PACKAGE_JANUS_RECORDPLAY
+config BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY
 	bool "record and play"
 
-config BR2_PACKAGE_JANUS_SIP_GATEWAY
+config BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY
 	bool "sip gateway"
 	select BR2_PACKAGE_SOFIA_SIP
 
-config  BR2_PACKAGE_JANUS_STREAMING
+config  BR2_PACKAGE_JANUS_GATEWAY_STREAMING
 	bool "streaming"
 	# SO_REUSEPORT
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
@@ -41,22 +41,22 @@ config  BR2_PACKAGE_JANUS_STREAMING
 comment "streaming plugin needs a toolchain w/ headers >= 3.9"
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
 
-config BR2_PACKAGE_JANUS_TEXT_ROOM
+config BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM
 	bool "text room"
 
-config BR2_PACKAGE_JANUS_VIDEO_CALL
+config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL
 	bool "video call"
 
-config BR2_PACKAGE_JANUS_VIDEO_ROOM
+config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM
 	bool "video room"
 
-config BR2_PACKAGE_JANUS_VOICE_MAIL
+config BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL
 	bool "voice mail"
 	select BR2_PACKAGE_LIBOGG
 
 comment "transports"
 
-config BR2_PACKAGE_JANUS_MQTT
+config BR2_PACKAGE_JANUS_GATEWAY_MQTT
 	bool "MQTT"
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -65,7 +65,7 @@ config BR2_PACKAGE_JANUS_MQTT
 comment "MQTT transport needs a toolchain w/ threads and dynamic library support"
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_JANUS_RABBITMQ
+config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
 	bool "RabbitMQ"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_RABBITMQ_C
@@ -73,7 +73,7 @@ config BR2_PACKAGE_JANUS_RABBITMQ
 comment "RabbitMQ transport needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_JANUS_REST
+config BR2_PACKAGE_JANUS_GATEWAY_REST
 	bool "REST (HTTP/HTTPS)"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBMICROHTTPD
@@ -81,11 +81,11 @@ config BR2_PACKAGE_JANUS_REST
 comment "REST transport needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_JANUS_UNIX_SOCKETS
+config BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS
 	bool "Unix Sockets"
 	default y
 
-config BR2_PACKAGE_JANUS_WEBSOCKETS
+config BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS
 	bool "WebSockets"
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBWEBSOCKETS
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index c37cda0860..261fc25202 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -26,91 +26,91 @@ JANUS_GATEWAY_CONF_OPTS = \
 	--disable-data-channels \
 	--disable-sample-event-handler
 
-ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE),y)
 JANUS_GATEWAY_DEPENDENCIES += opus
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_ECHO_TEST),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-echotest
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-echotest
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_RECORDPLAY),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-recordplay
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-recordplay
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY),y)
 JANUS_GATEWAY_DEPENDENCIES += sofia-sip
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-sip
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_STREAMING),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_STREAMING),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-streaming
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-streaming
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_TEXT_ROOM),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-textroom
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-textroom
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_VIDEO_CALL),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videocall
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videocall
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_VIDEO_ROOM),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videoroom
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_VOICE_MAIL),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL),y)
 JANUS_GATEWAY_DEPENDENCIES += libogg
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_MQTT),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_MQTT),y)
 JANUS_GATEWAY_DEPENDENCIES += paho-mqtt-c
 JANUS_GATEWAY_CONF_OPTS += --enable-mqtt
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_RABBITMQ),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ),y)
 JANUS_GATEWAY_DEPENDENCIES += rabbitmq-c
 JANUS_GATEWAY_CONF_OPTS += --enable-rabbitmq
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_REST),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_REST),y)
 JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd
 JANUS_GATEWAY_CONF_OPTS += --enable-rest
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-rest
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_UNIX_SOCKETS),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-unix-sockets
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-unix-sockets
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS),y)
 JANUS_GATEWAY_DEPENDENCIES += libwebsockets
 JANUS_GATEWAY_CONF_OPTS += --enable-websockets
 else
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 5/8] janus-gateway: rename options to have proper prefix
  2018-05-13 19:07 ` [Buildroot] [PATCH 5/8] janus-gateway: " Thomas Petazzoni
@ 2018-05-13 19:22   ` Yann E. MORIN
  2018-05-14  4:00   ` Ricardo Martincoski
  1 sibling, 0 replies; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-13 19:22 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
> The sub-options of the janus-gateway package had their name option
> prefixed by BR2_PACKAGE_JANUS, while the prefix should be
> BR2_PACKAGE_JANUS_GATEWAY. This commit fixes that, and adds the
> necessary Config.in.legacy handling.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  Config.in.legacy                       | 117 +++++++++++++++++++++++++++++++++
>  package/janus-gateway/Config.in        |  28 ++++----
>  package/janus-gateway/janus-gateway.mk |  28 ++++----
>  3 files changed, 145 insertions(+), 28 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 314e0578d8..981306f469 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,123 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2018.05"
>  
> +config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
> +	bool "janus-gateway audio-bridge option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_AUDIO_BRIDGE has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE.
> +
> +config BR2_PACKAGE_JANUS_ECHO_TEST
> +	bool "janus-gateway echo-test option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_ECHO_TEST has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST.
> +
> +config BR2_PACKAGE_JANUS_RECORDPLAY
> +	bool "janus-gateway recordplay option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_RECORDPLAY has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY.
> +
> +config BR2_PACKAGE_JANUS_SIP_GATEWAY
> +	bool "janus-gateway sip-gateway option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_SIP_GATEWAY has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY.
> +
> +config BR2_PACKAGE_JANUS_STREAMING
> +	bool "janus-gateway streaming option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_STREAMING
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_STREAMING has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_STREAMING.
> +
> +config BR2_PACKAGE_JANUS_TEXT_ROOM
> +	bool "janus-gateway text-room option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_TEXT_ROOM has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM.
> +
> +config BR2_PACKAGE_JANUS_VIDEO_CALL
> +	bool "janus-gateway video-call option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_VIDEO_CALL has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL.
> +
> +config BR2_PACKAGE_JANUS_VIDEO_ROOM
> +	bool "janus-gateway video-room option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_VIDEO_ROOM has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM.
> +
> +config BR2_PACKAGE_JANUS_MQTT
> +	bool "janus-gateway mqtt option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_MQTT
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_MQTT has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_MQTT.
> +
> +config BR2_PACKAGE_JANUS_RABBITMQ
> +	bool "janus-gateway rabbitmq option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_RABBITMQ has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ.
> +
> +config BR2_PACKAGE_JANUS_REST
> +	bool "janus-gateway rest option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_REST
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_REST has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_REST.
> +
> +config BR2_PACKAGE_JANUS_UNIX_SOCKETS
> +	bool "janus-gateway unix-sockets option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_UNIX_SOCKETS has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS.
> +
> +config BR2_PACKAGE_JANUS_WEBSOCKETS
> +	bool "janus-gateway websockets option renamed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS
> +	help
> +	  For consistency reasons, the janus-gateway option
> +	  BR2_PACKAGE_JANUS_WEBSOCKETS has been renamed to
> +	  BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS.
> +
>  config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
>  	bool "ipsec-tools security context disable option renamed"
>  	select BR2_LEGACY
> diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
> index 5bd4e9586b..071183dc5f 100644
> --- a/package/janus-gateway/Config.in
> +++ b/package/janus-gateway/Config.in
> @@ -19,21 +19,21 @@ if BR2_PACKAGE_JANUS_GATEWAY
>  
>  comment "plugins"
>  
> -config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
> +config BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE
>  	bool "audio bridge"
>  	select BR2_PACKAGE_OPUS
>  
> -config BR2_PACKAGE_JANUS_ECHO_TEST
> +config BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST
>  	bool "echo test"
>  
> -config BR2_PACKAGE_JANUS_RECORDPLAY
> +config BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY
>  	bool "record and play"
>  
> -config BR2_PACKAGE_JANUS_SIP_GATEWAY
> +config BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY
>  	bool "sip gateway"
>  	select BR2_PACKAGE_SOFIA_SIP
>  
> -config  BR2_PACKAGE_JANUS_STREAMING
> +config  BR2_PACKAGE_JANUS_GATEWAY_STREAMING
>  	bool "streaming"
>  	# SO_REUSEPORT
>  	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
> @@ -41,22 +41,22 @@ config  BR2_PACKAGE_JANUS_STREAMING
>  comment "streaming plugin needs a toolchain w/ headers >= 3.9"
>  	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
>  
> -config BR2_PACKAGE_JANUS_TEXT_ROOM
> +config BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM
>  	bool "text room"
>  
> -config BR2_PACKAGE_JANUS_VIDEO_CALL
> +config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL
>  	bool "video call"
>  
> -config BR2_PACKAGE_JANUS_VIDEO_ROOM
> +config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM
>  	bool "video room"
>  
> -config BR2_PACKAGE_JANUS_VOICE_MAIL
> +config BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL
>  	bool "voice mail"
>  	select BR2_PACKAGE_LIBOGG
>  
>  comment "transports"
>  
> -config BR2_PACKAGE_JANUS_MQTT
> +config BR2_PACKAGE_JANUS_GATEWAY_MQTT
>  	bool "MQTT"
>  	depends on !BR2_STATIC_LIBS
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
> @@ -65,7 +65,7 @@ config BR2_PACKAGE_JANUS_MQTT
>  comment "MQTT transport needs a toolchain w/ threads and dynamic library support"
>  	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
>  
> -config BR2_PACKAGE_JANUS_RABBITMQ
> +config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
>  	bool "RabbitMQ"
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	select BR2_PACKAGE_RABBITMQ_C
> @@ -73,7 +73,7 @@ config BR2_PACKAGE_JANUS_RABBITMQ
>  comment "RabbitMQ transport needs a toolchain w/ threads"
>  	depends on !BR2_TOOLCHAIN_HAS_THREADS
>  
> -config BR2_PACKAGE_JANUS_REST
> +config BR2_PACKAGE_JANUS_GATEWAY_REST
>  	bool "REST (HTTP/HTTPS)"
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	select BR2_PACKAGE_LIBMICROHTTPD
> @@ -81,11 +81,11 @@ config BR2_PACKAGE_JANUS_REST
>  comment "REST transport needs a toolchain w/ threads"
>  	depends on !BR2_TOOLCHAIN_HAS_THREADS
>  
> -config BR2_PACKAGE_JANUS_UNIX_SOCKETS
> +config BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS
>  	bool "Unix Sockets"
>  	default y
>  
> -config BR2_PACKAGE_JANUS_WEBSOCKETS
> +config BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS
>  	bool "WebSockets"
>  	depends on BR2_USE_MMU
>  	select BR2_PACKAGE_LIBWEBSOCKETS
> diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
> index c37cda0860..261fc25202 100644
> --- a/package/janus-gateway/janus-gateway.mk
> +++ b/package/janus-gateway/janus-gateway.mk
> @@ -26,91 +26,91 @@ JANUS_GATEWAY_CONF_OPTS = \
>  	--disable-data-channels \
>  	--disable-sample-event-handler
>  
> -ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE),y)
>  JANUS_GATEWAY_DEPENDENCIES += opus
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_ECHO_TEST),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST),y)
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-echotest
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-echotest
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_RECORDPLAY),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY),y)
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-recordplay
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-recordplay
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY),y)
>  JANUS_GATEWAY_DEPENDENCIES += sofia-sip
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-sip
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_STREAMING),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_STREAMING),y)
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-streaming
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-streaming
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_TEXT_ROOM),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM),y)
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-textroom
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-textroom
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_VIDEO_CALL),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL),y)
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videocall
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videocall
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_VIDEO_ROOM),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM),y)
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videoroom
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_VOICE_MAIL),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL),y)
>  JANUS_GATEWAY_DEPENDENCIES += libogg
>  JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_MQTT),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_MQTT),y)
>  JANUS_GATEWAY_DEPENDENCIES += paho-mqtt-c
>  JANUS_GATEWAY_CONF_OPTS += --enable-mqtt
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_RABBITMQ),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ),y)
>  JANUS_GATEWAY_DEPENDENCIES += rabbitmq-c
>  JANUS_GATEWAY_CONF_OPTS += --enable-rabbitmq
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_REST),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_REST),y)
>  JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd
>  JANUS_GATEWAY_CONF_OPTS += --enable-rest
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-rest
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_UNIX_SOCKETS),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS),y)
>  JANUS_GATEWAY_CONF_OPTS += --enable-unix-sockets
>  else
>  JANUS_GATEWAY_CONF_OPTS += --disable-unix-sockets
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y)
> +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS),y)
>  JANUS_GATEWAY_DEPENDENCIES += libwebsockets
>  JANUS_GATEWAY_CONF_OPTS += --enable-websockets
>  else
> -- 
> 2.14.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 5/8] janus-gateway: rename options to have proper prefix
  2018-05-13 19:07 ` [Buildroot] [PATCH 5/8] janus-gateway: " Thomas Petazzoni
  2018-05-13 19:22   ` Yann E. MORIN
@ 2018-05-14  4:00   ` Ricardo Martincoski
  1 sibling, 0 replies; 27+ messages in thread
From: Ricardo Martincoski @ 2018-05-14  4:00 UTC (permalink / raw)
  To: buildroot

Hello,

On Sun, May 13, 2018 at 04:07 PM, Thomas Petazzoni wrote:

> -config  BR2_PACKAGE_JANUS_STREAMING
> +config  BR2_PACKAGE_JANUS_GATEWAY_STREAMING

Could we remove the extra space after 'config' in the same patch?
It can be done while applying.

I checked and this is the only occurrence in the tree.
$ grep 'config  ' $(find * -name 'Config.*')

Regards,
Ricardo

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
                   ` (4 preceding siblings ...)
  2018-05-13 19:07 ` [Buildroot] [PATCH 5/8] janus-gateway: " Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-13 19:31   ` Yann E. MORIN
  2018-05-13 19:07 ` [Buildroot] [PATCH 7/8] libmediaart: " Thomas Petazzoni
                   ` (2 subsequent siblings)
  8 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

The sub-options of the ti-sgx-km package had their name option
prefixed by BR2_PACKAGE_TI_SGX, while the prefix should be
BR2_PACKAGE_TI_SGX_KM. This commit fixes that, and adds the necessary
Config.in.legacy handling.

Since those options are part of a choice, the legacy handling cannot
select the new name of the options, so the legacy handling only
informs the user of the rename.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Config.in.legacy               | 32 ++++++++++++++++++++++++++++++++
 package/ti-sgx-km/Config.in    | 10 +++++-----
 package/ti-sgx-km/ti-sgx-km.mk |  8 ++++----
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 981306f469..5cf25463ad 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,38 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_TI_SGX_AM335X
+	bool "ti-sgx-km AM335X option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM335X has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM335X.
+
+config BR2_PACKAGE_TI_SGX_AM437X
+	bool "ti-sgx-km AM437X option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM437X has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM437X.
+
+config BR2_PACKAGE_TI_SGX_AM4430
+	bool "ti-sgx-km AM4430 option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM4430 has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM4430.
+
+config BR2_PACKAGE_TI_SGX_AM5430
+	bool "ti-sgx-km AM5430 option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM5430 has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM5430.
+
 config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
 	bool "janus-gateway audio-bridge option renamed"
 	select BR2_LEGACY
diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in
index a4c9bb8ca2..db3d3f9ddd 100644
--- a/package/ti-sgx-km/Config.in
+++ b/package/ti-sgx-km/Config.in
@@ -20,26 +20,26 @@ if BR2_PACKAGE_TI_SGX_KM
 
 choice
 	prompt "Target"
-	default BR2_PACKAGE_TI_SGX_AM335X
+	default BR2_PACKAGE_TI_SGX_KM_AM335X
 	help
 	  Select the SOC for which you would like to install drivers.
 
-config BR2_PACKAGE_TI_SGX_AM335X
+config BR2_PACKAGE_TI_SGX_KM_AM335X
 	bool "AM335x"
 	help
 	  AM335x CPU
 
-config BR2_PACKAGE_TI_SGX_AM437X
+config BR2_PACKAGE_TI_SGX_KM_AM437X
 	bool "AM437x"
 	help
 	  AM437x CPU
 
-config BR2_PACKAGE_TI_SGX_AM4430
+config BR2_PACKAGE_TI_SGX_KM_AM4430
 	bool "AM4430"
 	help
 	  AM4430 CPU
 
-config BR2_PACKAGE_TI_SGX_AM5430
+config BR2_PACKAGE_TI_SGX_KM_AM5430
 	bool "AM5430"
 	help
 	  AM5430 CPU
diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk
index db74da9b4a..0e1bc33902 100644
--- a/package/ti-sgx-km/ti-sgx-km.mk
+++ b/package/ti-sgx-km/ti-sgx-km.mk
@@ -17,13 +17,13 @@ TI_SGX_KM_MAKE_OPTS = \
 	KERNELDIR=$(LINUX_DIR) \
 	PVR_NULLDRM=1
 
-ifeq ($(BR2_PACKAGE_TI_SGX_AM335X),y)
+ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y)
 TI_SGX_KM_PLATFORM_NAME = omap335x
-else ifeq ($(BR2_PACKAGE_TI_SGX_AM437X),y)
+else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM437X),y)
 TI_SGX_KM_PLATFORM_NAME = omap437x
-else ifeq ($(BR2_PACKAGE_TI_SGX_AM4430),y)
+else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM4430),y)
 TI_SGX_KM_PLATFORM_NAME = omap4430
-else ifeq ($(BR2_PACKAGE_TI_SGX_5430),y)
+else ifeq ($(BR2_PACKAGE_TI_SGX_KM_5430),y)
 TI_SGX_KM_PLATFORM_NAME = omap5430
 endif
 
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-13 19:07 ` [Buildroot] [PATCH 6/8] ti-sgx-km: " Thomas Petazzoni
@ 2018-05-13 19:31   ` Yann E. MORIN
  2018-05-15 21:52     ` Arnout Vandecappelle
  0 siblings, 1 reply; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-13 19:31 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
> The sub-options of the ti-sgx-km package had their name option
> prefixed by BR2_PACKAGE_TI_SGX, while the prefix should be
> BR2_PACKAGE_TI_SGX_KM. This commit fixes that, and adds the necessary
> Config.in.legacy handling.
> 
> Since those options are part of a choice, the legacy handling cannot
> select the new name of the options, so the legacy handling only
> informs the user of the rename.

As I was explaining on IRC, we /could/ have legacy handling for choices.
This would be done in three parts;

  - the new options replace the old ones in the choice, as we currently
    do (and as is done in this patch);

  - this choice is given a "name" (see below), so we can redefine it
    elsewhere;

  - in the legacy menu, we duplicate the choice with the same "name"
    and the same options, but with a set of "default-if" options.


For example:

    # In bar/Config.in:
    choice BAR
        bool "bar choice"
    config BAR_1
        bool "bar 1"
    config BAR_2
        bool "bar 2"
    endchoice

    # In Config.in.legacy:
    choice BAR
        bool "bar choice"
        default BAR_1 if FOO_1
        default BAR_2 if FOO_2
    config BAR_1
        bool "bar 1"
    config BAR_2
        bool "bar 2"
    endchoice

    config FOO_1
        bool "foo 1 was renamed"
    config FOO_2
        bool "foo 2 was renamed"

(not tested, but it should work).

What is nice with this solution, is that we have the new choice that is
right near the legacy option so we can chek it, and it automatically
gets the old setting.

But I am not too convinced, however, because we do not usually use the
name of a choice elsewhere...

> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  Config.in.legacy               | 32 ++++++++++++++++++++++++++++++++
>  package/ti-sgx-km/Config.in    | 10 +++++-----
>  package/ti-sgx-km/ti-sgx-km.mk |  8 ++++----
>  3 files changed, 41 insertions(+), 9 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 981306f469..5cf25463ad 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,38 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2018.05"
>  
> +config BR2_PACKAGE_TI_SGX_AM335X
> +	bool "ti-sgx-km AM335X option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_TI_SGX_AM335X has been renamed to
> +	  BR2_PACKAGE_TI_SGX_KM_AM335X.
> +
> +config BR2_PACKAGE_TI_SGX_AM437X
> +	bool "ti-sgx-km AM437X option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_TI_SGX_AM437X has been renamed to
> +	  BR2_PACKAGE_TI_SGX_KM_AM437X.
> +
> +config BR2_PACKAGE_TI_SGX_AM4430
> +	bool "ti-sgx-km AM4430 option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_TI_SGX_AM4430 has been renamed to
> +	  BR2_PACKAGE_TI_SGX_KM_AM4430.
> +
> +config BR2_PACKAGE_TI_SGX_AM5430
> +	bool "ti-sgx-km AM5430 option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_TI_SGX_AM5430 has been renamed to
> +	  BR2_PACKAGE_TI_SGX_KM_AM5430.
> +
>  config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
>  	bool "janus-gateway audio-bridge option renamed"
>  	select BR2_LEGACY
> diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in
> index a4c9bb8ca2..db3d3f9ddd 100644
> --- a/package/ti-sgx-km/Config.in
> +++ b/package/ti-sgx-km/Config.in
> @@ -20,26 +20,26 @@ if BR2_PACKAGE_TI_SGX_KM
>  
>  choice
>  	prompt "Target"
> -	default BR2_PACKAGE_TI_SGX_AM335X
> +	default BR2_PACKAGE_TI_SGX_KM_AM335X
>  	help
>  	  Select the SOC for which you would like to install drivers.
>  
> -config BR2_PACKAGE_TI_SGX_AM335X
> +config BR2_PACKAGE_TI_SGX_KM_AM335X
>  	bool "AM335x"
>  	help
>  	  AM335x CPU
>  
> -config BR2_PACKAGE_TI_SGX_AM437X
> +config BR2_PACKAGE_TI_SGX_KM_AM437X
>  	bool "AM437x"
>  	help
>  	  AM437x CPU
>  
> -config BR2_PACKAGE_TI_SGX_AM4430
> +config BR2_PACKAGE_TI_SGX_KM_AM4430
>  	bool "AM4430"
>  	help
>  	  AM4430 CPU
>  
> -config BR2_PACKAGE_TI_SGX_AM5430
> +config BR2_PACKAGE_TI_SGX_KM_AM5430
>  	bool "AM5430"
>  	help
>  	  AM5430 CPU
> diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk
> index db74da9b4a..0e1bc33902 100644
> --- a/package/ti-sgx-km/ti-sgx-km.mk
> +++ b/package/ti-sgx-km/ti-sgx-km.mk
> @@ -17,13 +17,13 @@ TI_SGX_KM_MAKE_OPTS = \
>  	KERNELDIR=$(LINUX_DIR) \
>  	PVR_NULLDRM=1
>  
> -ifeq ($(BR2_PACKAGE_TI_SGX_AM335X),y)
> +ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y)
>  TI_SGX_KM_PLATFORM_NAME = omap335x
> -else ifeq ($(BR2_PACKAGE_TI_SGX_AM437X),y)
> +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM437X),y)
>  TI_SGX_KM_PLATFORM_NAME = omap437x
> -else ifeq ($(BR2_PACKAGE_TI_SGX_AM4430),y)
> +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM4430),y)
>  TI_SGX_KM_PLATFORM_NAME = omap4430
> -else ifeq ($(BR2_PACKAGE_TI_SGX_5430),y)
> +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_5430),y)
>  TI_SGX_KM_PLATFORM_NAME = omap5430
>  endif
>  
> -- 
> 2.14.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-13 19:31   ` Yann E. MORIN
@ 2018-05-15 21:52     ` Arnout Vandecappelle
  2018-05-16  7:00       ` Thomas Petazzoni
  0 siblings, 1 reply; 27+ messages in thread
From: Arnout Vandecappelle @ 2018-05-15 21:52 UTC (permalink / raw)
  To: buildroot



On 13-05-18 21:31, Yann E. MORIN wrote:
> Thomas, All,
> 
> On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
>> The sub-options of the ti-sgx-km package had their name option
>> prefixed by BR2_PACKAGE_TI_SGX, while the prefix should be
>> BR2_PACKAGE_TI_SGX_KM. This commit fixes that, and adds the necessary
>> Config.in.legacy handling.
>>
>> Since those options are part of a choice, the legacy handling cannot
>> select the new name of the options, so the legacy handling only
>> informs the user of the rename.
> 
> As I was explaining on IRC, we /could/ have legacy handling for choices.
> This would be done in three parts;
> 
>   - the new options replace the old ones in the choice, as we currently
>     do (and as is done in this patch);
> 
>   - this choice is given a "name" (see below), so we can redefine it
>     elsewhere;
> 
>   - in the legacy menu, we duplicate the choice with the same "name"
>     and the same options, but with a set of "default-if" options.
> 
> 
> For example:
> 
>     # In bar/Config.in:
>     choice BAR
>         bool "bar choice"
>     config BAR_1
>         bool "bar 1"
>     config BAR_2
>         bool "bar 2"
>     endchoice
> 
>     # In Config.in.legacy:
>     choice BAR
>         bool "bar choice"
>         default BAR_1 if FOO_1
>         default BAR_2 if FOO_2
>     config BAR_1
>         bool "bar 1"
>     config BAR_2
>         bool "bar 2"
>     endchoice
> 
>     config FOO_1
>         bool "foo 1 was renamed"
>     config FOO_2
>         bool "foo 2 was renamed"
> 
> (not tested, but it should work).

 I tested, it works, but it needlessly repeats the user-visible choice in the
legacy menu. This is simpler and works as well:

# In bar/Config.in:
choice BAR
	bool "bar choice"
config BAR_1
	bool "bar 1"
config BAR_2
	bool "bar 2"
endchoice

# In Config.in.legacy:
choice BAR
	default BAR_1 if FOO_1
	default BAR_2 if FOO_2
endchoice

config FOO_1
	bool "foo 1 was renamed"
config FOO_2
	bool "foo 2 was renamed"


> What is nice with this solution, is that we have the new choice that is
> right near the legacy option so we can chek it, and it automatically
> gets the old setting.
> 
> But I am not too convinced, however, because we do not usually use the
> name of a choice elsewhere...

 Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.

 Regards,
 Arnout

> 
>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> 
> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> Regards,
> Yann E. MORIN.
> 
>> ---
>>  Config.in.legacy               | 32 ++++++++++++++++++++++++++++++++
>>  package/ti-sgx-km/Config.in    | 10 +++++-----
>>  package/ti-sgx-km/ti-sgx-km.mk |  8 ++++----
>>  3 files changed, 41 insertions(+), 9 deletions(-)
>>
>> diff --git a/Config.in.legacy b/Config.in.legacy
>> index 981306f469..5cf25463ad 100644
>> --- a/Config.in.legacy
>> +++ b/Config.in.legacy
>> @@ -145,6 +145,38 @@ endif
>>  ###############################################################################
>>  comment "Legacy options removed in 2018.05"
>>  
>> +config BR2_PACKAGE_TI_SGX_AM335X
>> +	bool "ti-sgx-km AM335X option renamed"
>> +	select BR2_LEGACY
>> +	help
>> +	  For consistency reasons, the option
>> +	  BR2_PACKAGE_TI_SGX_AM335X has been renamed to
>> +	  BR2_PACKAGE_TI_SGX_KM_AM335X.
>> +
>> +config BR2_PACKAGE_TI_SGX_AM437X
>> +	bool "ti-sgx-km AM437X option renamed"
>> +	select BR2_LEGACY
>> +	help
>> +	  For consistency reasons, the option
>> +	  BR2_PACKAGE_TI_SGX_AM437X has been renamed to
>> +	  BR2_PACKAGE_TI_SGX_KM_AM437X.
>> +
>> +config BR2_PACKAGE_TI_SGX_AM4430
>> +	bool "ti-sgx-km AM4430 option renamed"
>> +	select BR2_LEGACY
>> +	help
>> +	  For consistency reasons, the option
>> +	  BR2_PACKAGE_TI_SGX_AM4430 has been renamed to
>> +	  BR2_PACKAGE_TI_SGX_KM_AM4430.
>> +
>> +config BR2_PACKAGE_TI_SGX_AM5430
>> +	bool "ti-sgx-km AM5430 option renamed"
>> +	select BR2_LEGACY
>> +	help
>> +	  For consistency reasons, the option
>> +	  BR2_PACKAGE_TI_SGX_AM5430 has been renamed to
>> +	  BR2_PACKAGE_TI_SGX_KM_AM5430.
>> +
>>  config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
>>  	bool "janus-gateway audio-bridge option renamed"
>>  	select BR2_LEGACY
>> diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in
>> index a4c9bb8ca2..db3d3f9ddd 100644
>> --- a/package/ti-sgx-km/Config.in
>> +++ b/package/ti-sgx-km/Config.in
>> @@ -20,26 +20,26 @@ if BR2_PACKAGE_TI_SGX_KM
>>  
>>  choice
>>  	prompt "Target"
>> -	default BR2_PACKAGE_TI_SGX_AM335X
>> +	default BR2_PACKAGE_TI_SGX_KM_AM335X
>>  	help
>>  	  Select the SOC for which you would like to install drivers.
>>  
>> -config BR2_PACKAGE_TI_SGX_AM335X
>> +config BR2_PACKAGE_TI_SGX_KM_AM335X
>>  	bool "AM335x"
>>  	help
>>  	  AM335x CPU
>>  
>> -config BR2_PACKAGE_TI_SGX_AM437X
>> +config BR2_PACKAGE_TI_SGX_KM_AM437X
>>  	bool "AM437x"
>>  	help
>>  	  AM437x CPU
>>  
>> -config BR2_PACKAGE_TI_SGX_AM4430
>> +config BR2_PACKAGE_TI_SGX_KM_AM4430
>>  	bool "AM4430"
>>  	help
>>  	  AM4430 CPU
>>  
>> -config BR2_PACKAGE_TI_SGX_AM5430
>> +config BR2_PACKAGE_TI_SGX_KM_AM5430
>>  	bool "AM5430"
>>  	help
>>  	  AM5430 CPU
>> diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk
>> index db74da9b4a..0e1bc33902 100644
>> --- a/package/ti-sgx-km/ti-sgx-km.mk
>> +++ b/package/ti-sgx-km/ti-sgx-km.mk
>> @@ -17,13 +17,13 @@ TI_SGX_KM_MAKE_OPTS = \
>>  	KERNELDIR=$(LINUX_DIR) \
>>  	PVR_NULLDRM=1
>>  
>> -ifeq ($(BR2_PACKAGE_TI_SGX_AM335X),y)
>> +ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y)
>>  TI_SGX_KM_PLATFORM_NAME = omap335x
>> -else ifeq ($(BR2_PACKAGE_TI_SGX_AM437X),y)
>> +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM437X),y)
>>  TI_SGX_KM_PLATFORM_NAME = omap437x
>> -else ifeq ($(BR2_PACKAGE_TI_SGX_AM4430),y)
>> +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM4430),y)
>>  TI_SGX_KM_PLATFORM_NAME = omap4430
>> -else ifeq ($(BR2_PACKAGE_TI_SGX_5430),y)
>> +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_5430),y)
>>  TI_SGX_KM_PLATFORM_NAME = omap5430
>>  endif
>>  
>> -- 
>> 2.14.3
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-15 21:52     ` Arnout Vandecappelle
@ 2018-05-16  7:00       ` Thomas Petazzoni
  2018-05-16 15:16         ` Arnout Vandecappelle
  0 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-16  7:00 UTC (permalink / raw)
  To: buildroot

Hello,

On Tue, 15 May 2018 23:52:33 +0200, Arnout Vandecappelle wrote:

> > What is nice with this solution, is that we have the new choice that is
> > right near the legacy option so we can chek it, and it automatically
> > gets the old setting.
> > 
> > But I am not too convinced, however, because we do not usually use the
> > name of a choice elsewhere...  
> 
>  Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.

Is this an Acked-by to the approach this patch series has taken in
terms of handling the Config.in choice option renaming ?

Thanks! :-)

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-16  7:00       ` Thomas Petazzoni
@ 2018-05-16 15:16         ` Arnout Vandecappelle
  2018-05-21 21:16           ` Peter Korsgaard
  0 siblings, 1 reply; 27+ messages in thread
From: Arnout Vandecappelle @ 2018-05-16 15:16 UTC (permalink / raw)
  To: buildroot



On 16-05-18 09:00, Thomas Petazzoni wrote:
> Hello,
> 
> On Tue, 15 May 2018 23:52:33 +0200, Arnout Vandecappelle wrote:
> 
>>> What is nice with this solution, is that we have the new choice that is
>>> right near the legacy option so we can chek it, and it automatically
>>> gets the old setting.
>>>
>>> But I am not too convinced, however, because we do not usually use the
>>> name of a choice elsewhere...  
>>
>>  Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.
> 
> Is this an Acked-by to the approach this patch series has taken in
> terms of handling the Config.in choice option renaming ?

 Er, no, it's a NACK. I *do* think it's worthwhile to properly select the new
option.

 Regards,
 Arnout

> 
> Thanks! :-)
> 
> Thomas
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-16 15:16         ` Arnout Vandecappelle
@ 2018-05-21 21:16           ` Peter Korsgaard
  2018-05-22 10:42             ` Arnout Vandecappelle
  0 siblings, 1 reply; 27+ messages in thread
From: Peter Korsgaard @ 2018-05-21 21:16 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 16-05-18 09:00, Thomas Petazzoni wrote:
 >> Hello,
 >> 
 >> On Tue, 15 May 2018 23:52:33 +0200, Arnout Vandecappelle wrote:
 >> 
 >>>> What is nice with this solution, is that we have the new choice that is
 >>>> right near the legacy option so we can chek it, and it automatically
 >>>> gets the old setting.
 >>>> 
 >>>> But I am not too convinced, however, because we do not usually use the
 >>>> name of a choice elsewhere...  
 >>> 
 >>> Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.
 >> 
 >> Is this an Acked-by to the approach this patch series has taken in
 >> terms of handling the Config.in choice option renaming ?

 >  Er, no, it's a NACK. I *do* think it's worthwhile to properly select the new
 > option.

OK. I would like to release RC2 and include these renames, so how about
you send a followup series with the reworked Config.in.legacy handling?

Thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-21 21:16           ` Peter Korsgaard
@ 2018-05-22 10:42             ` Arnout Vandecappelle
  2018-05-28 20:45               ` Yann E. MORIN
  0 siblings, 1 reply; 27+ messages in thread
From: Arnout Vandecappelle @ 2018-05-22 10:42 UTC (permalink / raw)
  To: buildroot



On 21-05-18 23:16, Peter Korsgaard wrote:
>>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> 
>  > On 16-05-18 09:00, Thomas Petazzoni wrote:
>  >> Hello,
>  >> 
>  >> On Tue, 15 May 2018 23:52:33 +0200, Arnout Vandecappelle wrote:
>  >> 
>  >>>> What is nice with this solution, is that we have the new choice that is
>  >>>> right near the legacy option so we can chek it, and it automatically
>  >>>> gets the old setting.
>  >>>> 
>  >>>> But I am not too convinced, however, because we do not usually use the
>  >>>> name of a choice elsewhere...  
>  >>> 
>  >>> Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.
>  >> 
>  >> Is this an Acked-by to the approach this patch series has taken in
>  >> terms of handling the Config.in choice option renaming ?
> 
>  >  Er, no, it's a NACK. I *do* think it's worthwhile to properly select the new
>  > option.
> 
> OK. I would like to release RC2 and include these renames, so how about
> you send a followup series with the reworked Config.in.legacy handling?

 At the pace that I've been active in Buildroot lately, not likely, but I'll
give it a shot :-)

 Regards,
 Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-22 10:42             ` Arnout Vandecappelle
@ 2018-05-28 20:45               ` Yann E. MORIN
  2018-05-29 10:45                 ` Arnout Vandecappelle
  0 siblings, 1 reply; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-28 20:45 UTC (permalink / raw)
  To: buildroot

Arnout, Peter, All,

On 2018-05-22 12:42 +0200, Arnout Vandecappelle spake thusly:
> On 21-05-18 23:16, Peter Korsgaard wrote:
> >>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> > 
> >  > On 16-05-18 09:00, Thomas Petazzoni wrote:
> >  >> Hello,
> >  >> 
> >  >> On Tue, 15 May 2018 23:52:33 +0200, Arnout Vandecappelle wrote:
> >  >> 
> >  >>>> What is nice with this solution, is that we have the new choice that is
> >  >>>> right near the legacy option so we can chek it, and it automatically
> >  >>>> gets the old setting.
> >  >>>> 
> >  >>>> But I am not too convinced, however, because we do not usually use the
> >  >>>> name of a choice elsewhere...  
> >  >>> 
> >  >>> Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.
> >  >>
> >  >> Is this an Acked-by to the approach this patch series has taken in
> >  >> terms of handling the Config.in choice option renaming ?
> > 
> >  >  Er, no, it's a NACK. I *do* think it's worthwhile to properly select the new
> >  > option.

Yeah, but as we've gone without support for legacy choices so far
(almost 6 years now), I don't think this is an urgent matter.

Next time, maybe I'll just shut up instead of suggesting sophisticated
and imaginative solutions. ;-P

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-28 20:45               ` Yann E. MORIN
@ 2018-05-29 10:45                 ` Arnout Vandecappelle
  2018-05-29 17:26                   ` Yann E. MORIN
  0 siblings, 1 reply; 27+ messages in thread
From: Arnout Vandecappelle @ 2018-05-29 10:45 UTC (permalink / raw)
  To: buildroot



On 28-05-18 22:45, Yann E. MORIN wrote:
> Arnout, Peter, All,
> 
> On 2018-05-22 12:42 +0200, Arnout Vandecappelle spake thusly:
>> On 21-05-18 23:16, Peter Korsgaard wrote:
>>>>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
>>>
>>>  > On 16-05-18 09:00, Thomas Petazzoni wrote:
>>>  >> Hello,
>>>  >> 
>>>  >> On Tue, 15 May 2018 23:52:33 +0200, Arnout Vandecappelle wrote:
>>>  >> 
>>>  >>>> What is nice with this solution, is that we have the new choice that is
>>>  >>>> right near the legacy option so we can chek it, and it automatically
>>>  >>>> gets the old setting.
>>>  >>>> 
>>>  >>>> But I am not too convinced, however, because we do not usually use the
>>>  >>>> name of a choice elsewhere...  
>>>  >>> 
>>>  >>> Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.
>>>  >>
>>>  >> Is this an Acked-by to the approach this patch series has taken in
>>>  >> terms of handling the Config.in choice option renaming ?
>>>
>>>  >  Er, no, it's a NACK. I *do* think it's worthwhile to properly select the new
>>>  > option.
> 
> Yeah, but as we've gone without support for legacy choices so far
> (almost 6 years now), I don't think this is an urgent matter.

 Excuse me? Have you read lines 19-59 of Config.in.legacy?

 Regards,
 Arnout

> 
> Next time, maybe I'll just shut up instead of suggesting sophisticated
> and imaginative solutions. ;-P
> 
> Regards,
> Yann E. MORIN.
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 6/8] ti-sgx-km: rename options to have proper prefix
  2018-05-29 10:45                 ` Arnout Vandecappelle
@ 2018-05-29 17:26                   ` Yann E. MORIN
  0 siblings, 0 replies; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-29 17:26 UTC (permalink / raw)
  To: buildroot

Arnout, All,

On 2018-05-29 12:45 +0200, Arnout Vandecappelle spake thusly:
> On 28-05-18 22:45, Yann E. MORIN wrote:
> > Arnout, Peter, All,
> > 
> > On 2018-05-22 12:42 +0200, Arnout Vandecappelle spake thusly:
> >> On 21-05-18 23:16, Peter Korsgaard wrote:
> >>>>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> >>>
> >>>  > On 16-05-18 09:00, Thomas Petazzoni wrote:
> >>>  >> Hello,
> >>>  >> 
> >>>  >> On Tue, 15 May 2018 23:52:33 +0200, Arnout Vandecappelle wrote:
> >>>  >> 
> >>>  >>>> What is nice with this solution, is that we have the new choice that is
> >>>  >>>> right near the legacy option so we can chek it, and it automatically
> >>>  >>>> gets the old setting.
> >>>  >>>> 
> >>>  >>>> But I am not too convinced, however, because we do not usually use the
> >>>  >>>> name of a choice elsewhere...  
> >>>  >>> 
> >>>  >>> Legacy is pretty special anyway. I do think it's worthwhile it to do this properly.
> >>>  >>
> >>>  >> Is this an Acked-by to the approach this patch series has taken in
> >>>  >> terms of handling the Config.in choice option renaming ?
> >>>
> >>>  >  Er, no, it's a NACK. I *do* think it's worthwhile to properly select the new
> >>>  > option.
> > 
> > Yeah, but as we've gone without support for legacy choices so far
> > (almost 6 years now), I don't think this is an urgent matter.
> 
>  Excuse me? Have you read lines 19-59 of Config.in.legacy?

Sorry, but this is not about "legacy choices" as I suggested above by
using named choices. This is about how to handle options in a choice, by
moving them to Config.in.legacy as plain booleans.

Now, to be clear:

  - yes, we do want to have proper legacy handling for the renamed
    options, as is done in commit b54c5464cc, where the old choice
    entries have been added to legacy, according to the documentation
    we had at that time and following existing practice, but which
    "forgot" the defaults for legacy [0];

  - no we don't need to have support for adding /legacy choices/ (i.e.
    using a named choice) for the 2018.05 release because it is new and
    we have so far never handled legacy choice options in a /legacy
    choice/.


[0] Fixed with this patch, which I'll submit in a moment:
    diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in
    index db3d3f9ddd..562bbe8867 100644
    --- a/package/ti-sgx-km/Config.in
    +++ b/package/ti-sgx-km/Config.in
    @@ -20,6 +20,10 @@ if BR2_PACKAGE_TI_SGX_KM
     
     choice
     	prompt "Target"
    +	default BR2_PACKAGE_TI_SGX_KM_AM335X if BR2_PACKAGE_TI_SGX_AM335X # legacy
    +	default BR2_PACKAGE_TI_SGX_KM_AM437X if BR2_PACKAGE_TI_SGX_AM437X # legacy
    +	default BR2_PACKAGE_TI_SGX_KM_AM4430 if BR2_PACKAGE_TI_SGX_AM4430 # legacy
    +	default BR2_PACKAGE_TI_SGX_KM_AM5430 if BR2_PACKAGE_TI_SGX_AM5430 # legacy
     	default BR2_PACKAGE_TI_SGX_KM_AM335X
     	help
     	  Select the SOC for which you would like to install drivers.

BTW, the fallback default here is about the first option in the choice,
so it is not needed, but oh well... :-/

Regards,
Yann E. MORIN.

>  Regards,
>  Arnout
> 
> > 
> > Next time, maybe I'll just shut up instead of suggesting sophisticated
> > and imaginative solutions. ;-P
> > 
> > Regards,
> > Yann E. MORIN.
> > 
> 
> -- 
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 7/8] libmediaart: rename options to have proper prefix
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
                   ` (5 preceding siblings ...)
  2018-05-13 19:07 ` [Buildroot] [PATCH 6/8] ti-sgx-km: " Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-13 19:32   ` Yann E. MORIN
  2018-05-13 19:07 ` [Buildroot] [PATCH 8/8] utils/check-package: verify the prefix of package Config.in options Thomas Petazzoni
  2018-05-21 21:18 ` [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Peter Korsgaard
  8 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

From: Petr Vorel <petr.vorel@gmail.com>

Options should be prefixed by BR2_PACKAGE_LIBMEDIAART and not
BR2_PACKAGE_MEDIAART, but package was using both prefixes.

This was found as default symbol was defined as
BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE (correct prefix), but symbol
was actually BR2_PACKAGE_MEDIAART_BACKEND_NONE).

This commit therefore renames the incorrectly named options, and adds
Config.in.legacy handling. Since the options are part of a choice, the
legacy handling cannot select the new options, and is only here to
inform the user.

Fixes: c443830a57 libmediaart: new package

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[Thomas: improve commit log, add Config.in.legacy handling]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Config.in.legacy                   | 24 ++++++++++++++++++++++++
 package/libmediaart/Config.in      |  8 ++++----
 package/libmediaart/libmediaart.mk |  6 +++---
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 5cf25463ad..8d946b6bed 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,30 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_MEDIAART_BACKEND_NONE
+	bool "libmediaart none backend option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_MEDIAART_BACKEND_NONE has been renamed to
+	  BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
+
+config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+	bool "libmediaart gdk-pixbuf backend option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to
+	  BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
+
+config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+	bool "libmediaart qt backend option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to
+	  BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
+
 config BR2_PACKAGE_TI_SGX_AM335X
 	bool "ti-sgx-km AM335X option renamed"
 	select BR2_LEGACY
diff --git a/package/libmediaart/Config.in b/package/libmediaart/Config.in
index e5e770d4fc..e073677395 100644
--- a/package/libmediaart/Config.in
+++ b/package/libmediaart/Config.in
@@ -20,17 +20,17 @@ choice
 	prompt "media art backend"
 	default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
 
-config BR2_PACKAGE_MEDIAART_BACKEND_NONE
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
 	bool "none"
 	help
 	  With no backend, libmediaart will not be able to process MP3
 	  album art.
 
-config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
 	bool "gdk-pixbuf"
 	select BR2_PACKAGE_GDK_PIXBUF
 
-config BR2_PACKAGE_MEDIAART_BACKEND_QT
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
 	bool "Qt"
 	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
@@ -41,4 +41,4 @@ comment "Qt backend depends on Qt or Qt5"
 
 endchoice
 
-endif # BR2_PACKAGE_MEDIAART
+endif # BR2_PACKAGE_LIBMEDIAART
diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk
index db4f1fa2a1..f64210c266 100644
--- a/package/libmediaart/libmediaart.mk
+++ b/package/libmediaart/libmediaart.mk
@@ -15,12 +15,12 @@ LIBMEDIAART_INSTALL_STAGING = YES
 LIBMEDIAART_DEPENDENCIES = libglib2
 LIBMEDIAART_CONF_OPTS = --disable-unit-tests
 
-ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF),y)
+ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y)
 LIBMEDIAART_DEPENDENCIES += gdk-pixbuf
 LIBMEDIAART_CONF_OPTS += \
 	--enable-gdkpixbuf \
 	--disable-qt
-else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_QT),y)
+else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
 # qt5 needs c++11 (since qt-5.7)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
@@ -31,7 +31,7 @@ LIBMEDIAART_DEPENDENCIES += \
 LIBMEDIAART_CONF_OPTS += \
 	--disable-gdkpixbuf \
 	--enable-qt
-else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_NONE),y)
+else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y)
 LIBMEDIAART_CONF_OPTS += \
 	--disable-gdkpixbuf \
 	--disable-qt
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 7/8] libmediaart: rename options to have proper prefix
  2018-05-13 19:07 ` [Buildroot] [PATCH 7/8] libmediaart: " Thomas Petazzoni
@ 2018-05-13 19:32   ` Yann E. MORIN
  0 siblings, 0 replies; 27+ messages in thread
From: Yann E. MORIN @ 2018-05-13 19:32 UTC (permalink / raw)
  To: buildroot

Petr, Thomas, All,

On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly:
> From: Petr Vorel <petr.vorel@gmail.com>
> 
> Options should be prefixed by BR2_PACKAGE_LIBMEDIAART and not
> BR2_PACKAGE_MEDIAART, but package was using both prefixes.
> 
> This was found as default symbol was defined as
> BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE (correct prefix), but symbol
> was actually BR2_PACKAGE_MEDIAART_BACKEND_NONE).
> 
> This commit therefore renames the incorrectly named options, and adds
> Config.in.legacy handling. Since the options are part of a choice, the
> legacy handling cannot select the new options, and is only here to
> inform the user.
> 
> Fixes: c443830a57 libmediaart: new package
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> [Thomas: improve commit log, add Config.in.legacy handling]
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  Config.in.legacy                   | 24 ++++++++++++++++++++++++
>  package/libmediaart/Config.in      |  8 ++++----
>  package/libmediaart/libmediaart.mk |  6 +++---
>  3 files changed, 31 insertions(+), 7 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 5cf25463ad..8d946b6bed 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,30 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2018.05"
>  
> +config BR2_PACKAGE_MEDIAART_BACKEND_NONE
> +	bool "libmediaart none backend option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_MEDIAART_BACKEND_NONE has been renamed to
> +	  BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
> +
> +config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
> +	bool "libmediaart gdk-pixbuf backend option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to
> +	  BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
> +
> +config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
> +	bool "libmediaart qt backend option renamed"
> +	select BR2_LEGACY
> +	help
> +	  For consistency reasons, the option
> +	  BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to
> +	  BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
> +
>  config BR2_PACKAGE_TI_SGX_AM335X
>  	bool "ti-sgx-km AM335X option renamed"
>  	select BR2_LEGACY
> diff --git a/package/libmediaart/Config.in b/package/libmediaart/Config.in
> index e5e770d4fc..e073677395 100644
> --- a/package/libmediaart/Config.in
> +++ b/package/libmediaart/Config.in
> @@ -20,17 +20,17 @@ choice
>  	prompt "media art backend"
>  	default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
>  
> -config BR2_PACKAGE_MEDIAART_BACKEND_NONE
> +config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
>  	bool "none"
>  	help
>  	  With no backend, libmediaart will not be able to process MP3
>  	  album art.
>  
> -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
> +config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
>  	bool "gdk-pixbuf"
>  	select BR2_PACKAGE_GDK_PIXBUF
>  
> -config BR2_PACKAGE_MEDIAART_BACKEND_QT
> +config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
>  	bool "Qt"
>  	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
>  	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
> @@ -41,4 +41,4 @@ comment "Qt backend depends on Qt or Qt5"
>  
>  endchoice
>  
> -endif # BR2_PACKAGE_MEDIAART
> +endif # BR2_PACKAGE_LIBMEDIAART
> diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk
> index db4f1fa2a1..f64210c266 100644
> --- a/package/libmediaart/libmediaart.mk
> +++ b/package/libmediaart/libmediaart.mk
> @@ -15,12 +15,12 @@ LIBMEDIAART_INSTALL_STAGING = YES
>  LIBMEDIAART_DEPENDENCIES = libglib2
>  LIBMEDIAART_CONF_OPTS = --disable-unit-tests
>  
> -ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF),y)
> +ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y)
>  LIBMEDIAART_DEPENDENCIES += gdk-pixbuf
>  LIBMEDIAART_CONF_OPTS += \
>  	--enable-gdkpixbuf \
>  	--disable-qt
> -else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_QT),y)
> +else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
>  # qt5 needs c++11 (since qt-5.7)
>  ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
>  LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
> @@ -31,7 +31,7 @@ LIBMEDIAART_DEPENDENCIES += \
>  LIBMEDIAART_CONF_OPTS += \
>  	--disable-gdkpixbuf \
>  	--enable-qt
> -else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_NONE),y)
> +else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y)
>  LIBMEDIAART_CONF_OPTS += \
>  	--disable-gdkpixbuf \
>  	--disable-qt
> -- 
> 2.14.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 8/8] utils/check-package: verify the prefix of package Config.in options
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
                   ` (6 preceding siblings ...)
  2018-05-13 19:07 ` [Buildroot] [PATCH 7/8] libmediaart: " Thomas Petazzoni
@ 2018-05-13 19:07 ` Thomas Petazzoni
  2018-05-14  4:04   ` Ricardo Martincoski
  2018-05-21 21:18 ` [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Peter Korsgaard
  8 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2018-05-13 19:07 UTC (permalink / raw)
  To: buildroot

This commit adds a new check in the check-package tool to verify that
the prefix used to name Config.in options are matching the name of the
package.

For now, only Config.in files in package/ are checked, because
Config.in files in fs/, linux/ and boot/ obey to different rules. The
check might be extended later to cover other files.

A series of expections is added, mainly to cope with virtual packages
such as zlib, cryptodev, openssl, jpeg and mysql.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 utils/checkpackagelib/lib_config.py | 75 +++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index 1d273f1c5f..3ffd725351 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -60,6 +60,81 @@ class AttributesOrder(_CheckFunction):
                     text]
 
 
+class ConfigVariableName(_CheckFunction):
+    PACKAGE_NAME = re.compile(".*/([^/]+)/(Config.*)")
+    OPTION_ONLY = re.compile("^config (BR2_PACKAGE_.*)")
+    EXCLUDES = ["package/Config.in",
+                "package/Config.in.host"]
+    EXCEPTIONS = {
+        "package/zlib/Config.in": ["BR2_PACKAGE_LIBZLIB"],
+        "package/cryptodev/Config.in": ["BR2_PACKAGE_OCF_LINUX"],
+        "package/libcurl/Config.in": ["BR2_PACKAGE_CURL"],
+        "package/luajit/Config.in": ["BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION"],
+        "package/mono/Config.in": ["BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS"],
+        "package/rustc/Config.in.host": ["BR2_PACKAGE_HOST_RUST",
+                                         "BR2_PACKAGE_HOST_RUST_BIN"],
+        "package/openssl/Config.in": ["BR2_PACKAGE_LIBOPENSSL",
+                                      "BR2_PACKAGE_LIBOPENSSL_BIN",
+                                      "BR2_PACKAGE_LIBOPENSSL_ENGINES",
+                                      "BR2_PACKAGE_LIBRESSL",
+                                      "BR2_PACKAGE_LIBRESSL_BIN"],
+        "package/erlang/Config.in": ["BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS"],
+        "package/jpeg/Config.in": ["BR2_PACKAGE_LIBJPEG"],
+        "package/mysql/Config.in": ["BR2_PACKAGE_MARIADB",
+                                    "BR2_PACKAGE_ORACLE_MYSQL",
+                                    "BR2_PACKAGE_MARIADB_SERVER",
+                                    "BR2_PACKAGE_ORACLE_MYSQL_SERVER"],
+    }
+
+    def _check_file(self):
+        if not self.filename.startswith("package/"):
+            return False
+        if self.filename in self.EXCLUDES:
+            return False
+        return True
+
+    def _check_symbol(self, symbol):
+        if self.filename in self.EXCEPTIONS and \
+           symbol in self.EXCEPTIONS[self.filename]:
+            return False
+        else:
+            return True
+
+    def before(self):
+        if not self._check_file():
+            return
+        m = self.PACKAGE_NAME.search(self.filename)
+        if not m:
+            print "NOT FOUND: %s" % self.filename
+        package = m.group(1)
+        config_file_name = m.group(2)
+        if config_file_name == "Config.in.host":
+            self.config_prefix = "BR2_PACKAGE_HOST_" + package.replace("-", "_").upper()
+        else:
+            self.config_prefix = "BR2_PACKAGE_" + package.replace("-", "_").upper()
+
+    def check_line(self, lineno, text):
+        if not self._check_file():
+            return
+        if _empty_or_comment(text):
+            return
+
+        m = self.OPTION_ONLY.search(text)
+        if m:
+            option = m.group(1)
+            # virtual package related options don't have the suffix of
+            # the current package, but this is expected.
+            if option.startswith("BR2_PACKAGE_PROVIDES_"):
+                return
+            if option.startswith("BR2_PACKAGE_HAS_"):
+                return
+            if not self._check_symbol(option):
+                return
+            if not option.startswith(self.config_prefix):
+                return ["{}:{}: option '{}' doesn't start with '{}' prefix"
+                        .format(self.filename, lineno, option, self.config_prefix)]
+
+
 class HelpText(_CheckFunction):
     HELP_TEXT_FORMAT = re.compile("^\t  .{,62}$")
     URL_ONLY = re.compile("^(http|https|git)://\S*$")
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 8/8] utils/check-package: verify the prefix of package Config.in options
  2018-05-13 19:07 ` [Buildroot] [PATCH 8/8] utils/check-package: verify the prefix of package Config.in options Thomas Petazzoni
@ 2018-05-14  4:04   ` Ricardo Martincoski
  0 siblings, 0 replies; 27+ messages in thread
From: Ricardo Martincoski @ 2018-05-14  4:04 UTC (permalink / raw)
  To: buildroot

Hello,

On Sun, May 13, 2018 at 04:07 PM, Thomas Petazzoni wrote:

> This commit adds a new check in the check-package tool to verify that
> the prefix used to name Config.in options are matching the name of the
> package.
> 
> For now, only Config.in files in package/ are checked, because
> Config.in files in fs/, linux/ and boot/ obey to different rules. The
> check might be extended later to cover other files.
> 
> A series of expections is added, mainly to cope with virtual packages

s/expections/exceptions/

> such as zlib, cryptodev, openssl, jpeg and mysql.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  utils/checkpackagelib/lib_config.py | 75 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 75 insertions(+)
> 
> diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
> index 1d273f1c5f..3ffd725351 100644
> --- a/utils/checkpackagelib/lib_config.py
> +++ b/utils/checkpackagelib/lib_config.py
> @@ -60,6 +60,81 @@ class AttributesOrder(_CheckFunction):
>                      text]
>  
>  
> +class ConfigVariableName(_CheckFunction):
> +    PACKAGE_NAME = re.compile(".*/([^/]+)/(Config.*)")
> +    OPTION_ONLY = re.compile("^config (BR2_PACKAGE_.*)")

This will catch:
config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
but not:
 config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
config  BR2_PACKAGE_JANUS_STREAMING

If you do instead:
    OPTION_ONLY = re.compile("^\s*config\s+(BR2_PACKAGE_.*)")
the first example above (that I created locally) will nicely show both warnings:
package/bluez5_utils/Config.in:59: option 'BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH' doesn't start with 'BR2_PACKAGE_BLUEZ5_UTILS' prefix
package/bluez5_utils/Config.in:59: should not be indented
and the second example above (real example) would be caught.


Also... should we care about 'menuconfig' symbols? If yes, something like this
could be used:
OPTION_ONLY = re.compile("^\s*(menuconfig|config)\s+(BR2_PACKAGE_.*)")
...
option = m.group(2)

In the tree I see only one. It's a candidate to be ignored, I guess.
package/x11r7/Config.in
menuconfig BR2_PACKAGE_XORG7

> +    EXCLUDES = ["package/Config.in",
> +                "package/Config.in.host"]
> +    EXCEPTIONS = {
> +        "package/zlib/Config.in": ["BR2_PACKAGE_LIBZLIB"],

Another way to write this is:
        "package/zlib/Config.in": [
            "BR2_PACKAGE_LIBZLIB"],
This way all config symbols will be aligned, but more lines are used.
I don't have a preference.

> +        "package/cryptodev/Config.in": ["BR2_PACKAGE_OCF_LINUX"],
> +        "package/libcurl/Config.in": ["BR2_PACKAGE_CURL"],
> +        "package/luajit/Config.in": ["BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION"],
> +        "package/mono/Config.in": ["BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS"],
> +        "package/rustc/Config.in.host": ["BR2_PACKAGE_HOST_RUST",
> +                                         "BR2_PACKAGE_HOST_RUST_BIN"],
> +        "package/openssl/Config.in": ["BR2_PACKAGE_LIBOPENSSL",
> +                                      "BR2_PACKAGE_LIBOPENSSL_BIN",
> +                                      "BR2_PACKAGE_LIBOPENSSL_ENGINES",
> +                                      "BR2_PACKAGE_LIBRESSL",
> +                                      "BR2_PACKAGE_LIBRESSL_BIN"],
> +        "package/erlang/Config.in": ["BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS"],
> +        "package/jpeg/Config.in": ["BR2_PACKAGE_LIBJPEG"],
> +        "package/mysql/Config.in": ["BR2_PACKAGE_MARIADB",
> +                                    "BR2_PACKAGE_ORACLE_MYSQL",
> +                                    "BR2_PACKAGE_MARIADB_SERVER",
> +                                    "BR2_PACKAGE_ORACLE_MYSQL_SERVER"],

As I understand from time to time we will have changes to this list, when
someone adds a new virtual package.

Alphabetically ordering the files would be nice, as we don't have any reason
against.
Alphabetically ordering in both levels (I mean also ordering the list of symbols
for each file) will make maintenance easier as one doesn't need to think much
to know where to add new files or symbols.

> +    }
> +
> +    def _check_file(self):
> +        if not self.filename.startswith("package/"):
> +            return False
> +        if self.filename in self.EXCLUDES:
> +            return False
> +        return True

Instead of having this called for every single line of Config.* files you could
do similar to what is done in PackageHeader ...

> +
> +    def _check_symbol(self, symbol):
> +        if self.filename in self.EXCEPTIONS and \
> +           symbol in self.EXCEPTIONS[self.filename]:
> +            return False
> +        else:
> +            return True
> +
> +    def before(self):
> +        if not self._check_file():
> +            return

... by creating a boolean that is filled once for each file:
----------
     def before(self):
         self.skip = False
         if not self.filename.startswith("package/"):
             self.skip = True
             return
         if self.filename in self.EXCLUDES:
             self.skip = True
             return

        m = self.PACKAGE_NAME.search(self.filename)
----------

and later using that flag to quickly skip processing lines for excluded files:
----------
    def check_line(self, lineno, text):
        if self.skip:
            return
----------

> +        m = self.PACKAGE_NAME.search(self.filename)
> +        if not m:
> +            print "NOT FOUND: %s" % self.filename

This seems a debug code used before you excluded package/Config*, right?
Because when this 'print' is executed ...

> +        package = m.group(1)

... this line throws:
AttributeError: 'NoneType' object has no attribute 'group'
Should we keep this code (if ... print)?

If you think keeping this code still makes sense, please use:
            print("NOT FOUND: %s" % self.filename)
so we have one less line to change when supporting Python 3.

> +        config_file_name = m.group(2)
> +        if config_file_name == "Config.in.host":
> +            self.config_prefix = "BR2_PACKAGE_HOST_" + package.replace("-", "_").upper()
> +        else:
> +            self.config_prefix = "BR2_PACKAGE_" + package.replace("-", "_").upper()

I was about to suggest to change the regex to BR2_PACKAGE_(HOST_|) ...
But the code you used also detects when a host symbol is used for a target
package or a target symbol is used for a host package.
Nice!

[snip]
> +            if not option.startswith(self.config_prefix):
> +                return ["{}:{}: option '{}' doesn't start with '{}' prefix"
> +                        .format(self.filename, lineno, option, self.config_prefix)]

It's OK as-is. But if you think it could be useful, more values can be
returned, for example:
                         .format(self.filename, lineno, option, self.config_prefix),
                         text, "config " + self.config_prefix + "..."]

This would make check-package to display when called with -vv:

package/bluez5_utils/Config.in:59: option 'BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH' doesn't start with 'BR2_PACKAGE_BLUEZ5_UTILS' prefix
config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
config BR2_PACKAGE_BLUEZ5_UTILS...

Just pointing out that it can be done. I don't think it must be done.


Regards,
Ricardo

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options
  2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
                   ` (7 preceding siblings ...)
  2018-05-13 19:07 ` [Buildroot] [PATCH 8/8] utils/check-package: verify the prefix of package Config.in options Thomas Petazzoni
@ 2018-05-21 21:18 ` Peter Korsgaard
  8 siblings, 0 replies; 27+ messages in thread
From: Peter Korsgaard @ 2018-05-21 21:18 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Hello,
 > This series was started from Petr Vorel's patch fixing libmediaart
 > options, which had a wrong prefix. I started writing an additional
 > check in check-package for this mistake, and thanks to it, I
 > discovered a number of other issues, fixed by this patch series.

 > Best regards,

 > Thomas

 > Petr Vorel (1):
 >   libmediaart: rename options to have proper prefix

 > Thomas Petazzoni (7):
 >   bluez5_utils: rename options to have the proper suffix
 >   jquery-ui-themes: rename options to have proper prefix
 >   libftdi: rename option to have proper prefix
 >   ipsec-tools: rename options to have proper prefix
 >   janus-gateway: rename options to have proper prefix
 >   ti-sgx-km: rename options to have proper prefix

Committed all of these, thanks. The improvements to Config.in.legacy can
be handled as a followup series.

>   utils/check-package: verify the prefix of package Config.in options

But not this one as there was quite some feedback on this.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2018-05-29 17:26 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-13 19:07 [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Thomas Petazzoni
2018-05-13 19:07 ` [Buildroot] [PATCH 1/8] bluez5_utils: rename options to have the proper suffix Thomas Petazzoni
2018-05-13 19:18   ` Yann E. MORIN
2018-05-13 19:07 ` [Buildroot] [PATCH 2/8] jquery-ui-themes: rename options to have proper prefix Thomas Petazzoni
2018-05-13 19:19   ` Yann E. MORIN
2018-05-13 19:07 ` [Buildroot] [PATCH 3/8] libftdi: rename option " Thomas Petazzoni
2018-05-13 19:19   ` Yann E. MORIN
2018-05-13 19:07 ` [Buildroot] [PATCH 4/8] ipsec-tools: rename options " Thomas Petazzoni
2018-05-13 19:21   ` Yann E. MORIN
2018-05-13 19:07 ` [Buildroot] [PATCH 5/8] janus-gateway: " Thomas Petazzoni
2018-05-13 19:22   ` Yann E. MORIN
2018-05-14  4:00   ` Ricardo Martincoski
2018-05-13 19:07 ` [Buildroot] [PATCH 6/8] ti-sgx-km: " Thomas Petazzoni
2018-05-13 19:31   ` Yann E. MORIN
2018-05-15 21:52     ` Arnout Vandecappelle
2018-05-16  7:00       ` Thomas Petazzoni
2018-05-16 15:16         ` Arnout Vandecappelle
2018-05-21 21:16           ` Peter Korsgaard
2018-05-22 10:42             ` Arnout Vandecappelle
2018-05-28 20:45               ` Yann E. MORIN
2018-05-29 10:45                 ` Arnout Vandecappelle
2018-05-29 17:26                   ` Yann E. MORIN
2018-05-13 19:07 ` [Buildroot] [PATCH 7/8] libmediaart: " Thomas Petazzoni
2018-05-13 19:32   ` Yann E. MORIN
2018-05-13 19:07 ` [Buildroot] [PATCH 8/8] utils/check-package: verify the prefix of package Config.in options Thomas Petazzoni
2018-05-14  4:04   ` Ricardo Martincoski
2018-05-21 21:18 ` [Buildroot] [PATCH 0/8] Fix the Config.in prefix of a number of options Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox