jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package: fixup dependencies after mysql_client -> mysql rename

Browse Source 
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2014-01-22 07:24:35 +01:00
parent e2b2ecb691
commit 99fd373bf5
19 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/collectd/Config.in
View File

@ -236,7 +236,7 @@ config BR2_PACKAGE_COLLECTD_MYSQL
depends on BR2_INSTALL_LIBSTDCPP # mysql depends on BR2_INSTALL_LIBSTDCPP # mysql
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
help help
Connects to a MySQL database and issues a "show status" command. Connects to a MySQL database and issues a "show status" command.

4
package/collectd/collectd.mk
View File

@ -104,7 +104,7 @@ COLLECTD_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \
$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql_client) \ $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \
$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \ $(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),protobuf-c) \ $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),protobuf-c) \
@ -117,7 +117,7 @@ COLLECTD_DEPENDENCIES = host-pkgconf \
ifeq ($(BR2_PACKAGE_LIBCURL),y) ifeq ($(BR2_PACKAGE_LIBCURL),y)
COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr
endif endif
ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y) ifeq ($(BR2_PACKAGE_MYSQL),y)
COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr
endif endif
ifeq ($(BR2_PACKAGE_NETSNMP),y) ifeq ($(BR2_PACKAGE_NETSNMP),y)

4
package/cppdb/Config.in
View File

@ -3,7 +3,7 @@ config BR2_PACKAGE_CPPDB
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
# Can be built without them but it's useless # Can be built without them but it's useless
depends on BR2_PACKAGE_MYSQL_CLIENT || BR2_PACKAGE_SQLITE depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_SQLITE
help help
CppDB is an SQL connectivity library that is designed to provide CppDB is an SQL connectivity library that is designed to provide
platform and Database independent connectivity API similarly platform and Database independent connectivity API similarly
@ -12,5 +12,5 @@ config BR2_PACKAGE_CPPDB
http://cppcms.com/sql/cppdb/ http://cppcms.com/sql/cppdb/
comment "cppdb needs a toolchain w/ C++, threads" comment "cppdb needs a toolchain w/ C++, threads"
depends on BR2_PACKAGE_MYSQL_CLIENT || BR2_PACKAGE_SQLITE depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_SQLITE
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

4
package/cppdb/cppdb.mk
View File

@ -12,8 +12,8 @@ CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
CPPDB_LICENSE = Boost-v1.0 or MIT CPPDB_LICENSE = Boost-v1.0 or MIT
CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt
ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y) ifeq ($(BR2_PACKAGE_MYSQL),y)
CPPDB_DEPENDENCIES += mysql_client CPPDB_DEPENDENCIES += mysql
CPPDB_CONF_OPT += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql CPPDB_CONF_OPT += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql
endif endif

4
package/linknx/linknx.mk
View File

@ -13,9 +13,9 @@ LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \
LINKNX_DEPENDENCIES = libpthsem LINKNX_DEPENDENCIES = libpthsem
ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y) ifeq ($(BR2_PACKAGE_MYSQL),y)
LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
LINKNX_DEPENDENCIES += mysql_client LINKNX_DEPENDENCIES += mysql
else else
LINKNX_CONF_OPT += --without-mysql LINKNX_CONF_OPT += --without-mysql
endif endif

2
package/open2300/open2300.mk
View File

@ -12,7 +12,7 @@ OPEN2300_BINS = open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 \
histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300
ifeq ($(BR2_PACKAGE_MYSQL),y) ifeq ($(BR2_PACKAGE_MYSQL),y)
OPEN2300_DEPENDENCIES += mysql_client OPEN2300_DEPENDENCIES += mysql
OPEN2300_BINS += mysql2300 mysqlhistlog2300 OPEN2300_BINS += mysql2300 mysqlhistlog2300
endif endif

6
package/php/Config.ext
View File

@ -96,7 +96,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQL
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
help help
MySQL support MySQL support
@ -105,7 +105,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQLI
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
select BR2_PACKAGE_PHP_EXT_MYSQL select BR2_PACKAGE_PHP_EXT_MYSQL
help help
MySQL Improved extension support MySQL Improved extension support
@ -122,7 +122,7 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
help help
PDO driver for MySQL PDO driver for MySQL

6
package/php/php.mk
View File

@ -133,11 +133,11 @@ endif
### Native MySQL extensions ### Native MySQL extensions
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y) ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y)
PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += mysql_client PHP_DEPENDENCIES += mysql
endif endif
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y) ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y)
PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config
PHP_DEPENDENCIES += mysql_client PHP_DEPENDENCIES += mysql
endif endif
### PDO ### PDO
@ -153,7 +153,7 @@ endif
endif endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y) ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
PHP_CONF_OPT += --with-pdo-mysql=$(STAGING_DIR)/usr PHP_CONF_OPT += --with-pdo-mysql=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += mysql_client PHP_DEPENDENCIES += mysql
endif endif
endif endif

2
package/poco/Config.in
View File

@ -56,7 +56,7 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
bool "mysql" bool "mysql"
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql
select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_POCO_DATA
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
endif # BR2_PACKAGE_POCO endif # BR2_PACKAGE_POCO

2
package/poco/poco.mk
View File

@ -17,7 +17,7 @@ POCO_DEPENDENCIES = zlib pcre \
$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql_client) $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
POCO_OMIT = Data/ODBC PageCompiler \ POCO_OMIT = Data/ODBC PageCompiler \
$(if $(BR2_PACKAGE_POCO_XML),,XML) \ $(if $(BR2_PACKAGE_POCO_XML),,XML) \

2
package/qt/Config.sql.in
View File

@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_QT_SQL_MODULE
if BR2_PACKAGE_QT_SQL_MODULE if BR2_PACKAGE_QT_SQL_MODULE
config BR2_PACKAGE_QT_MYSQL config BR2_PACKAGE_QT_MYSQL
bool "MySQL Driver" bool "MySQL Driver"
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_READLINE select BR2_PACKAGE_READLINE
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql

2
package/qt/qt.mk
View File

@ -341,7 +341,7 @@ QT_CONFIGURE_OPTS += -qt-sql-ibase
endif endif
ifeq ($(BR2_PACKAGE_QT_MYSQL),y) ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
QT_DEPENDENCIES += mysql_client QT_DEPENDENCIES += mysql
endif endif
ifeq ($(BR2_PACKAGE_QT_ODBC),y) ifeq ($(BR2_PACKAGE_QT_ODBC),y)
QT_CONFIGURE_OPTS += -qt-sql-odbc QT_CONFIGURE_OPTS += -qt-sql-odbc

2
package/qt5/qt5base/Config.in
View File

@ -53,7 +53,7 @@ config BR2_PACKAGE_QT5BASE_SQL
if BR2_PACKAGE_QT5BASE_SQL if BR2_PACKAGE_QT5BASE_SQL
config BR2_PACKAGE_QT5BASE_MYSQL config BR2_PACKAGE_QT5BASE_MYSQL
bool "MySQL Plugin" bool "MySQL Plugin"
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_READLINE select BR2_PACKAGE_READLINE
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql

2
package/qt5/qt5base/qt5base.mk
View File

@ -61,7 +61,7 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
QT5BASE_DEPENDENCIES += mysql_client QT5BASE_DEPENDENCIES += mysql
else else
QT5BASE_CONFIGURE_OPTS += -no-sql-mysql QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
endif endif

2
package/sconeserver/Config.in
View File

@ -38,7 +38,7 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
config BR2_PACKAGE_SCONESERVER_MYSQL config BR2_PACKAGE_SCONESERVER_MYSQL
bool "mysql" bool "mysql"
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql
select BR2_PACKAGE_MYSQL_CLIENT select BR2_PACKAGE_MYSQL
help help
MySQL module for Sconeserver MySQL module for Sconeserver

2
package/sconeserver/sconeserver.mk
View File

@ -57,7 +57,7 @@ else
endif endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
SCONESERVER_DEPENDENCIES += mysql_client SCONESERVER_DEPENDENCIES += mysql
SCONESERVER_CONF_OPT += --with-mysql \ SCONESERVER_CONF_OPT += --with-mysql \
--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \ --with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql" LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"

2
package/strongswan/Config.in
View File

@ -100,7 +100,7 @@ config BR2_PACKAGE_STRONGSWAN_STROKE
config BR2_PACKAGE_STRONGSWAN_SQL config BR2_PACKAGE_STRONGSWAN_SQL
bool "Enable SQL database configuration backend" bool "Enable SQL database configuration backend"
depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL_CLIENT depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL
endif endif

2
package/strongswan/strongswan.mk
View File

@ -64,7 +64,7 @@ STRONGSWAN_DEPENDENCIES += \
ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
STRONGSWAN_DEPENDENCIES += \ STRONGSWAN_DEPENDENCIES += \
$(if $(BR2_PACKAGE_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_SQLITE),sqlite) \
$(if $(BR2_PACKAGE_MYSQL_CLIENT),mysql_client) $(if $(BR2_PACKAGE_MYSQL),mysql)
endif endif
# Strongswan uses AC_LIB_PREFIX, which is relatively new. # Strongswan uses AC_LIB_PREFIX, which is relatively new.

4
package/ulogd/ulogd.mk
View File

@ -17,9 +17,9 @@ ULOGD_LICENSE_FILES = COPYING
# DB backends need threads # DB backends need threads
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y) ifeq ($(BR2_PACKAGE_MYSQL),y)
ULOGD_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr ULOGD_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
ULOGD_DEPENDENCIES += mysql_client ULOGD_DEPENDENCIES += mysql
endif endif
ifeq ($(BR2_PACKAGE_SQLITE),y) ifeq ($(BR2_PACKAGE_SQLITE),y)
ULOGD_DEPENDENCIES += sqlite ULOGD_DEPENDENCIES += sqlite