From c5cb8a2bfa286f6db671187df7d92e5bde8f924f Mon Sep 17 00:00:00 2001
From: "mwagner@ultrafly.mysql.com" <>
Date: Sun, 8 May 2005 23:02:50 +0200
Subject: [PATCH] make_binary_distribution.sh:   - Remove vendor tag from
 package names.   - Map standard OS names to user-friendly versions.

---
 BitKeeper/etc/logging_ok            |  1 +
 scripts/make_binary_distribution.sh | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 01726f15985..311403f93e6 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -181,6 +181,7 @@ mwagner@cash.mwagner.org
 mwagner@evoq.mwagner.org
 mwagner@here.mwagner.org
 mwagner@mysql.com
+mwagner@ultrafly.mysql.com
 mwagner@work.mysql.com
 mydev@mysql.com
 mysql@home.(none)
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 17a9be17108..6c0487aee40 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -294,6 +294,22 @@ if [ x$NDBCLUSTER = x1 ]; then
   rm -rf $BASE/ndb-stage
 fi
 
+# Remove vendor from $system
+system=`echo $system | sed -e 's/[a-z]*-\(.*\)/\1/g'`
+
+# Map OS names to "our" OS names (eg. darwin6.8 -> osx10.2)
+system=`echo $system | sed -e 's/darwin6.*/osx10.2/g'`
+system=`echo $system | sed -e 's/darwin7.*/osx10.3/g'`
+system=`echo $system | sed -e 's/darwin8.*/osx10.4/g'`
+system=`echo $system | sed -e 's/\(aix4.3\).*/\1/g'`
+system=`echo $system | sed -e 's/\(aix5.1\).*/\1/g'`
+system=`echo $system | sed -e 's/\(aix5.2\).*/\1/g'`
+system=`echo $system | sed -e 's/\(aix5.3\).*/\1/g'`
+system=`echo $system | sed -e 's/osf5.1b/tru64/g'`
+system=`echo $system | sed -e 's/linux-gnu/linux/g'`
+system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'`
+system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'`
+
 # Change the distribution to a long descriptive name
 NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$system-$machine$SUFFIX
 BASE2=$TMP/$NEW_NAME