From e32c25628793455b7537022d679f8a80913edd4f Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Tue, 4 May 2010 12:34:00 +0200 Subject: Put back SELinux files --- support-files/mysql.spec.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 764c67b85c7..0016c456b60 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -442,6 +442,7 @@ MBD=$RPM_BUILD_DIR/%{src_dir} install -d $RBR%{_sysconfdir}/{logrotate.d,init.d} install -d $RBR%{mysqldatadir}/mysql install -d $RBR%{_datadir}/mysql-test +install -d $RBR%{_datadir}/mysql/SELinux/RHEL4 install -d $RBR%{_includedir} install -d $RBR%{_libdir} install -d $RBR%{_mandir} @@ -470,6 +471,10 @@ ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql # Just to make sure it's in the file list and marked as a config file touch $RBR%{_sysconfdir}/my.cnf +# Install SELinux files in datadir +install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \ + $RBR%{_datadir}/mysql/SELinux/RHEL4 + %if %{WITH_TCMALLOC} # Even though this is a shared library, put it under /usr/lib*/mysql, so it # doesn't conflict with possible shared lib by the same name in /usr/lib*. See -- cgit v1.2.1 From 0187562f0171f0eb411e384024b5dd73736a6a70 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Tue, 4 May 2010 14:03:10 +0200 Subject: fix --- support-files/mysql.spec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 0016c456b60..c8d34528a8b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -472,7 +472,7 @@ ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql touch $RBR%{_sysconfdir}/my.cnf # Install SELinux files in datadir -install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \ +install -m 600 $MBD/release/support-files/RHEL4-SElinux/mysql.{fc,te} \ $RBR%{_datadir}/mysql/SELinux/RHEL4 %if %{WITH_TCMALLOC} -- cgit v1.2.1 From 58b15f80581c2c7aef2ef568cffb88bba0c3dc93 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Tue, 4 May 2010 15:41:42 +0200 Subject: Ok, let's try, one more time --- support-files/mysql.spec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index c8d34528a8b..6f033bc8546 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -472,7 +472,7 @@ ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql touch $RBR%{_sysconfdir}/my.cnf # Install SELinux files in datadir -install -m 600 $MBD/release/support-files/RHEL4-SElinux/mysql.{fc,te} \ +install -m 600 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \ $RBR%{_datadir}/mysql/SELinux/RHEL4 %if %{WITH_TCMALLOC} -- cgit v1.2.1 From f9d9388527f51825d6f81bf804b2f705533115dd Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Wed, 5 May 2010 15:23:34 +0200 Subject: Add all plugins --- support-files/mysql.spec.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 6f033bc8546..3ad9eebd657 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -732,12 +732,16 @@ fi %attr(755, root, root) %{_sbindir}/mysqld %attr(755, root, root) %{_sbindir}/mysqld-debug %attr(755, root, root) %{_sbindir}/rcmysql +%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so +%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so -%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so* -%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so* +%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so +%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so* -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so* +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so %if %{WITH_TCMALLOC} %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} -- cgit v1.2.1 From 63fbe9cce8bafbbb65a54294c958f5ce9c5f05ee Mon Sep 17 00:00:00 2001 From: Kent Boortz Date: Wed, 5 May 2010 17:50:22 +0200 Subject: Output the config.h defines to stdout --- support-files/mysql.spec.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 3ad9eebd657..e3944805368 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -396,6 +396,7 @@ mkdir debug -DFEATURE_SET="%{feature_set}" \ -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \ -DMYSQL_SERVER_SUFFIX="%{server_suffix}" + echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG make VERBOSE=1 ) # Build full release @@ -410,6 +411,7 @@ mkdir release -DFEATURE_SET="%{feature_set}" \ -DCOMPILATION_COMMENT="%{compilation_comment_release}" \ -DMYSQL_SERVER_SUFFIX="%{server_suffix}" + echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG make VERBOSE=1 ) -- cgit v1.2.1 From c8432bfbcc6dcdc5c1bc106b6132d0814e739a1b Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Wed, 5 May 2010 19:27:21 +0200 Subject: Try an ia64 fix --- support-files/mysql.spec.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index e3944805368..540fef6def6 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -363,6 +363,9 @@ touch optional-files-devel # not require C++ features such as exceptions, and may need to be removed at # a later date. # +%if "%{_arch}" == "ia64" +RPM_OPT_FLAGS= +%endif export PATH=${MYSQL_BUILD_PATH:-$PATH} export CC=${MYSQL_BUILD_CC:-${CC:-gcc}} export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}} -- cgit v1.2.1 From af941670abbb84b32cdb80a4c87e95a5d5594895 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Wed, 5 May 2010 23:03:38 +0200 Subject: Update comment --- support-files/mysql.spec.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 540fef6def6..fcdcb096d01 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -363,9 +363,14 @@ touch optional-files-devel # not require C++ features such as exceptions, and may need to be removed at # a later date. # + +# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break +# the compile in cmd-line-utils/readline - needs investigation, but for now +# we simply unset it and use those specified directly in cmake. %if "%{_arch}" == "ia64" RPM_OPT_FLAGS= %endif + export PATH=${MYSQL_BUILD_PATH:-$PATH} export CC=${MYSQL_BUILD_CC:-${CC:-gcc}} export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}} -- cgit v1.2.1 From b5164c140178132018a1d4bdff95048b4d8ff4dc Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Wed, 12 May 2010 14:12:20 +0200 Subject: Pointless commit to avoid unnecessary diffs and to trigger a new build --- support-files/mysql.spec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index fcdcb096d01..2ed3b1ff788 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -10,7 +10,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; see the file COPYING. If not, write to the +# along with this program; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston # MA 02110-1301 USA. -- cgit v1.2.1 From ce34f3d8093f131f5713437c299a72046753868f Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 27 May 2010 12:51:26 +0200 Subject: Split OEL/RHEL --- support-files/mysql.spec.sh | 65 +++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 23 deletions(-) (limited to 'support-files') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 2ed3b1ff788..c0edd3718bb 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -121,43 +121,62 @@ %define distro_specific 0 %endif %if %{distro_specific} - %if %(test -f /etc/redhat-release && echo 1 || echo 0) - %define elver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') - %if "%elver" == "4" - %define distro_description Enterprise Linux 4 - %define distro_releasetag el4 + %if %(test -f /etc/enterprise-release && echo 1 || echo 0) + %define oelver %(rpm -qf --qf '%%{version}\\n' /etc/enterprise-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') + %if "%oelver" == "4" + %define distro_description Oracle Enterprise Linux 4 + %define distro_releasetag oel4 %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel %define distro_requires chkconfig coreutils grep procps shadow-utils %else - %if "%elver" == "5" - %define distro_description Enterprise Linux 5 - %define distro_releasetag el5 + %if "%oelver" == "5" + %define distro_description Oracle Enterprise Linux 5 + %define distro_releasetag oel5 %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel %define distro_requires chkconfig coreutils grep procps shadow-utils %else - %{error:Enterprise Linux %{elver} is unsupported} + %{error:Oracle Enterprise Linux %{oelver} is unsupported} %endif %endif %else - %if %(test -f /etc/SuSE-release && echo 1 || echo 0) - %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release) - %if "%susever" == "10" - %define distro_description SUSE Linux Enterprise Server 10 - %define distro_releasetag sles10 - %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client readline-devel zlib-devel - %define distro_requires aaa_base coreutils grep procps pwdutils + %if %(test -f /etc/redhat-release && echo 1 || echo 0) + %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') + %if "%rhelver" == "4" + %define distro_description Red Hat Enterprise Linux 4 + %define distro_releasetag rhel4 + %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils %else - %if "%susever" == "11" - %define distro_description SUSE Linux Enterprise Server 11 - %define distro_releasetag sles11 - %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils readline-devel zlib-devel - %define distro_requires aaa_base coreutils grep procps pwdutils + %if "%rhelver" == "5" + %define distro_description Red Hat Enterprise Linux 5 + %define distro_releasetag rhel5 + %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils %else - %{error:SuSE %{susever} is unsupported} + %{error:Red Hat Enterprise Linux %{rhelver} is unsupported} %endif %endif %else - %{error:Unsupported distribution} + %if %(test -f /etc/SuSE-release && echo 1 || echo 0) + %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release) + %if "%susever" == "10" + %define distro_description SUSE Linux Enterprise Server 10 + %define distro_releasetag sles10 + %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client readline-devel zlib-devel + %define distro_requires aaa_base coreutils grep procps pwdutils + %else + %if "%susever" == "11" + %define distro_description SUSE Linux Enterprise Server 11 + %define distro_releasetag sles11 + %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils readline-devel zlib-devel + %define distro_requires aaa_base coreutils grep procps pwdutils + %else + %{error:SuSE %{susever} is unsupported} + %endif + %endif + %else + %{error:Unsupported distribution} + %endif %endif %endif %else -- cgit v1.2.1