mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-28500: Hashicorp: Debian packaging is broken

Browse source 
This commit fixes a documentation installation
issue (for debian packaging) and generally brings
the installation control files up to date (as for
the rest of the components).
This commit is contained in:
Julius Goryavsky 2022-05-10 08:22:21 +02:00
parent 2e14f2c889
commit 404984980f
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/install_macros.cmake
View file

@ -140,7 +140,7 @@ FUNCTION(INSTALL_DOCUMENTATION)
IF(RPM) IF(RPM)
SET(destination "${destination}/MariaDB-${group}-${VERSION}") SET(destination "${destination}/MariaDB-${group}-${VERSION}")
ELSEIF(DEB) ELSEIF(DEB)
SET(destination "${destination}/mariadb-${group}-${MAJOR_VERSION}.${MINOR_VERSION}") SET(destination "${destination}/mariadb-${group}")
ENDIF() ENDIF()
INSTALL(FILES ${files} DESTINATION ${destination} COMPONENT ${ARG_COMPONENT}) INSTALL(FILES ${files} DESTINATION ${destination} COMPONENT ${ARG_COMPONENT})

3
debian/control vendored
View file

@ -985,7 +985,8 @@ Description: CrackLib Password Validation Plugin for MariaDB
Package: mariadb-plugin-hashicorp-key-management Package: mariadb-plugin-hashicorp-key-management
Architecture: any Architecture: any
Depends: mariadb-server-10.9 (= ${binary:Version}), Depends: libcurl4,
mariadb-server (= ${server:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Description: Hashicorp Key Management plugin for MariaDB Description: Hashicorp Key Management plugin for MariaDB

1
debian/mariadb-plugin-hashicorp-key-management.install vendored
View file

@ -1,2 +1,3 @@
etc/mysql/mariadb.conf.d/hashicorp_key_management.cnf etc/mysql/mariadb.conf.d/hashicorp_key_management.cnf
usr/lib/mysql/plugin/hashicorp_key_management.so usr/lib/mysql/plugin/hashicorp_key_management.so
usr/share/doc/mariadb-plugin-hashicorp-key-management/hashicorp_key_management.txt

12
debian/not-installed vendored
View file

@ -25,12 +25,12 @@ usr/lib/mysql/plugin/type_test.so
usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
usr/sbin/rcmysql usr/sbin/rcmysql
usr/share/doc/mariadb-server-10.9/COPYING (related file: "debian/tmp/usr/share/mysql/mroonga/COPYING") usr/share/doc/mariadb-server/COPYING (related file: "debian/tmp/usr/share/mysql/mroonga/COPYING")
usr/share/doc/mariadb-server-10.9/CREDITS usr/share/doc/mariadb-server/CREDITS
usr/share/doc/mariadb-server-10.9/INSTALL-BINARY usr/share/doc/mariadb-server/INSTALL-BINARY
usr/share/doc/mariadb-server-10.9/README-wsrep usr/share/doc/mariadb-server/README-wsrep
usr/share/doc/mariadb-server-10.9/README.md usr/share/doc/mariadb-server/README.md
usr/share/doc/mariadb-server-10.9/THIRDPARTY usr/share/doc/mariadb-server/THIRDPARTY
usr/share/groonga-normalizer-mysql/README.md usr/share/groonga-normalizer-mysql/README.md
usr/share/groonga-normalizer-mysql/lgpl-2.0.txt usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
usr/share/groonga/COPYING usr/share/groonga/COPYING

4
plugin/hashicorp_key_management/CMakeLists.txt
View file

@ -16,5 +16,7 @@ MYSQL_ADD_PLUGIN(HASHICORP_KEY_MANAGEMENT
CONFIG hashicorp_key_management.cnf CONFIG hashicorp_key_management.cnf
COMPONENT hashicorp-key-management) COMPONENT hashicorp-key-management)
ADD_FEATURE_INFO(HASHICORP_KEY_MANAGEMENT "ON" "Hashicorp Key Management Plugin")
INSTALL_DOCUMENTATION(hashicorp_key_management.txt INSTALL_DOCUMENTATION(hashicorp_key_management.txt
COMPONENT hashicorp-key-management) COMPONENT plugin-hashicorp-key-management)