NEO: simplify dev SR with experimental RocksDB support

component/mariadb/buildout.cfg

@@ -41,13 +41,11 @@ post-install =
   ln -sf mariadb_config ${:location}/bin/mysql_config
 
 [mariadb]
+<= mariadb-10.1
+
+[mariadb-common]
 recipe = slapos.recipe.cmmi
-url = http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.22/source/mariadb-10.1.22.tar.gz
-md5sum = 8d11f4e20d3ef0bb1befe173de9213c8
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-patch-options = -p0
-patches =
-  ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}
@@ -85,6 +83,14 @@ post-install =
   mkdir -p ${:location}/include/wsrep &&
   cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
 
+[mariadb-10.1]
+<= mariadb-common
+url = http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.22/source/mariadb-10.1.22.tar.gz
+md5sum = 8d11f4e20d3ef0bb1befe173de9213c8
+patch-options = -p0
+patches =
+  ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
+
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/

component/mariadb/mariarocks.cfg

 [buildout]
 extends =
+  ../bison/buildout.cfg
   buildout.cfg
 
 [mariarocks-source]
 recipe = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
 repository = https://github.com/MariaDB/server.git
-branch = 10.2-mariarocks
+branch = bb-10.2-mariarocks
 
-[mariarocks]
-<= mariadb
-url =
-md5sum =
-patches =
+[mariadb]
+<= mariadb-10.2-mariarocks
+
+[mariadb-10.2-mariarocks]
+<= mariadb-common
 path = ${mariarocks-source:location}
 pre-configure =
   ${git:location}/bin/git submodule update --init
-post-install =
+post-install +=
   make clean
+configure-options +=
+  -DCMAKE_PROGRAM_PATH=${bison:location}/bin

software/neoppod/software-myrocks-dev.cfg

 [buildout]
 extends =
-    ../../component/bison/buildout.cfg
     ../../component/mariadb/mariarocks.cfg
     software.cfg
-
-[mariadb10.1-client]
-recipe = slapos.recipe.cmmi
-version = 10.1.21
-url = http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.21/source/mariadb-10.1.21.tar.gz
-md5sum = ff8b96edeeb22425117309a249055310
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command = ${cmake:location}/bin/cmake
-configure-options =
-  -DWITHOUT_SERVER=ON
-  -DCMAKE_INSTALL_PREFIX=${:location}
-  -DBUILD_CONFIG=mysql_release
-  -DDEFAULT_CHARSET=utf8
-  -DDEFAULT_COLLATION=utf8_unicode_ci
-  -DWITH_SSL=system
-  -DWITH_ZLIB=system
-  -DWITH_READLINE=0
-  -DWITH_PIC=1
-  -DWITH_PCRE=system
-  -DENABLE_DTRACE=0
-  -DWITH_EXTRA_CHARSETS=complex
-  -DWITH_EMBEDDED_SERVER=0
-  -DWITH_JEMALLOC=yes
-  -DWITH_INNODB_BZIP2=OFF
-  -DWITH_INNODB_LZ4=OFF
-  -DWITH_INNODB_LZMA=ON
-  -DWITH_INNODB_LZO=OFF
-  -DWITH_INNODB_SNAPPY=OFF
-  -DWITH_SAFEMALLOC=OFF
-  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
-  -DWITHOUT_MROONGA_STORAGE_ENGINE=1
-  -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
-environment =
-  CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s
-post-install =
-  mkdir -p ${:location}/include/wsrep &&
-  cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
-
-[python-mysqlclient-env]
-PATH =${mariadb10.1-client:location}/bin:%(PATH)s
-
-[python-mysqlclient]
-recipe = zc.recipe.egg:custom
-egg = mysqlclient
-environment = python-mysqlclient-env
-library-dirs =
-  ${zlib:location}/lib/
-  ${openssl:location}/lib/
-rpath =
-  ${mariadb10.1-client:location}/lib/
-  ${zlib:location}/lib/
-  ${openssl:location}/lib/
-
-[mariadb]
-url =
-md5sum =
-patches =
-path = ${mariarocks-source:location}
-pre-configure =
-  ${git:location}/bin/git submodule update --init
-post-install =
-  make clean
-configure-options =
-  -DCMAKE_INSTALL_PREFIX=${:location}
-  -DBUILD_CONFIG=mysql_release
-  -DDEFAULT_CHARSET=utf8
-  -DDEFAULT_COLLATION=utf8_unicode_ci
-  -DWITH_SSL=system
-  -DWITH_ZLIB=system
-  -DWITH_READLINE=0
-  -DWITH_PIC=1
-  -DWITH_PCRE=system
-  -DENABLE_DTRACE=0
-  -DWITH_EXTRA_CHARSETS=complex
-  -DWITH_EMBEDDED_SERVER=0
-  -DWITH_JEMALLOC=yes
-  -DWITH_INNODB_BZIP2=OFF
-  -DWITH_INNODB_LZ4=OFF
-  -DWITH_INNODB_LZMA=ON
-  -DWITH_INNODB_LZO=OFF
-  -DWITH_INNODB_SNAPPY=OFF
-  -DWITH_SAFEMALLOC=OFF
-  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
-  -DWITHOUT_MROONGA_STORAGE_ENGINE=1
-  -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
-  -DCMAKE_PREFIX_PATH=${bison:location}/bin