Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-28500

Hashicorp: Debian packaging is broken

Details

    Description

      After recent rebases, two problems have appeared with hashicorp debian packaging.

      First, it makes the whole debian build fail, see for example
      http://buildbot.askmonty.org/buildbot/builders/kvm-deb-stretch-amd64/builds/27911/steps/compile/logs/stdio

      bb-10.9-MDEV-19281-v5 a47e08aa2

      dh_install: usr/share/doc/mariadb-hashicorp-key-management-10.9/hashicorp_key_management.txt exists in debian/tmp but is not installed to anywhere
      dh_install: missing files, aborting
      debian/rules:213: recipe for target 'binary' failed
      make: *** [binary] Error 2
      

      It started failing because the packages are now built with --fail-missing.
      To fix, hashicorp_key_management.txt should be installed in a proper place or marked as not installed.

      Second, if the problem above is solved and the packages get built, the hashicorp plugin package cannot be installed, see e.g.
      http://buildbot.askmonty.org/buildbot/builders/kvm-deb-stretch-amd64/builds/27838/steps/install/logs/stdio

      bb-10.9-MDEV-19281-v5 ccbc0df247b

      The following packages have unmet dependencies:
       mariadb-plugin-hashicorp-key-management : Depends: mariadb-server-10.9 (= 1:10.9.0+maria~stretch)
      E: Unable to correct problems, you have held broken packages.
      

      It happens because mariadb-plugin-hashicorp-key-management depends on mariadb-server-10.9, while in the new Debian packaging it should be mariadb-server. Something like this should do the trick, I suppose (subject to checking by someone who knows something about Debian packaging):

      diff --git a/debian/control b/debian/control
      index 0fd1df3ac58e..f9401b9ff886 100644
      --- a/debian/control
      +++ b/debian/control
      @@ -985,7 +985,7 @@ Description: CrackLib Password Validation Plugin for MariaDB
       
       Package: mariadb-plugin-hashicorp-key-management
       Architecture: any
      -Depends: mariadb-server-10.9 (= ${binary:Version}),
      +Depends: mariadb-server (= ${server:Version}),
                ${misc:Depends},
                ${shlibs:Depends}
       Description: Hashicorp Key Management plugin for MariaDB
      

      Attachments

        Issue Links

          Activity

            danblack Daniel Black added a comment -

            Good. Did one last amendment pushed to bb-10.9-MDEV-19281-v5 to keep the documentation directory consistent with the package name which seems to be the debian convention.

            diff --git a/debian/mariadb-plugin-hashicorp-key-management.install b/debian/mariadb-plugin-hashicorp-key-management.install
            index 55f7909d2bf..ca63f3df403 100644
            --- a/debian/mariadb-plugin-hashicorp-key-management.install
            +++ b/debian/mariadb-plugin-hashicorp-key-management.install
            @@ -1,3 +1,3 @@
             etc/mysql/mariadb.conf.d/hashicorp_key_management.cnf
             usr/lib/mysql/plugin/hashicorp_key_management.so
            -usr/share/doc/mariadb-hashicorp-key-management/hashicorp_key_management.txt
            +usr/share/doc/mariadb-plugin-hashicorp-key-management/hashicorp_key_management.txt
            diff --git a/plugin/hashicorp_key_management/CMakeLists.txt b/plugin/hashicorp_key_management/CMakeLists.txt
            index af854dec0ac..c68b6ccb719 100644
            --- a/plugin/hashicorp_key_management/CMakeLists.txt
            +++ b/plugin/hashicorp_key_management/CMakeLists.txt
            @@ -19,4 +19,4 @@ MYSQL_ADD_PLUGIN(HASHICORP_KEY_MANAGEMENT
             ADD_FEATURE_INFO(HASHICORP_KEY_MANAGEMENT "ON" "Hashicorp Key Management Plugin")
             
             INSTALL_DOCUMENTATION(hashicorp_key_management.txt
            -  COMPONENT hashicorp-key-management)
            +  COMPONENT plugin-hashicorp-key-management)
            
            

            danblack Daniel Black added a comment - Good. Did one last amendment pushed to bb-10.9- MDEV-19281 -v5 to keep the documentation directory consistent with the package name which seems to be the debian convention. diff --git a/debian/mariadb-plugin-hashicorp-key-management.install b/debian/mariadb-plugin-hashicorp-key-management.install index 55f7909d2bf..ca63f3df403 100644 --- a/debian/mariadb-plugin-hashicorp-key-management.install +++ b/debian/mariadb-plugin-hashicorp-key-management.install @@ -1,3 +1,3 @@ etc/mysql/mariadb.conf.d/hashicorp_key_management.cnf usr/lib/mysql/plugin/hashicorp_key_management.so -usr/share/doc/mariadb-hashicorp-key-management/hashicorp_key_management.txt +usr/share/doc/mariadb-plugin-hashicorp-key-management/hashicorp_key_management.txt diff --git a/plugin/hashicorp_key_management/CMakeLists.txt b/plugin/hashicorp_key_management/CMakeLists.txt index af854dec0ac..c68b6ccb719 100644 --- a/plugin/hashicorp_key_management/CMakeLists.txt +++ b/plugin/hashicorp_key_management/CMakeLists.txt @@ -19,4 +19,4 @@ MYSQL_ADD_PLUGIN(HASHICORP_KEY_MANAGEMENT ADD_FEATURE_INFO(HASHICORP_KEY_MANAGEMENT "ON" "Hashicorp Key Management Plugin") INSTALL_DOCUMENTATION(hashicorp_key_management.txt - COMPONENT hashicorp-key-management) + COMPONENT plugin-hashicorp-key-management)
            sysprg Julius Goryavsky added a comment - Fixed, https://github.com/MariaDB/server/commit/404984980feeb4d9d4906cbd166f38d163b096d2

            People

              sysprg Julius Goryavsky
              elenst Elena Stepanova
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Git Integration

                  Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.