32e03b2cdd
Move content from stx-gplv2 into stx-integ
Packages will be relocated to
stx-integ:
base/
bash
cgcs-users
cluster-resource-agents
dpkg
haproxy
libfdt
netpbm
rpm
database/
mariadb
filesystem/
iscsi-initiator-utils
filesystem/drbd/
drbd-tools
kernel/kernel-modules/
drbd
integrity
intel-e1000e
intel-i40e
intel-i40evf
intel-ixgbe
intel-ixgbevf
qat17
tpmdd
ldap/
ldapscripts
networking/
iptables
net-tools
Change-Id: Ibc2ad09bef7a7f40e337513a1694a22f38d7f4e9
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which
|
|
breaks at least two packaging commandments, so we put them into $libdir
|
|
instead. That means we have to hack the file_contents regression test
|
|
to know about this.
|
|
|
|
Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
|
|
|
|
---
|
|
mysql-test/t/file_contents.test | 13 ++++++++++--
|
|
1 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
|
|
index 4734a02..a892297 100644
|
|
--- a/mysql-test/t/file_contents.test
|
|
+++ b/mysql-test/t/file_contents.test
|
|
@@ -11,7 +11,7 @@
|
|
--perl
|
|
print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
|
|
$dir_bin = $ENV{'MYSQL_BINDIR'};
|
|
-if ($dir_bin eq '/usr/') {
|
|
+if ($dir_bin =~ '.*/usr/$') {
|
|
# RPM package
|
|
$dir_docs = $dir_bin;
|
|
$dir_docs =~ s|/lib|/share/doc|;
|
|
@@ -22,7 +22,7 @@ if ($dir_bin eq '/usr/') {
|
|
# RedHat: version number in directory name
|
|
$dir_docs = glob "$dir_docs/MariaDB-server*";
|
|
}
|
|
-} elsif ($dir_bin eq '/usr') {
|
|
+} elsif ($dir_bin =~ '.*/usr$') {
|
|
# RPM build during development
|
|
$dir_docs = "$dir_bin/share/doc";
|
|
if(-d "$dir_docs/packages") {
|
|
@@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
|
|
# RedHat/Debian: version number in directory name
|
|
$dir_docs = glob "$dir_docs/mariadb-server-*";
|
|
$dir_docs = glob "$dir_docs/MariaDB-server*" unless -d $dir_docs;
|
|
+
|
|
+ # All the above is entirely wacko, because these files are not docs;
|
|
+ # they should be kept in libdir instead. mtr does not provide a nice
|
|
+ # way to find libdir though, so we have to kluge it like this:
|
|
+ if (-d "$dir_bin/lib64/mysql") {
|
|
+ $dir_docs = "$dir_bin/lib64/mysql";
|
|
+ } else {
|
|
+ $dir_docs = "$dir_bin/lib/mysql";
|
|
+ }
|
|
}
|
|
# Slackware
|
|
$dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs;
|