[csw-devel] SF.net SVN: gar:[16433] csw/mgar/pkg/mysql5/branches/mysql-5.0.x
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Dec 9 11:06:15 CET 2011
Revision: 16433
http://gar.svn.sourceforge.net/gar/?rev=16433&view=rev
Author: wahwah
Date: 2011-12-09 10:06:15 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
mysql5/branches/mysql-5.0.x: issues from http://bugs.opencsw.org/id/4844
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-09 09:44:58 UTC (rev 16432)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-09 10:06:15 UTC (rev 16433)
@@ -102,14 +102,17 @@
CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
PACKAGES += CSW$(NAME)
-RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
-RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER)
SPKG_DESC_CSW$(NAME) = Multithreaded SQL database
RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER)
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWcoreutils
CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry
CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
+CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client
+CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWcoreutils
EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.*
EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.*
@@ -185,7 +188,6 @@
PROTOTYPE_PERMS_dbdir = 0700
PROTOTYPE_CLASS_dbdir = ugfiles
-CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client
CHECKPKG_OVERRIDES_CSW$(NAME)bench += file-with-bad-content
CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSW$(NAME)
CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2011-12-09 09:44:58 UTC (rev 16432)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2011-12-09 10:06:15 UTC (rev 16433)
@@ -1,7 +1,7 @@
-MySQL 5 OpenCSW package
-=======================
+MySQL 5.0 OpenCSW package
+=========================
-* http://www.opencsw.org/packages/mysql5
+* http://www.opencsw.org/packages/mysql5/
The package has been reworked from the ground up, using GAR. Up until this
moment, the mysql5 package was in the version from before the fork. The new
@@ -12,47 +12,7 @@
* Read only /opt/csw support
- data in /var/opt/csw
- configuration in /etc/opt/csw
-* The prefix is still /opt/csw/mysql5, but all the binaries are now linked from
- /opt/csw, so that the standard PATH setting allows to use them
+* The prefix has been changed to /opt/csw, so that the standard PATH setting
+ allows to call binaries the easy way
* The startup script is now in /etc/opt/csw/init.d
-* SMF support is handled by cswclassutils
-
-
-Here are the old notes from the previous maintainer, Alex Moore:
-
---------------8<----------------8<--------------------8<------------------------
-
-If you are not using the default location for --datadir, package installation
- will NOT start CSWmysql5. More code is needed for that. I welcome patches.
-
-If you are not using the default location for --datadir, you will find
- that CSWmysql5 works much better when you create /etc/my.cnf with at
- least the entries that follow. You may also want some entries in this
- global options file for client programs that you use.
- For example: --datadir is /db/mysql5/var
- Create /etc/my.cnf with the following entries:
- # Global MySQL options file.
- [mysqld]
- datadir = /db/mysql5/var
- basedir = /opt/csw/mysql5
-
-I also changed the option for --defaults-file to --defaults-extra-file
- in the startup script.
- This allows your options file to be read after the global options file
- /etc/my.cnf.
-
-Note that if you are using the default location for --datadir, you do not
- really need /etc/opt/csw/mysql5rc. In this case, you should put any options
- in the appropriate group in my.cnf. See the MySQL documentation for
- details.
-
-If you are not using the default location for --datadir, you only need
- /etc/opt/csw/mysql5rc for the startup script options for
- --defaults-extra-file and possibly --pid-file. All other options may be
- put in the appropriate group in my.cnf
-
-Click 'Views and info' on the package page at
- http://www.opencsw.org/packages.php/mysql5
-for the latest information.
-
-Alex Moore
+* SMF support is handled by cswclassutils, using cswmysql5 as the service name
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-12-09 09:44:58 UTC (rev 16432)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-12-09 10:06:15 UTC (rev 16433)
@@ -26,6 +26,7 @@
MYSQLD_DATADIR=$MYSQL_VAR
MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
CONFFILE=${sysconfdir}/my.cnf
+MYSQLD_PROG=${MYSQLD_PROG:-/opt/csw/libexec/mysqld-${BASE_VERSION}}
# Source the configuration
[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc
@@ -78,12 +79,12 @@
start_it() {
if test -r $MYSQLD_PID_FILE ; then
if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then
- echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running."
+ echo "mysqld-${BASE_VERSION} (`cat $MYSQLD_PID_FILE`) seems to be running."
return 1
fi
fi
- printf "%-60s" "Starting mysqld: "
+ printf "%-60s" "Starting mysqld-${BASE_VERSION}: "
# 2006-03-11
# This script no longer creates the default database. You may create the
@@ -192,7 +193,7 @@
restart)
stop_it
- while pgrep `pgrep_opts` mysqld > /dev/null
+ while pgrep `pgrep_opts` mysqld-${BASE_VERSION} > /dev/null
do
sleep 1
done
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 2011-12-09 09:44:58 UTC (rev 16432)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2011-12-09 10:06:15 UTC (rev 16433)
@@ -10,7 +10,7 @@
#
# TODO: This file should be integrated with CSWmysql5.postinstall file.
-prefix=/opt/csw/mysql5
+prefix=/opt/csw
MYSQL_HOME=${prefix}
MYSQL_VAR=/var${prefix}
sysconfdir=/etc${prefix}
@@ -118,7 +118,7 @@
#
# Update --datadir in the cnf file with the correct value if file was copied
if [ x"$CNFCOPIED" = xyes ]; then
- sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
+ sed -e "s|/var/opt/csw|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
mv $DEFAULTS_FILE.new $DEFAULTS_FILE
fi
@@ -126,7 +126,7 @@
# Ending message
echo
echo "### The following messages are from quick_start-csw."
-echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes."
+echo "See /opt/csw/share/mysql/doc/README.CSW for packaging changes."
echo "Please ignore references to starting mysqld_safe in the messages above."
echo " These messages are from mysql_install_db. See the following"
echo " for starting CSWmysql5."
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