From 5839109d6399bc94b3e4f01178213628c33faa70 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Sat, 21 Mar 2020 21:41:00 +0100 Subject: [PATCH] Revert "erp5.mariadb: Add convenience symlink to mysqlbinlog." This reverts commit 4f4354c326e12fb85d3fdec1b82a371df430ac0f. It duplicated commit d13b42b714d13a705a7091838eb1ccf905de83cd. --- stack/erp5/buildout.hash.cfg | 2 +- stack/erp5/instance-mariadb.cfg.in | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index e66a74815..da7687a42 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196 [template-mariadb] filename = instance-mariadb.cfg.in -md5sum = 0eb2f45a145dde0c59d3488bfdbe66ff +md5sum = 1c332e1a3388258572fcc6528aca5725 [template-kumofs] filename = instance-kumofs.cfg.in diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in index d5b40615c..3c83d9a66 100644 --- a/stack/erp5/instance-mariadb.cfg.in +++ b/stack/erp5/instance-mariadb.cfg.in @@ -213,10 +213,6 @@ recipe = slapos.cookbook:symbolic.link target-directory = ${directory:bin} link-binary = {{ dumps(parameter_dict['link-binary']) }} -[{{ section("binary-link-mysqlbinlog") }}] -< = binary-link -link-binary = {{ parameter_dict['mariadb-location'] }}/bin/mysqlbinlog - [binary-wrap-base] recipe = slapos.cookbook:wrapper # Note: --defaults-file must be the first argument, otherwise wrapped binary -- 2.30.9