* [Buildroot] [PATCH 1/3] package/libdbi: new package
2021-10-04 12:43 [Buildroot] [PATCH 0/3] new libdbi and libdbi-drivers packages Herve Codina
@ 2021-10-04 12:43 ` Herve Codina
2021-10-13 18:09 ` Arnout Vandecappelle
2021-10-04 12:43 ` [Buildroot] [PATCH 2/3] package/libdbi-drivers: " Herve Codina
2021-10-04 12:43 ` [Buildroot] [PATCH 3/3] package/collectd: add dbi support Herve Codina
2 siblings, 1 reply; 8+ messages in thread
From: Herve Codina @ 2021-10-04 12:43 UTC (permalink / raw)
To: buildroot; +Cc: Herve Codina, Thomas Petazzoni
libdbi implements a database-independent abstraction layer in C,
similar to the DBI/DBD layer in Perl.
http://libdbi.sourceforge.net/
Based on initial work from Nicolas Carrier <nicolas.carrier@orolia.com>
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
DEVELOPERS | 4 ++++
package/Config.in | 1 +
package/libdbi/Config.in | 7 +++++++
package/libdbi/libdbi.hash | 3 +++
package/libdbi/libdbi.mk | 15 +++++++++++++++
5 files changed, 30 insertions(+)
create mode 100644 package/libdbi/Config.in
create mode 100644 package/libdbi/libdbi.hash
create mode 100644 package/libdbi/libdbi.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 1f977190ab..30bf29ffd6 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1148,6 +1148,9 @@ F: package/sysrepo/
N: Henrique Camargo <henrique@henriquecamargo.com>
F: package/json-glib/
+N: Hervé Codina <herve.codina@bootlin.com>
+F: package/libdbi/
+
N: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp>
F: package/gauche/
F: package/gmrender-resurrect/
@@ -1980,6 +1983,7 @@ F: configs/galileo_defconfig
N: Nicolas Carrier <nicolas.carrier@orolia.com>
F: package/bmap-tools/
+F: package/libdbi/
F: package/php-xdebug/
F: package/python-augeas/
F: package/python-flask-expects-json/
diff --git a/package/Config.in b/package/Config.in
index 2f83c87582..1b07eed5e0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1414,6 +1414,7 @@ menu "Database"
source "package/hiredis/Config.in"
source "package/kompexsqlite/Config.in"
source "package/leveldb/Config.in"
+ source "package/libdbi/Config.in"
source "package/libgit2/Config.in"
source "package/libmdbx/Config.in"
source "package/libodb/Config.in"
diff --git a/package/libdbi/Config.in b/package/libdbi/Config.in
new file mode 100644
index 0000000000..ded2bc6e53
--- /dev/null
+++ b/package/libdbi/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBDBI
+ bool "lidbi"
+ help
+ libdbi implements a database-independent abstraction layer
+ in C, similar to the DBI/DBD layer in Perl.
+
+ http://libdbi.sourceforge.net
diff --git a/package/libdbi/libdbi.hash b/package/libdbi/libdbi.hash
new file mode 100644
index 0000000000..6bece66bea
--- /dev/null
+++ b/package/libdbi/libdbi.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 958475e0010a3d8e43ce9ecd6a64d25eacca6ada46c39bc69f949dd70f92ab7a libdbi-88b8477d57153b9f736dd19d432d3b7ab1c49073-br1.tar.gz
+sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING
diff --git a/package/libdbi/libdbi.mk b/package/libdbi/libdbi.mk
new file mode 100644
index 0000000000..92025077bb
--- /dev/null
+++ b/package/libdbi/libdbi.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libdbi
+#
+################################################################################
+
+LIBDBI_VERSION = 88b8477d57153b9f736dd19d432d3b7ab1c49073
+LIBDBI_SITE = https://git.code.sf.net/p/libdbi/libdbi
+LIBDBI_SITE_METHOD = git
+LIBDBI_LICENSE = LGPL-2.1+
+LIBDBI_LICENSE_FILES = COPYING
+LIBDBI_INSTALL_STAGING = YES
+LIBDBI_AUTORECONF = YES
+
+$(eval $(autotools-package))
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/3] package/libdbi: new package
2021-10-04 12:43 ` [Buildroot] [PATCH 1/3] package/libdbi: new package Herve Codina
@ 2021-10-13 18:09 ` Arnout Vandecappelle
0 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle @ 2021-10-13 18:09 UTC (permalink / raw)
To: Herve Codina, buildroot; +Cc: Thomas Petazzoni
On 04/10/2021 14:43, Herve Codina wrote:
> libdbi implements a database-independent abstraction layer in C,
> similar to the DBI/DBD layer in Perl.
>
> http://libdbi.sourceforge.net/
>
> Based on initial work from Nicolas Carrier <nicolas.carrier@orolia.com>
>
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> ---
> DEVELOPERS | 4 ++++
> package/Config.in | 1 +
> package/libdbi/Config.in | 7 +++++++
> package/libdbi/libdbi.hash | 3 +++
> package/libdbi/libdbi.mk | 15 +++++++++++++++
> 5 files changed, 30 insertions(+)
> create mode 100644 package/libdbi/Config.in
> create mode 100644 package/libdbi/libdbi.hash
> create mode 100644 package/libdbi/libdbi.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 1f977190ab..30bf29ffd6 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1148,6 +1148,9 @@ F: package/sysrepo/
> N: Henrique Camargo <henrique@henriquecamargo.com>
> F: package/json-glib/
>
> +N: Hervé Codina <herve.codina@bootlin.com>
> +F: package/libdbi/
> +
> N: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp>
> F: package/gauche/
> F: package/gmrender-resurrect/
> @@ -1980,6 +1983,7 @@ F: configs/galileo_defconfig
>
> N: Nicolas Carrier <nicolas.carrier@orolia.com>
> F: package/bmap-tools/
> +F: package/libdbi/
> F: package/php-xdebug/
> F: package/python-augeas/
> F: package/python-flask-expects-json/
> diff --git a/package/Config.in b/package/Config.in
> index 2f83c87582..1b07eed5e0 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1414,6 +1414,7 @@ menu "Database"
> source "package/hiredis/Config.in"
> source "package/kompexsqlite/Config.in"
> source "package/leveldb/Config.in"
> + source "package/libdbi/Config.in"
> source "package/libgit2/Config.in"
> source "package/libmdbx/Config.in"
> source "package/libodb/Config.in"
> diff --git a/package/libdbi/Config.in b/package/libdbi/Config.in
> new file mode 100644
> index 0000000000..ded2bc6e53
> --- /dev/null
> +++ b/package/libdbi/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_LIBDBI
> + bool "lidbi"
> + help
> + libdbi implements a database-independent abstraction layer
> + in C, similar to the DBI/DBD layer in Perl.
> +
> + http://libdbi.sourceforge.net
> diff --git a/package/libdbi/libdbi.hash b/package/libdbi/libdbi.hash
> new file mode 100644
> index 0000000000..6bece66bea
> --- /dev/null
> +++ b/package/libdbi/libdbi.hash
> @@ -0,0 +1,3 @@
> +# Locally computed:
> +sha256 958475e0010a3d8e43ce9ecd6a64d25eacca6ada46c39bc69f949dd70f92ab7a libdbi-88b8477d57153b9f736dd19d432d3b7ab1c49073-br1.tar.gz
> +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING
Changed to two spaces.
> diff --git a/package/libdbi/libdbi.mk b/package/libdbi/libdbi.mk
> new file mode 100644
> index 0000000000..92025077bb
> --- /dev/null
> +++ b/package/libdbi/libdbi.mk
> @@ -0,0 +1,15 @@
> +################################################################################
> +#
> +# libdbi
> +#
> +################################################################################
> +
> +LIBDBI_VERSION = 88b8477d57153b9f736dd19d432d3b7ab1c49073
> +LIBDBI_SITE = https://git.code.sf.net/p/libdbi/libdbi
> +LIBDBI_SITE_METHOD = git
> +LIBDBI_LICENSE = LGPL-2.1+
> +LIBDBI_LICENSE_FILES = COPYING
> +LIBDBI_INSTALL_STAGING = YES
> +LIBDBI_AUTORECONF = YES
I've added a comment above to explain why this is needed.
Applied to master with those two fixed, thanks.
Regards,
Arnout
> +
> +$(eval $(autotools-package))
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/3] package/libdbi-drivers: new package
2021-10-04 12:43 [Buildroot] [PATCH 0/3] new libdbi and libdbi-drivers packages Herve Codina
2021-10-04 12:43 ` [Buildroot] [PATCH 1/3] package/libdbi: new package Herve Codina
@ 2021-10-04 12:43 ` Herve Codina
2021-10-13 18:11 ` Arnout Vandecappelle
2021-10-04 12:43 ` [Buildroot] [PATCH 3/3] package/collectd: add dbi support Herve Codina
2 siblings, 1 reply; 8+ messages in thread
From: Herve Codina @ 2021-10-04 12:43 UTC (permalink / raw)
To: buildroot; +Cc: Herve Codina, Thomas Petazzoni
The libdbi-drivers project provides the database-specific drivers
for the libdbi framework
http://libdbi-drivers.sourceforge.net/
Based on initial work from Nicolas Carrier <nicolas.carrier@orolia.com>
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
DEVELOPERS | 2 +
package/Config.in | 1 +
...CONFIG-variable-instead-of-mysql_con.patch | 47 ++++++++++++++++++
package/libdbi-drivers/Config.in | 8 ++++
package/libdbi-drivers/libdbi-drivers.hash | 3 ++
package/libdbi-drivers/libdbi-drivers.mk | 48 +++++++++++++++++++
6 files changed, 109 insertions(+)
create mode 100644 package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch
create mode 100644 package/libdbi-drivers/Config.in
create mode 100644 package/libdbi-drivers/libdbi-drivers.hash
create mode 100644 package/libdbi-drivers/libdbi-drivers.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 30bf29ffd6..b954c58953 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1150,6 +1150,7 @@ F: package/json-glib/
N: Hervé Codina <herve.codina@bootlin.com>
F: package/libdbi/
+F: package/libdbi-drivers/
N: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp>
F: package/gauche/
@@ -1984,6 +1985,7 @@ F: configs/galileo_defconfig
N: Nicolas Carrier <nicolas.carrier@orolia.com>
F: package/bmap-tools/
F: package/libdbi/
+F: package/libdbi-drivers/
F: package/php-xdebug/
F: package/python-augeas/
F: package/python-flask-expects-json/
diff --git a/package/Config.in b/package/Config.in
index 1b07eed5e0..a6572feb3b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1415,6 +1415,7 @@ menu "Database"
source "package/kompexsqlite/Config.in"
source "package/leveldb/Config.in"
source "package/libdbi/Config.in"
+ source "package/libdbi-drivers/Config.in"
source "package/libgit2/Config.in"
source "package/libmdbx/Config.in"
source "package/libodb/Config.in"
diff --git a/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch b/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch
new file mode 100644
index 0000000000..66e99c430f
--- /dev/null
+++ b/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch
@@ -0,0 +1,47 @@
+From bc966656d8598a6d87c901a67ecdb91c436f4939 Mon Sep 17 00:00:00 2001
+From: Herve Codina <herve.codina@bootlin.com>
+Date: Wed, 29 Sep 2021 15:08:33 +0200
+Subject: [PATCH] build: Use MYSQL_CONFIG variable instead of
+ 'mysql_config'
+
+The MYSQL_CONFIG variable is used to check 'mysql_config' prog.
+This variable can be override by the user but was not used for
+retrieving MYSQL_INCLUDE, MYSQL_LIBS, ...
+
+This commit replaces the hardcoded usage of 'mysql_config' by
+the use of MYSQL_CONFIG variable.
+
+This lead to 'MYSQL_CONFIG=/some/where/mysql_config ./configure'
+command to work properly.
+
+Signed-off-by: Herve Codina <herve.codina@bootlin.com>
+---
+ acinclude.m4 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index e99318f..9dd2b0f 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -116,15 +116,15 @@ if test "$ac_mysql" = "yes"; then
+ fi
+
+ if test "$ac_mysql_incdir" = "no"; then
+- MYSQL_INCLUDE=`mysql_config --include`
++ MYSQL_INCLUDE=`$MYSQL_CONFIG --include`
+ else
+ MYSQL_INCLUDE=-I$ac_mysql_incdir
+ fi
+ if test "$ac_mysql_libdir" = "no"; then
+ if test "$ac_mysql_threadsafe" = "YES"; then
+- MYSQL_LIBS=`mysql_config --libs_r`
++ MYSQL_LIBS=`$MYSQL_CONFIG --libs_r`
+ else
+- MYSQL_LIBS=`mysql_config --libs`
++ MYSQL_LIBS=`$MYSQL_CONFIG --libs`
+ fi
+ else
+ if test "$ac_mysql_threadsafe" = "YES"; then
+--
+2.31.1
+
diff --git a/package/libdbi-drivers/Config.in b/package/libdbi-drivers/Config.in
new file mode 100644
index 0000000000..087e6aaf0e
--- /dev/null
+++ b/package/libdbi-drivers/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBDBI_DRIVERS
+ bool "libdbi-drivers"
+ select BR2_PACKAGE_LIBDBI
+ help
+ The libdbi-drivers project provides the
+ database-specific drivers for the libdbi framework.
+
+ http://libdbi-drivers.sourceforge.net
diff --git a/package/libdbi-drivers/libdbi-drivers.hash b/package/libdbi-drivers/libdbi-drivers.hash
new file mode 100644
index 0000000000..73a8daa54c
--- /dev/null
+++ b/package/libdbi-drivers/libdbi-drivers.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 0237c8006cefd6873f0b43d9676b14d5674270adf5e7501cd0e3423ff5b41549 libdbi-drivers-7a8e24ec1cf763226f4be31ba1018d888d4989f3-br1.tar.gz
+sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING
diff --git a/package/libdbi-drivers/libdbi-drivers.mk b/package/libdbi-drivers/libdbi-drivers.mk
new file mode 100644
index 0000000000..78d1c61515
--- /dev/null
+++ b/package/libdbi-drivers/libdbi-drivers.mk
@@ -0,0 +1,48 @@
+################################################################################
+#
+# libdbi-drivers
+#
+################################################################################
+
+LIBDBI_DRIVERS_VERSION = 7a8e24ec1cf763226f4be31ba1018d888d4989f3
+LIBDBI_DRIVERS_SITE = https://git.code.sf.net/p/libdbi-drivers/libdbi-drivers
+LIBDBI_DRIVERS_SITE_METHOD = git
+LIBDBI_DRIVERS_LICENSE = LGPL-2.1+
+LIBDBI_DRIVERS_LICENSE_FILES = COPYING
+LIBDBI_DRIVERS_INSTALL_STAGING = YES
+LIBDBI_DRIVERS_DEPENDENCIES = libdbi host-pkgconf
+LIBDBI_DRIVERS_AUTORECONF = YES
+
+LIBDBI_DRIVERS_CONF_OPTS = --with-dbi-libdir=$(STAGING_DIR)/usr/lib
+
+ifeq ($(BR2_PACKAGE_MYSQL),y)
+LIBDBI_DRIVERS_DEPENDENCIES += mysql
+LIBDBI_DRIVERS_CONF_OPTS += --with-mysql
+LIBDBI_DRIVERS_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
+else
+LIBDBI_DRIVERS_CONF_OPTS += --without-mysql
+endif
+
+ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
+LIBDBI_DRIVERS_DEPENDENCIES += postgresql
+LIBDBI_DRIVERS_CONF_OPTS += --with-pgsql
+else
+LIBDBI_DRIVERS_CONF_OPTS += --without-pgsql
+endif
+
+LIBDBI_DRIVERS_CONF_OPTS += --without-sqlite
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+LIBDBI_DRIVERS_DEPENDENCIES += sqlite
+LIBDBI_DRIVERS_CONF_OPTS += --with-sqlite3
+else
+LIBDBI_DRIVERS_CONF_OPTS += --without-sqlite3
+endif
+
+LIBDBI_DRIVERS_CONF_OPTS += --without-msql # MiniSQL
+LIBDBI_DRIVERS_CONF_OPTS += --without-oracle # Oracle OCI
+LIBDBI_DRIVERS_CONF_OPTS += --without-firebird # Firebird/Interbase
+LIBDBI_DRIVERS_CONF_OPTS += --without-freetds # Freetds
+LIBDBI_DRIVERS_CONF_OPTS += --without-ingres # Ingres
+LIBDBI_DRIVERS_CONF_OPTS += --without-db2 # IBM DB2
+
+$(eval $(autotools-package))
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 2/3] package/libdbi-drivers: new package
2021-10-04 12:43 ` [Buildroot] [PATCH 2/3] package/libdbi-drivers: " Herve Codina
@ 2021-10-13 18:11 ` Arnout Vandecappelle
2021-10-14 8:17 ` Herve Codina
0 siblings, 1 reply; 8+ messages in thread
From: Arnout Vandecappelle @ 2021-10-13 18:11 UTC (permalink / raw)
To: Herve Codina, buildroot; +Cc: Thomas Petazzoni
On 04/10/2021 14:43, Herve Codina wrote:
> The libdbi-drivers project provides the database-specific drivers
> for the libdbi framework
>
> http://libdbi-drivers.sourceforge.net/
>
> Based on initial work from Nicolas Carrier <nicolas.carrier@orolia.com>
>
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> ---
> DEVELOPERS | 2 +
> package/Config.in | 1 +
> ...CONFIG-variable-instead-of-mysql_con.patch | 47 ++++++++++++++++++
> package/libdbi-drivers/Config.in | 8 ++++
> package/libdbi-drivers/libdbi-drivers.hash | 3 ++
> package/libdbi-drivers/libdbi-drivers.mk | 48 +++++++++++++++++++
> 6 files changed, 109 insertions(+)
> create mode 100644 package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch
> create mode 100644 package/libdbi-drivers/Config.in
> create mode 100644 package/libdbi-drivers/libdbi-drivers.hash
> create mode 100644 package/libdbi-drivers/libdbi-drivers.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 30bf29ffd6..b954c58953 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1150,6 +1150,7 @@ F: package/json-glib/
>
> N: Hervé Codina <herve.codina@bootlin.com>
> F: package/libdbi/
> +F: package/libdbi-drivers/
>
> N: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp>
> F: package/gauche/
> @@ -1984,6 +1985,7 @@ F: configs/galileo_defconfig
> N: Nicolas Carrier <nicolas.carrier@orolia.com>
> F: package/bmap-tools/
> F: package/libdbi/
> +F: package/libdbi-drivers/
> F: package/php-xdebug/
> F: package/python-augeas/
> F: package/python-flask-expects-json/
> diff --git a/package/Config.in b/package/Config.in
> index 1b07eed5e0..a6572feb3b 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1415,6 +1415,7 @@ menu "Database"
> source "package/kompexsqlite/Config.in"
> source "package/leveldb/Config.in"
> source "package/libdbi/Config.in"
> + source "package/libdbi-drivers/Config.in"
> source "package/libgit2/Config.in"
> source "package/libmdbx/Config.in"
> source "package/libodb/Config.in"
> diff --git a/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch b/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch
> new file mode 100644
> index 0000000000..66e99c430f
> --- /dev/null
> +++ b/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch
> @@ -0,0 +1,47 @@
> +From bc966656d8598a6d87c901a67ecdb91c436f4939 Mon Sep 17 00:00:00 2001
> +From: Herve Codina <herve.codina@bootlin.com>
> +Date: Wed, 29 Sep 2021 15:08:33 +0200
> +Subject: [PATCH] build: Use MYSQL_CONFIG variable instead of
> + 'mysql_config'
> +
> +The MYSQL_CONFIG variable is used to check 'mysql_config' prog.
> +This variable can be override by the user but was not used for
> +retrieving MYSQL_INCLUDE, MYSQL_LIBS, ...
> +
> +This commit replaces the hardcoded usage of 'mysql_config' by
> +the use of MYSQL_CONFIG variable.
> +
> +This lead to 'MYSQL_CONFIG=/some/where/mysql_config ./configure'
> +command to work properly.
> +
> +Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Please send the patch upstream to the mailing list [1]. Normally, I'd also
want an upstream link here, but I've already applied.
Regards,
Arnout
[1] https://sourceforge.net/projects/libdbi-drivers/lists/libdbi-drivers-devel
> +---
> + acinclude.m4 | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/acinclude.m4 b/acinclude.m4
> +index e99318f..9dd2b0f 100644
> +--- a/acinclude.m4
> ++++ b/acinclude.m4
> +@@ -116,15 +116,15 @@ if test "$ac_mysql" = "yes"; then
> + fi
> +
> + if test "$ac_mysql_incdir" = "no"; then
> +- MYSQL_INCLUDE=`mysql_config --include`
> ++ MYSQL_INCLUDE=`$MYSQL_CONFIG --include`
> + else
> + MYSQL_INCLUDE=-I$ac_mysql_incdir
> + fi
> + if test "$ac_mysql_libdir" = "no"; then
> + if test "$ac_mysql_threadsafe" = "YES"; then
> +- MYSQL_LIBS=`mysql_config --libs_r`
> ++ MYSQL_LIBS=`$MYSQL_CONFIG --libs_r`
> + else
> +- MYSQL_LIBS=`mysql_config --libs`
> ++ MYSQL_LIBS=`$MYSQL_CONFIG --libs`
> + fi
> + else
> + if test "$ac_mysql_threadsafe" = "YES"; then
> +--
> +2.31.1
> +
> diff --git a/package/libdbi-drivers/Config.in b/package/libdbi-drivers/Config.in
> new file mode 100644
> index 0000000000..087e6aaf0e
> --- /dev/null
> +++ b/package/libdbi-drivers/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_LIBDBI_DRIVERS
> + bool "libdbi-drivers"
> + select BR2_PACKAGE_LIBDBI
> + help
> + The libdbi-drivers project provides the
> + database-specific drivers for the libdbi framework.
> +
> + http://libdbi-drivers.sourceforge.net
> diff --git a/package/libdbi-drivers/libdbi-drivers.hash b/package/libdbi-drivers/libdbi-drivers.hash
> new file mode 100644
> index 0000000000..73a8daa54c
> --- /dev/null
> +++ b/package/libdbi-drivers/libdbi-drivers.hash
> @@ -0,0 +1,3 @@
> +# Locally computed
> +sha256 0237c8006cefd6873f0b43d9676b14d5674270adf5e7501cd0e3423ff5b41549 libdbi-drivers-7a8e24ec1cf763226f4be31ba1018d888d4989f3-br1.tar.gz
> +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING
> diff --git a/package/libdbi-drivers/libdbi-drivers.mk b/package/libdbi-drivers/libdbi-drivers.mk
> new file mode 100644
> index 0000000000..78d1c61515
> --- /dev/null
> +++ b/package/libdbi-drivers/libdbi-drivers.mk
> @@ -0,0 +1,48 @@
> +################################################################################
> +#
> +# libdbi-drivers
> +#
> +################################################################################
> +
> +LIBDBI_DRIVERS_VERSION = 7a8e24ec1cf763226f4be31ba1018d888d4989f3
> +LIBDBI_DRIVERS_SITE = https://git.code.sf.net/p/libdbi-drivers/libdbi-drivers
> +LIBDBI_DRIVERS_SITE_METHOD = git
> +LIBDBI_DRIVERS_LICENSE = LGPL-2.1+
> +LIBDBI_DRIVERS_LICENSE_FILES = COPYING
> +LIBDBI_DRIVERS_INSTALL_STAGING = YES
> +LIBDBI_DRIVERS_DEPENDENCIES = libdbi host-pkgconf
> +LIBDBI_DRIVERS_AUTORECONF = YES
> +
> +LIBDBI_DRIVERS_CONF_OPTS = --with-dbi-libdir=$(STAGING_DIR)/usr/lib
> +
> +ifeq ($(BR2_PACKAGE_MYSQL),y)
> +LIBDBI_DRIVERS_DEPENDENCIES += mysql
> +LIBDBI_DRIVERS_CONF_OPTS += --with-mysql
> +LIBDBI_DRIVERS_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
> +else
> +LIBDBI_DRIVERS_CONF_OPTS += --without-mysql
> +endif
> +
> +ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
> +LIBDBI_DRIVERS_DEPENDENCIES += postgresql
> +LIBDBI_DRIVERS_CONF_OPTS += --with-pgsql
> +else
> +LIBDBI_DRIVERS_CONF_OPTS += --without-pgsql
> +endif
> +
> +LIBDBI_DRIVERS_CONF_OPTS += --without-sqlite
> +ifeq ($(BR2_PACKAGE_SQLITE),y)
> +LIBDBI_DRIVERS_DEPENDENCIES += sqlite
> +LIBDBI_DRIVERS_CONF_OPTS += --with-sqlite3
> +else
> +LIBDBI_DRIVERS_CONF_OPTS += --without-sqlite3
> +endif
> +
> +LIBDBI_DRIVERS_CONF_OPTS += --without-msql # MiniSQL
> +LIBDBI_DRIVERS_CONF_OPTS += --without-oracle # Oracle OCI
> +LIBDBI_DRIVERS_CONF_OPTS += --without-firebird # Firebird/Interbase
> +LIBDBI_DRIVERS_CONF_OPTS += --without-freetds # Freetds
> +LIBDBI_DRIVERS_CONF_OPTS += --without-ingres # Ingres
> +LIBDBI_DRIVERS_CONF_OPTS += --without-db2 # IBM DB2
> +
> +$(eval $(autotools-package))
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 2/3] package/libdbi-drivers: new package
2021-10-13 18:11 ` Arnout Vandecappelle
@ 2021-10-14 8:17 ` Herve Codina
0 siblings, 0 replies; 8+ messages in thread
From: Herve Codina @ 2021-10-14 8:17 UTC (permalink / raw)
To: Arnout Vandecappelle; +Cc: Thomas Petazzoni, buildroot
Hi,
On Wed, 13 Oct 2021 20:11:12 +0200
Arnout Vandecappelle <arnout@mind.be> wrote:
> > +From bc966656d8598a6d87c901a67ecdb91c436f4939 Mon Sep 17 00:00:00 2001
> > +From: Herve Codina <herve.codina@bootlin.com>
> > +Date: Wed, 29 Sep 2021 15:08:33 +0200
> > +Subject: [PATCH] build: Use MYSQL_CONFIG variable instead of
> > + 'mysql_config'
> > +
> > +The MYSQL_CONFIG variable is used to check 'mysql_config' prog.
> > +This variable can be override by the user but was not used for
> > +retrieving MYSQL_INCLUDE, MYSQL_LIBS, ...
> > +
> > +This commit replaces the hardcoded usage of 'mysql_config' by
> > +the use of MYSQL_CONFIG variable.
> > +
> > +This lead to 'MYSQL_CONFIG=/some/where/mysql_config ./configure'
> > +command to work properly.
> > +
> > +Signed-off-by: Herve Codina <herve.codina@bootlin.com>
>
> Please send the patch upstream to the mailing list [1]. Normally, I'd also
> want an upstream link here, but I've already applied.
>
>
> Regards,
> Arnout
>
> [1] https://sourceforge.net/projects/libdbi-drivers/lists/libdbi-drivers-devel
Done:
https://sourceforge.net/p/libdbi-drivers/mailman/libdbi-drivers-devel/thread/20211014071713.1702398-1-herve.codina%40bootlin.com/
Best regards,
Hervé
--
Hervé Codina, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] package/collectd: add dbi support
2021-10-04 12:43 [Buildroot] [PATCH 0/3] new libdbi and libdbi-drivers packages Herve Codina
2021-10-04 12:43 ` [Buildroot] [PATCH 1/3] package/libdbi: new package Herve Codina
2021-10-04 12:43 ` [Buildroot] [PATCH 2/3] package/libdbi-drivers: " Herve Codina
@ 2021-10-04 12:43 ` Herve Codina
2021-10-13 18:12 ` Arnout Vandecappelle
2 siblings, 1 reply; 8+ messages in thread
From: Herve Codina @ 2021-10-04 12:43 UTC (permalink / raw)
To: buildroot; +Cc: Herve Codina, Asaf Kahlon
The DBI plugin uses libdbi, a database abstraction library,
to execute SQL statements on a database and read back the
result.
https://collectd.org/wiki/index.php/Plugin:DBI
Based on initial work from Nicolas Carrier <nicolas.carrier@orolia.com>
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
package/collectd/Config.in | 7 +++++++
package/collectd/collectd.mk | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 82c24fdbc3..d44d4e4913 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -212,6 +212,13 @@ config BR2_PACKAGE_COLLECTD_CURL_XML
help
Reads files using libcurl and parses it as XML.
+config BR2_PACKAGE_COLLECTD_DBI
+ bool "dbi"
+ select BR2_PACKAGE_LIBDBI
+ help
+ Executes SQL statements on various databases and
+ interprets the returned data.
+
config BR2_PACKAGE_COLLECTD_DF
bool "df"
help
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 9bfbc784ab..d01058471d 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -17,7 +17,7 @@ COLLECTD_SELINUX_MODULES = apache collectd
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = \
- apple_sensors aquaero ascent barometer dbi dpdkstat email \
+ apple_sensors aquaero ascent barometer dpdkstat email \
gmond hddtemp intel_rdt ipmi java lpar \
madwifi mbmon mic multimeter netapp notify_desktop numa \
oracle perl pf pinba powerdns python routeros \
@@ -67,6 +67,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \
$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \
$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),--enable-curl_xml,--disable-curl_xml) \
+ $(if $(BR2_PACKAGE_COLLECTD_DBI),--enable-dbi,--disable-dbi) \
$(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \
$(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \
$(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \
@@ -168,6 +169,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \
$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \
+ $(if $(BR2_PACKAGE_COLLECTD_DBI),libdbi) \
$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
$(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \
$(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/collectd: add dbi support
2021-10-04 12:43 ` [Buildroot] [PATCH 3/3] package/collectd: add dbi support Herve Codina
@ 2021-10-13 18:12 ` Arnout Vandecappelle
0 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle @ 2021-10-13 18:12 UTC (permalink / raw)
To: Herve Codina, buildroot; +Cc: Asaf Kahlon
On 04/10/2021 14:43, Herve Codina wrote:
> The DBI plugin uses libdbi, a database abstraction library,
> to execute SQL statements on a database and read back the
> result.
>
> https://collectd.org/wiki/index.php/Plugin:DBI
>
> Based on initial work from Nicolas Carrier <nicolas.carrier@orolia.com>
>
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/collectd/Config.in | 7 +++++++
> package/collectd/collectd.mk | 4 +++-
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/package/collectd/Config.in b/package/collectd/Config.in
> index 82c24fdbc3..d44d4e4913 100644
> --- a/package/collectd/Config.in
> +++ b/package/collectd/Config.in
> @@ -212,6 +212,13 @@ config BR2_PACKAGE_COLLECTD_CURL_XML
> help
> Reads files using libcurl and parses it as XML.
>
> +config BR2_PACKAGE_COLLECTD_DBI
> + bool "dbi"
> + select BR2_PACKAGE_LIBDBI
> + help
> + Executes SQL statements on various databases and
> + interprets the returned data.
> +
> config BR2_PACKAGE_COLLECTD_DF
> bool "df"
> help
> diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> index 9bfbc784ab..d01058471d 100644
> --- a/package/collectd/collectd.mk
> +++ b/package/collectd/collectd.mk
> @@ -17,7 +17,7 @@ COLLECTD_SELINUX_MODULES = apache collectd
>
> # These require unmet dependencies, are fringe, pointless or deprecated
> COLLECTD_PLUGINS_DISABLE = \
> - apple_sensors aquaero ascent barometer dbi dpdkstat email \
> + apple_sensors aquaero ascent barometer dpdkstat email \
> gmond hddtemp intel_rdt ipmi java lpar \
> madwifi mbmon mic multimeter netapp notify_desktop numa \
> oracle perl pf pinba powerdns python routeros \
> @@ -67,6 +67,7 @@ COLLECTD_CONF_OPTS += \
> $(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \
> $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \
> $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),--enable-curl_xml,--disable-curl_xml) \
> + $(if $(BR2_PACKAGE_COLLECTD_DBI),--enable-dbi,--disable-dbi) \
> $(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \
> $(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \
> $(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \
> @@ -168,6 +169,7 @@ COLLECTD_DEPENDENCIES = \
> $(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
> $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \
> $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \
> + $(if $(BR2_PACKAGE_COLLECTD_DBI),libdbi) \
> $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
> $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \
> $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread