[csw-devel] SF.net SVN: gar:[6406] csw/mgar/pkg/mysql5/branches/mysql-5.0.x
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Sep 22 22:17:45 CEST 2009
Revision: 6406
http://gar.svn.sourceforge.net/gar/?rev=6406&view=rev
Author: wahwah
Date: 2009-09-22 20:17:45 +0000 (Tue, 22 Sep 2009)
Log Message:
-----------
mysql-5.0.x: Fixed runtime library paths, fixed the quickstart file, added a postinstall file.
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
Added Paths:
-----------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 15:53:05 UTC (rev 6405)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 20:17:45 UTC (rev 6406)
@@ -95,6 +95,8 @@
DISTFILES = mysql-$(GARVERSION).tar.gz
DISTFILES += cswmysql5 quick_start-csw README.CSW
DISTFILES += CSWmysql5.preinstall
+DISTFILES += CSWmysql5.postinstall
+DISTFILES += cswusergroup
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -107,6 +109,7 @@
EXTRA_INC = /opt/csw/include
EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql
# Set ./configure options
CONFIGURE_ARGS = $(DIRPATHS)
@@ -139,14 +142,14 @@
post-install-modulated:
ginstall -m 755 -d $(DESTDIR)$(localstatedir)
- ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql5/doc
- ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql5/doc
- ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql5/doc
- ln -sf ../../../mysql5/share/mysql5/doc/README.CSW \
- $(DESTDIR)/opt/csw/share/mysql5/doc/README.CSW
+ ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc
+ ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc
+ ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc
+ ln -sf ../../../mysql5/share/mysql/doc/README.CSW \
+ $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW
ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d
ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d
- ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql5
+ ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql
ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5
ginstall -m 644 $(FILEDIR)/cswusergroup \
$(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 15:53:05 UTC (rev 6405)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:17:45 UTC (rev 6406)
@@ -2,8 +2,10 @@
1414d06fab1530484a508927a0de4154 download/0002-cast-user_info-pw_gid-to-gid_t.patch
5415f365f1b0f7a179d1efc25f45bbee download/0003-OpenCSW-perl-for-tests.patch
8ab232cd4d232b3cda3bbced93f80237 download/0004-basedir-and-datadir-in-the-cnf-files.patch
+9b5511de728fec4394eca7dd0097fb43 download/CSWmysql5.postinstall
cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql5.preinstall
70d7860bfa776dfc5510fc11d7c14203 download/README.CSW
fa8f33c812604457f2c0792e875f6967 download/cswmysql5
+67228e1f096fe08a94f4267439a4ec36 download/cswusergroup
671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz
-1d79b3cfc4f91db05952bf71f0181fe7 download/quick_start-csw
+a6560d8d679f3eb3fca2dbace29baa65 download/quick_start-csw
Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2009-09-22 20:17:45 UTC (rev 6406)
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+MYSQLDATADIR=/var/opt/csw/mysql5
+if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then
+ echo "No database directory found in the default location."
+ echo "If you need to build the initial database directory,"
+ echo " see /opt/csw/mysql5/share/mysql/quick_start-csw"
+ echo "If you are using a non-default database directory location,"
+ echo " please start mysql manually."
+ exit 0
+fi
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-22 15:53:05 UTC (rev 6405)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-22 20:17:45 UTC (rev 6406)
@@ -1 +1 @@
-mysql:mysql:MySQL database user:/opt/csw/mysql:/bin/false::
+mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false::
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-09-22 15:53:05 UTC (rev 6405)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-09-22 20:17:45 UTC (rev 6406)
@@ -12,7 +12,7 @@
MYSQLD_USER=mysql
#
# Provide a default data directory
-MYSQLD_DATADIR=/opt/csw/mysql5/var
+MYSQLD_DATADIR=/var/opt/csw/mysql5
#
echo
echo "This is the blastwave quick start script to setup a MySQL5 database"
@@ -108,7 +108,7 @@
#
# Update --datadir in the cnf file with the correct value if file was copied
if [ x"$CNFCOPIED" = xyes ]; then
- sed -e "s|/opt/csw/mysql5/var|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
+ sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
mv $DEFAULTS_FILE.new $DEFAULTS_FILE
fi
@@ -126,7 +126,7 @@
then
echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later"
else
- echo "To start mysqld; run \`/etc/init.d/cswmysql start\` on Solaris 9 or earlier"
+ echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql start\` on Solaris 9 or earlier"
fi
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list