package/sconeserver: reorder options alphabetically

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2022-07-27 11:43:50 +02:00
committed by Thomas Petazzoni
parent fe522b9c17
commit 49b8fad29c
2 changed files with 45 additions and 45 deletions

View File

@@ -15,24 +15,6 @@ if BR2_PACKAGE_SCONESERVER
comment "Sconeserver modules" comment "Sconeserver modules"
config BR2_PACKAGE_SCONESERVER_EXAMPLES
bool "examples"
help
Example modules for Sconeserver
config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
bool "http::sconesite"
select BR2_PACKAGE_LIBXML2
help
http::sconesite module for Sconeserver
config BR2_PACKAGE_SCONESERVER_MYSQL
bool "mysql"
depends on BR2_USE_MMU # mysql
select BR2_PACKAGE_MYSQL
help
MySQL module for Sconeserver
config BR2_PACKAGE_SCONESERVER_BLUETOOTH config BR2_PACKAGE_SCONESERVER_BLUETOOTH
bool "bluetooth" bool "bluetooth"
depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_USE_WCHAR # bluez5_utils -> libglib2
@@ -51,11 +33,16 @@ comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library,
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
config BR2_PACKAGE_SCONESERVER_RSS config BR2_PACKAGE_SCONESERVER_EXAMPLES
bool "rss" bool "examples"
help
Example modules for Sconeserver
config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
bool "http::sconesite"
select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXML2
help help
RSS module for Sconeserver http::sconesite module for Sconeserver
config BR2_PACKAGE_SCONESERVER_LOCATION config BR2_PACKAGE_SCONESERVER_LOCATION
bool "location" bool "location"
@@ -76,6 +63,19 @@ config BR2_PACKAGE_SCONESERVER_MATHS
help help
Mathematics module for Sconeserver Mathematics module for Sconeserver
config BR2_PACKAGE_SCONESERVER_MYSQL
bool "mysql"
depends on BR2_USE_MMU # mysql
select BR2_PACKAGE_MYSQL
help
MySQL module for Sconeserver
config BR2_PACKAGE_SCONESERVER_RSS
bool "rss"
select BR2_PACKAGE_LIBXML2
help
RSS module for Sconeserver
config BR2_PACKAGE_SCONESERVER_TESTBUILDER config BR2_PACKAGE_SCONESERVER_TESTBUILDER
bool "testbuilder" bool "testbuilder"
help help

View File

@@ -40,6 +40,13 @@ else
SCONESERVER_CONF_OPTS += --without-ssl SCONESERVER_CONF_OPTS += --without-ssl
endif endif
ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y)
SCONESERVER_DEPENDENCIES += bluez5_utils
SCONESERVER_CONF_OPTS += --with-bluetooth
else
SCONESERVER_CONF_OPTS += --without-bluetooth
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_EXAMPLES),y) ifeq ($(BR2_PACKAGE_SCONESERVER_EXAMPLES),y)
SCONESERVER_CONF_OPTS += --with-examples SCONESERVER_CONF_OPTS += --with-examples
else else
@@ -53,30 +60,6 @@ else
SCONESERVER_CONF_OPTS += --without-sconesite SCONESERVER_CONF_OPTS += --without-sconesite
endif endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
SCONESERVER_DEPENDENCIES += mysql
SCONESERVER_CONF_OPTS += \
--with-mysql \
--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
else
SCONESERVER_CONF_OPTS += --without-mysql
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y)
SCONESERVER_DEPENDENCIES += bluez5_utils
SCONESERVER_CONF_OPTS += --with-bluetooth
else
SCONESERVER_CONF_OPTS += --without-bluetooth
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y)
SCONESERVER_DEPENDENCIES += libxml2
SCONESERVER_CONF_OPTS += --with-rss
else
SCONESERVER_CONF_OPTS += --without-rss
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y) ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y)
SCONESERVER_DEPENDENCIES += gpsd SCONESERVER_DEPENDENCIES += gpsd
SCONESERVER_CONF_OPTS += --with-location SCONESERVER_CONF_OPTS += --with-location
@@ -91,6 +74,23 @@ else
SCONESERVER_CONF_OPTS += --without-maths SCONESERVER_CONF_OPTS += --without-maths
endif endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
SCONESERVER_DEPENDENCIES += mysql
SCONESERVER_CONF_OPTS += \
--with-mysql \
--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
else
SCONESERVER_CONF_OPTS += --without-mysql
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y)
SCONESERVER_DEPENDENCIES += libxml2
SCONESERVER_CONF_OPTS += --with-rss
else
SCONESERVER_CONF_OPTS += --without-rss
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_TESTBUILDER),y) ifeq ($(BR2_PACKAGE_SCONESERVER_TESTBUILDER),y)
SCONESERVER_CONF_OPTS += --with-testbuilder SCONESERVER_CONF_OPTS += --with-testbuilder
else else