From 9f77a210ef516a32c130d182c2d1f97927b46065 Mon Sep 17 00:00:00 2001 From: Robert Clausecker Date: Tue, 29 Jun 2021 15:39:20 +0200 Subject: [PATCH] databases/mariadb104-server: fix plist issues on non-amd64 On architectures other than amd64, the WSREP option does not exist. It seems that this causes the WSREP feature to be built unconditionally (not sure about this). As a result, a wsrep.cnf file is installed but not moved into the place where pkg-plist expects it. Making the move unconditional and ignoring the possible absence of the configuration file should fix the plist issues in all possible configurations. --- databases/mariadb104-server/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index f177a4b43bc2..a95defce6acf 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -252,11 +252,9 @@ post-install: ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample - ${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR} - -post-install-WSREP-on: ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ - ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample + ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample || true + ${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR} .endif # ${PKGNAMESUFFIX:M*-client} .include -- 2.31.1