[csw-devel] SF.net SVN: gar:[6373] csw/mgar/pkg/mysql5/branches/mysql-5.0.x

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Tue Sep 22 10:29:08 CEST 2009


Revision: 6373
          http://gar.svn.sourceforge.net/gar/?rev=6373&view=rev
Author:   wahwah
Date:     2009-09-22 08:29:08 +0000 (Tue, 22 Sep 2009)

Log Message:
-----------
mysql5: Defined incompatible packages, set runtime dependencies, set the ownership of /var/opt/csw/mysql directory, added a preinstall script with a warning.

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall

Removed Paths:
-------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2009-09-22 07:12:16 UTC (rev 6372)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2009-09-22 08:29:08 UTC (rev 6373)
@@ -2,13 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# TODO(maciej):
-#   - include the right symlinks in the right packages
-#   - declare mysql4 incompatible
-#   - reduce the size of the package
-#   - define file ownerships with cswusergroup
-#   - verify file permissions
-
 GARNAME = mysql5
 GARVERSION = 5.0.84
 CATEGORIES = server
@@ -45,7 +38,12 @@
 CATALOGNAME_CSWmysql5rt     = $(GARNAME)rt
 CATALOGNAME_CSWmysql5test   = $(GARNAME)test
 
-INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4
+INCOMPATIBLE_PKGS_CSWmysql5bench  = CSWmysql4bench
+INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client
+INCOMPATIBLE_PKGS_CSWmysql5       = CSWmysql4
+INCOMPATIBLE_PKGS_CSWmysql5devel  = CSWmysql4devel
+INCOMPATIBLE_PKGS_CSWmysql5rt     = CSWmysql4rt
+INCOMPATIBLE_PKGS_CSWmysql5test   = CSWmysql4test
 
 SPKG_DESC_CSWmysql5       = Multithreaded SQL database
 SPKG_DESC_CSWmysql5bench  = MySQL 5 benchmarking
@@ -61,39 +59,43 @@
 CSWmysql5client_programs  = myisamlog
 CSWmysql5client_programs += myisampack
 CSWmysql5client_programs += mysql
-CSWmysql5client_programs += mysql_client_test
-CSWmysql5client_programs += mysql_zap
 CSWmysql5client_programs += mysqlaccess
 CSWmysql5client_programs += mysqladmin
 CSWmysql5client_programs += mysqlbin
 CSWmysql5client_programs += mysqlbinlog
 CSWmysql5client_programs += mysqlcheck
+CSWmysql5client_programs += mysql_client_test
 CSWmysql5client_programs += mysqldump
 CSWmysql5client_programs += mysqlhotcopy
 CSWmysql5client_programs += mysqlimport
 CSWmysql5client_programs += mysqlshow
+CSWmysql5client_programs += mysql_zap
 CSWmysql5client_programs += perror
 CSWmysql5client_programs += replace
 
 
+PKGFILES_CSWmysql5bench   = $(prefix)/sql-bench.*
 PKGFILES_CSWmysql5client  = $(bindir)
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(bindir)$(support64)/$(bin_name))
+PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1)
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name))
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name))
-PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSWmysql5devel   = $(prefix)/include.*
 PKGFILES_CSWmysql5devel  += $(bindir)$(support64)/mysql_config
 PKGFILES_CSWmysql5devel  += $(mandir)/man1/mysql_config\.1
+PKGFILES_CSWmysql5devel   = $(prefix)/include.*
 PKGFILES_CSWmysql5rt      = $(prefix)/lib/.*\.so.*
-PKGFILES_CSWmysql5bench   = $(prefix)/sql-bench.*
 PKGFILES_CSWmysql5test    = $(prefix)/mysql-test.*
 
-REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt
+REQUIRED_PKGS_CSWmysql5bench       = CSWmysql5
+REQUIRED_PKGS_CSWmysql5client      = CSWmysql5rt
+REQUIRED_PKGS_CSWmysql5            = CSWmysql5client CSWmysql5rt
+REQUIRED_PKGS_CSWmysql5devel       = CSWmysql5
+REQUIRED_PKGS_CSWmysql5test        = CSWmysql5
 
 MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/
 DISTFILES  = mysql-$(GARVERSION).tar.gz
 DISTFILES += cswmysql5 quick_start-csw README.CSW
-DISTFILES += CSWmysql.preinstall
+DISTFILES += CSWmysql5.preinstall
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -132,6 +134,7 @@
                                             $$$$5 = "mysql"; \
                                             $$$$6 = "mysql" } \
     { print }'
+SPKG_CLASSES = none ugfiles
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2009-09-22 07:12:16 UTC (rev 6372)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2009-09-22 08:29:08 UTC (rev 6373)
@@ -2,7 +2,7 @@
 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
-cc2a219abbe7dc6049775cff070a27a5  download/CSWmysql.preinstall
+cc2a219abbe7dc6049775cff070a27a5  download/CSWmysql5.preinstall
 70d7860bfa776dfc5510fc11d7c14203  download/README.CSW
 fa8f33c812604457f2c0792e875f6967  download/cswmysql5
 671348f1a5b078da9ca76f97e1fda325  download/mysql-5.0.84.tar.gz

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall	2009-09-22 07:12:16 UTC (rev 6372)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall	2009-09-22 08:29:08 UTC (rev 6373)
@@ -1,40 +0,0 @@
-#!/bin/sh
-# vim:set sw=2 ts=2 sts=2 expandtab:
-#
-# $Id$
-#
-
-obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5"
-
-obsolete_dir_information="
-This directory is obsolete.  Files in this directory are going to be ignored.
-Please move your data to the new location.
-
-Feel free to remove this file afterwards.
-"
-obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE"
-
-for dirpair in ${obsolete_directories}; do
-  obsolete_dir=`echo ${dirpair} | cut -d: -f1`
-  new_dir=`echo ${dirpair} | cut -d: -f2`
-  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
-    echo
-    echo "*******************************************************************"
-    echo "* The old configuration directory ${obsolete_dir} still exists.    "
-    echo "* Please move your configuration to ${new_dir}.                    "
-    echo "*                                                                  "
-    echo "*       Installation will continue in 10 seconds.                  "
-    echo "*         Press CTRL+C if you want to stop now.                    "
-    echo "*******************************************************************"
-    echo
-    sleep 10
-
-    # Leaving a note for the sysadmin if the they proceed with the installation.
-    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
-    if touch "${fn}" 2>/dev/null; then
-      echo "${obsolete_dir_information}" > "${fn}"
-    fi
-  fi
-done
-
-exit 0

Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall (from rev 6370, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall)
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall	2009-09-22 08:29:08 UTC (rev 6373)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# vim:set sw=2 ts=2 sts=2 expandtab:
+#
+# $Id$
+#
+
+obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5"
+
+obsolete_dir_information="
+This directory is obsolete.  Files in this directory are going to be ignored.
+Please move your data to the new location.
+
+Feel free to remove this file afterwards.
+"
+obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE"
+
+for dirpair in ${obsolete_directories}; do
+  obsolete_dir=`echo ${dirpair} | cut -d: -f1`
+  new_dir=`echo ${dirpair} | cut -d: -f2`
+  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
+    echo
+    echo "*******************************************************************"
+    echo "* The old configuration directory ${obsolete_dir} still exists.    "
+    echo "* Please move your configuration to ${new_dir}.                    "
+    echo "*                                                                  "
+    echo "*       Installation will continue in 10 seconds.                  "
+    echo "*         Press CTRL+C if you want to stop now.                    "
+    echo "*******************************************************************"
+    echo
+    sleep 10
+
+    # Leaving a note for the sysadmin if the they proceed with the installation.
+    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
+    if touch "${fn}" 2>/dev/null; then
+      echo "${obsolete_dir_information}" > "${fn}"
+    fi
+  fi
+done
+
+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