[Buildroot] [PATCH v2 1/3] mariadb: move comments outside of define block

[Buildroot] [PATCH v2 1/3] mariadb: move comments outside of define block

[Ryan Coe]

There are two comments inside the post install define block that show up in
the build. Fix this by moving the comments outside the block.

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
 package/mariadb/mariadb.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index ce846d9cda..e395d387e5 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -104,13 +104,13 @@ define MARIADB_INSTALL_INIT_SYSTEMD
 endef
 endif
 
+# We don't need mysql_config on the target as it's only useful in staging
+# We also don't need the test suite on the target
 define MARIADB_POST_INSTALL
 	mkdir -p $(TARGET_DIR)/var/lib/mysql
 	$(INSTALL) -D -m 644 $(TARGET_DIR)/usr/share/mysql/my-small.cnf \
 		$(TARGET_DIR)/etc/mysql/my.cnf
-	# We don't need this on the target as it's only useful in staging
 	$(RM) $(TARGET_DIR)/usr/bin/mysql_config
-	# Remove test suite
 	$(RM) -r $(TARGET_DIR)/usr/share/mysql/test
 endef
 
-- 
2.18.0

[Buildroot] [PATCH v2 2/3] mariadb: needs dynamic library support

[Ryan Coe]

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
 package/mysql/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/mysql/Config.in b/package/mysql/Config.in
index 278dc73e57..abda1880f2 100644
--- a/package/mysql/Config.in
+++ b/package/mysql/Config.in
@@ -17,6 +17,7 @@ choice
 config BR2_PACKAGE_MARIADB
 	bool "mariadb"
 	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
+	depends on !BR2_STATIC_LIBS #dlopen
 	select BR2_PACKAGE_LIBAIO
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_NCURSES
@@ -70,6 +71,10 @@ config BR2_PACKAGE_PROVIDES_MYSQL
 
 endif
 
+comment "mariadb needs a toolchain w/ dynamic library"
+	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
+	depends on BR2_STATIC_LIBS
+
 comment "mysql needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-- 
2.18.0

[Buildroot] [PATCH v2 3/3] mariadb: bump version to 10.2.16

[Ryan Coe]

Release notes: https://mariadb.com/kb/en/mariadb-10216-release-notes/
Changelog: https://mariadb.com/kb/en/mariadb-10216-changelog/

Note that HOST_MARIADB_CONF_OPTS += -DWITH_SSL=bundled has been changed to
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF in order to prevent the following
configure error:

CMake Error at /usr/share/cmake-3.11/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
  Could NOT find GnuTLS (missing: GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
  (Required is at least version "3.3.24")
Call Stack (most recent call first):
  /usr/share/cmake-3.11/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE)
  /usr/share/cmake-3.11/Modules/FindGnuTLS.cmake:54 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
  libmariadb/CMakeLists.txt:303 (FIND_PACKAGE)

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
 package/mariadb/mariadb.hash | 6 +++---
 package/mariadb/mariadb.mk   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash
index 7eea62ab7b..97fc1d8262 100644
--- a/package/mariadb/mariadb.hash
+++ b/package/mariadb/mariadb.hash
@@ -1,6 +1,6 @@
-# From https://downloads.mariadb.org/mariadb/10.1.33/
-sha256 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d  mariadb-10.1.33.tar.gz
+# From https://downloads.mariadb.org/mariadb/10.2.16/
+sha256 c182ee93bacee9c1395a4cece56acfc433bc5153ec627c4898927b93eee54dc4  mariadb-10.2.16.tar.gz
 
 # Hash for license files
-sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a  README
+sha256 dec3c92fdc58070facec08db681aa6b9cb05fd21e463358161c1df92e1c0653f  README.md
 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index e395d387e5..c60ba3b4d8 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-MARIADB_VERSION = 10.1.33
+MARIADB_VERSION = 10.2.16
 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
 MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
 # Tarball no longer contains LGPL license text
 # https://jira.mariadb.org/browse/MDEV-12297
-MARIADB_LICENSE_FILES = README COPYING
+MARIADB_LICENSE_FILES = README.md COPYING
 MARIADB_INSTALL_STAGING = YES
 MARIADB_PROVIDES = mysql
 
@@ -67,7 +67,7 @@ MARIADB_CONF_OPTS += \
 	-DMYSQL_DATADIR=/var/lib/mysql \
 	-DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET)
 
-HOST_MARIADB_CONF_OPTS += -DWITH_SSL=bundled
+HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF
 
 # Some helpers must be compiled for host in order to crosscompile mariadb for
 # the target. They are then included by import_executables.cmake which is
-- 
2.18.0

[Buildroot] [PATCH v2 1/3] mariadb: move comments outside of define block

[Thomas Petazzoni]

Hello,

On Thu, 26 Jul 2018 09:37:01 -0700, Ryan Coe wrote:
> There are two comments inside the post install define block that show up in
> the build. Fix this by moving the comments outside the block.
> 
> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
> ---
>  package/mariadb/mariadb.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

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

[Buildroot] [PATCH v2 2/3] mariadb: needs dynamic library support

[Thomas Petazzoni]

Hello Ryan,

On Thu, 26 Jul 2018 09:37:02 -0700, Ryan Coe wrote:
> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
> ---
>  package/mysql/Config.in | 5 +++++
>  1 file changed, 5 insertions(+)

An empty commit log for this kind of change is really not good. How did
you realize it needs dynamic library support ? Why there is no
autobuilder failure ? How does it fail to build ?

I've improved the commit log and applied, but for future patches, it
would really be nice to have more detailed commit logs.

Thanks a lot!

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

[Buildroot] [PATCH v2 3/3] mariadb: bump version to 10.2.16

[Thomas Petazzoni]

Hello,

On Thu, 26 Jul 2018 09:37:03 -0700, Ryan Coe wrote:
> Release notes: https://mariadb.com/kb/en/mariadb-10216-release-notes/
> Changelog: https://mariadb.com/kb/en/mariadb-10216-changelog/
> 
> Note that HOST_MARIADB_CONF_OPTS += -DWITH_SSL=bundled has been changed to
> HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF in order to prevent the following
> configure error:
> 
> CMake Error at /usr/share/cmake-3.11/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
>   Could NOT find GnuTLS (missing: GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
>   (Required is at least version "3.3.24")
> Call Stack (most recent call first):
>   /usr/share/cmake-3.11/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE)
>   /usr/share/cmake-3.11/Modules/FindGnuTLS.cmake:54 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
>   libmariadb/CMakeLists.txt:303 (FIND_PACKAGE)
> 
> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>

With this commit applied, the following defconfig fails to build:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2018.05.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_MYSQL=y
BR2_PACKAGE_MARIADB=y
BR2_PACKAGE_MARIADB_SERVER=y
# BR2_TARGET_ROOTFS_TAR is not set

It fails with:

/home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:327:38: error: field ?result? has incomplete type ?std::promise<rocksdb::BackupEngineImpl::CopyOrCreateResult>?
     std::promise<CopyOrCreateResult> result;
                                      ^
/home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:378:37: error: field ?result? has incomplete type ?std::future<rocksdb::BackupEngineImpl::CopyOrCreateResult>?
     std::future<CopyOrCreateResult> result;
                                     ^
/home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:425:37: error: field ?result? has incomplete type ?std::future<rocksdb::BackupEngineImpl::CopyOrCreateResult>?
     std::future<CopyOrCreateResult> result;
                                     ^
/home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc: In member function ?rocksdb::Status rocksdb::BackupEngineImpl::AddBackupFileWorkItem(std::unordered_set<std::basic_string<char> >&, std::vector<rocksdb::BackupEngineImpl::BackupAfterCopyOrCreateWorkItem>&, rocksdb::BackupID, bool, const string&, const string&, rocksdb::RateLimiter*, uint64_t, uint64_t, bool, std::function<void()>, const string&)?:
/home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:1366:38: error: aggregate ?std::promise<rocksdb::BackupEngineImpl::CopyOrCreateResult> promise_result? has incomplete type and cannot be defined
     std::promise<CopyOrCreateResult> promise_result;
                                      ^

Could you have a look and send an updated patch ?

Thanks!

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

[Buildroot] [PATCH v2 3/3] mariadb: bump version to 10.2.16

[Ryan Coe]

Thomas,


On 8/16/2018 2:22 PM, Thomas Petazzoni wrote:
> Hello,
>
> On Thu, 26 Jul 2018 09:37:03 -0700, Ryan Coe wrote:
>> Release notes: https://mariadb.com/kb/en/mariadb-10216-release-notes/
>> Changelog: https://mariadb.com/kb/en/mariadb-10216-changelog/
>>
>> Note that HOST_MARIADB_CONF_OPTS += -DWITH_SSL=bundled has been changed to
>> HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF in order to prevent the following
>> configure error:
>>
>> CMake Error at /usr/share/cmake-3.11/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
>>    Could NOT find GnuTLS (missing: GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
>>    (Required is at least version "3.3.24")
>> Call Stack (most recent call first):
>>    /usr/share/cmake-3.11/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE)
>>    /usr/share/cmake-3.11/Modules/FindGnuTLS.cmake:54 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
>>    libmariadb/CMakeLists.txt:303 (FIND_PACKAGE)
>>
>> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
> With this commit applied, the following defconfig fails to build:
>
> BR2_arm=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
> BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
> BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2018.05.tar.bz2"
> BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
> BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
> # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
> BR2_TOOLCHAIN_EXTERNAL_CXX=y
> BR2_INIT_NONE=y
> BR2_SYSTEM_BIN_SH_NONE=y
> # BR2_PACKAGE_BUSYBOX is not set
> BR2_PACKAGE_MYSQL=y
> BR2_PACKAGE_MARIADB=y
> BR2_PACKAGE_MARIADB_SERVER=y
> # BR2_TARGET_ROOTFS_TAR is not set
>
> It fails with:
>
> /home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:327:38: error: field ?result? has incomplete type ?std::promise<rocksdb::BackupEngineImpl::CopyOrCreateResult>?
>       std::promise<CopyOrCreateResult> result;
>                                        ^
> /home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:378:37: error: field ?result? has incomplete type ?std::future<rocksdb::BackupEngineImpl::CopyOrCreateResult>?
>       std::future<CopyOrCreateResult> result;
>                                       ^
> /home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:425:37: error: field ?result? has incomplete type ?std::future<rocksdb::BackupEngineImpl::CopyOrCreateResult>?
>       std::future<CopyOrCreateResult> result;
>                                       ^
> /home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc: In member function ?rocksdb::Status rocksdb::BackupEngineImpl::AddBackupFileWorkItem(std::unordered_set<std::basic_string<char> >&, std::vector<rocksdb::BackupEngineImpl::BackupAfterCopyOrCreateWorkItem>&, rocksdb::BackupID, bool, const string&, const string&, rocksdb::RateLimiter*, uint64_t, uint64_t, bool, std::function<void()>, const string&)?:
> /home/thomas/projets/buildroot/output/build/mariadb-10.2.16/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:1366:38: error: aggregate ?std::promise<rocksdb::BackupEngineImpl::CopyOrCreateResult> promise_result? has incomplete type and cannot be defined
>       std::promise<CopyOrCreateResult> promise_result;
>                                        ^
>
> Could you have a look and send an updated patch ?
>
> Thanks!
>
> Thomas

I have another patch ready.? I disabled building RocksDB to get rid of 
the build error that was encountered.? Is that acceptable or should I 
work on something else?? Thanks.

-Ryan

[Buildroot] [PATCH v2 3/3] mariadb: bump version to 10.2.16

[Thomas Petazzoni]

Hello,

On Tue, 21 Aug 2018 06:59:51 -0700, Ryan Coe wrote:

> I have another patch ready.? I disabled building RocksDB to get rid of 
> the build error that was encountered.? Is that acceptable or should I 
> work on something else?? Thanks.

I have no idea what RocksDB is. Google tells me: "RocksDB is an
embeddable persistent key-value store for fast storage". Is this a new
optional dependency of MariaDB ? According to
https://mariadb.org/wp-content/uploads/2017/11/shenzhen2017-myrocks-in-mariadb.pdf
it seems to be new in 10.2.

So yes, this is a new thing, you can keep it disabled until someone
else is interested enough to enable/fix it.

Thanks!

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

[Buildroot] [PATCH v2 1/3] mariadb: move comments outside of define block

[Peter Korsgaard]

>>>>> "Ryan" == Ryan Coe <bluemrp9@gmail.com> writes:

 > There are two comments inside the post install define block that show up in
 > the build. Fix this by moving the comments outside the block.

 > Signed-off-by: Ryan Coe <bluemrp9@gmail.com>

Committed to 2018.02.x and 2018.05.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 2/3] mariadb: needs dynamic library support

[Peter Korsgaard]

>>>>> "Ryan" == Ryan Coe <bluemrp9@gmail.com> writes:

 > Signed-off-by: Ryan Coe <bluemrp9@gmail.com>

Committed to 2018.02.x and 2018.05.x, thanks.

-- 
Bye, Peter Korsgaard