Skip to content

Commit 30f692f

Browse files
committed
Deb: Make AWS key management plugin a special plugin not in Linux distros
It will only build if there is network access, which is a strict no-go for Linux distributions. Thus the AWS plugin needs to be a custom built only special plugin that is not built as part of the normal sources. This fixes the build error in e.g. Launchpad: Performing download step (git clone) for 'aws_sdk_cpp' cd "/<<PKGBUILDDIR>>/builddir/plugin/aws_key_management" && /usr/bin/cmake .. Cloning into 'aws-sdk-cpp'... fatal: unable to access 'https://github.com/awslabs/aws-sdk-cpp.git/': Could not resolve host: github.com
1 parent c720a1f commit 30f692f

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

debian/autobake-deb.sh

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,30 @@ then
8686
sed '/Package: mariadb-plugin-rocksdb/,+14d' -i debian/control
8787
fi
8888

89-
# AWS SDK requires c++11 -capable compiler
89+
# AWS SDK requires c++11 -capable compiler.
9090
# Minimal supported versions are g++ 4.8 and clang 3.3.
91-
if [[ $GCCVERSION -lt 40800 ]] || [[ $TRAVIS ]]
91+
# AWS SDK also requires the build machine to have network access and git, so
92+
# it cannot be part of the base version included in Linux distros, but a pure
93+
# custom built plugin.
94+
if [[ $GCCVERSION -gt 40800 ]] && [[ ! $TRAVIS ]] && ping -c 1 github.com
9295
then
93-
sed '/Package: mariadb-plugin-aws-key-management/,+14d' -i debian/control
96+
cat <<EOF >> debian/control
97+
98+
Package: mariadb-plugin-aws-key-management
99+
Architecture: any
100+
Breaks: mariadb-aws-key-management-10.1,
101+
mariadb-aws-key-management-10.2
102+
Replaces: mariadb-aws-key-management-10.1,
103+
mariadb-aws-key-management-10.2
104+
Depends: libcurl3,
105+
mariadb-server-10.3,
106+
\${misc:Depends},
107+
\${shlibs:Depends}
108+
Description: Amazon Web Service Key Management Service Plugin for MariaDB
109+
This encryption key management plugin gives an interface to the Amazon Web
110+
Services Key Management Service for managing encryption keys used for MariaDB
111+
data-at-rest encryption.
112+
EOF
94113
fi
95114

96115
# Mroonga, TokuDB never built on Travis CI anyway, see build flags above

debian/control

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -694,21 +694,6 @@ Description: CrackLib Password Validation Plugin for MariaDB
694694
This password validation plugin uses cracklib to allow only
695695
sufficiently secure (as defined by cracklib) user passwords in MariaDB.
696696

697-
Package: mariadb-plugin-aws-key-management
698-
Architecture: any
699-
Breaks: mariadb-aws-key-management-10.1,
700-
mariadb-aws-key-management-10.2
701-
Replaces: mariadb-aws-key-management-10.1,
702-
mariadb-aws-key-management-10.2
703-
Depends: libcurl3,
704-
mariadb-server-10.3,
705-
${misc:Depends},
706-
${shlibs:Depends}
707-
Description: Amazon Web Service Key Management Service Plugin for MariaDB
708-
This encryption key management plugin gives an interface to the Amazon Web
709-
Services Key Management Service for managing encryption keys used for MariaDB
710-
data-at-rest encryption.
711-
712697
Package: mariadb-test
713698
Architecture: any
714699
Depends: mariadb-client-10.3 (= ${binary:Version}),

0 commit comments

Comments
 (0)