Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~abychko/percona-server/5.6-new-packaging-Stewart into lp:percona-server/5.6

  1. 5.6-new-packaging-Stewart
  2. Merge into 5.6
Proposed by Alexey Bychko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 537
Proposed branch: lp:~abychko/percona-server/5.6-new-packaging-Stewart
Merge into: lp:percona-server/5.6
Diff against target: 194 lines (+33/-45)
5 files modified
README (+3/-3)
build-ps/debian/control (+1/-1)
build-ps/debian/rules (+6/-8)
build-ps/percona-server.spec (+22/-31)
cmake/ssl.cmake (+1/-2)
To merge this branch: bzr merge lp:~abychko/percona-server/5.6-new-packaging-Stewart
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+203358@code.launchpad.net

Description of the change

fixed packaging from Stewart

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2013-11-15 03:29:06 +0000
+++ README 2014-01-28 10:44:01 +0000
@@ -1,11 +1,11 @@
1Percona Server 5.51Percona Server 5.6
2------------------2------------------
33
4Percona Server is a branch of MySQL 5.5 bringing higher performance,4Percona Server is a branch of MySQL 5.6 bringing higher performance,
5reliability and more features.5reliability and more features.
66
7http://www.percona.com/software/percona-server/7http://www.percona.com/software/percona-server/
88
9Documentation: http://www.percona.com/doc/percona-server/5.59Documentation: http://www.percona.com/doc/percona-server/5.6
1010
11Launchpad (bugs, milestones, branches): http://launchpad.net/percona-server11Launchpad (bugs, milestones, branches): http://launchpad.net/percona-server
1212
=== modified file 'build-ps/debian/control'
--- build-ps/debian/control 2013-12-22 23:31:06 +0000
+++ build-ps/debian/control 2014-01-28 10:44:01 +0000
@@ -3,7 +3,7 @@
3Priority: extra3Priority: extra
4Maintainer: Percona Server Development Team <mysql-dev@percona.com>4Maintainer: Percona Server Development Team <mysql-dev@percona.com>
5Uploaders: Stewart Smith <stewart.smith@percona.com>, Alexey Bychko <alexey.bychko@percona.com>5Uploaders: Stewart Smith <stewart.smith@percona.com>, Alexey Bychko <alexey.bychko@percona.com>
6Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 8.1.3~), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, dh-apparmor, gcc-4.4 [any-i386], g++-4.4 [any-i386], libaio-dev[linux-any], libpam-dev, libssl-dev6Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, ghostscript, gawk, bison, lsb-release, cmake, gcc, g++, libaio-dev[linux-any], libpam-dev, libssl-dev
7Standards-Version: 3.9.47Standards-Version: 3.9.4
8Homepage: http://www.percona.com/software/percona-server/8Homepage: http://www.percona.com/software/percona-server/
9Vcs-Bzr: lp:percona-server/5.69Vcs-Bzr: lp:percona-server/5.6
1010
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules 2014-01-15 08:49:17 +0000
+++ build-ps/debian/rules 2014-01-28 10:44:01 +0000
@@ -14,9 +14,9 @@
14DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)14DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
15DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )15DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
1616
17ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))17#ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
18 USE_THIS_GCC_VERSION:=-4.418# USE_THIS_GCC_VERSION:=-4.4
19endif19#endif
2020
21export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)21export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
22export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)22export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
@@ -35,7 +35,7 @@
3535
36MYSQL_SRC = $(shell pwd)36MYSQL_SRC = $(shell pwd)
3737
38MAKE_TEST_TARGET=test-mtr38#MAKE_TEST_TARGET=test-mtr
39ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)39ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
40# make test-bt is the testsuite run by the MySQL build team 40# make test-bt is the testsuite run by the MySQL build team
41# before a release, but it is long41# before a release, but it is long
@@ -92,7 +92,7 @@
92 $(USE_STATIC_MYSQLD) \92 $(USE_STATIC_MYSQLD) \
93 $(USE_LINUX_NATIVE_AIO) \93 $(USE_LINUX_NATIVE_AIO) \
94 -DWITH_ZLIB=system \94 -DWITH_ZLIB=system \
95 -DWITH_SSL=bundled \95 -DWITH_SSL=system \
96 -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \96 -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
97 -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \97 -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
98 -DSYSTEM_TYPE="debian-linux-gnu" \98 -DSYSTEM_TYPE="debian-linux-gnu" \
@@ -268,9 +268,7 @@
268 dh_installexamples -a268 dh_installexamples -a
269 dh_installmenu -a269 dh_installmenu -a
270 dh_installlogrotate -a --name mysql-server270 dh_installlogrotate -a --name mysql-server
271 if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then \271 if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then if [ "$(DISTRELEASE)" != "lucid"]; then dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; fi; fi
272 dh_apparmor -pmysql-server-5.6 --profile-name=usr.sbin.mysqld; \
273 fi
274 # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets272 # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
275 # started which might depend on a running database server.273 # started which might depend on a running database server.
276 dh_installinit -a --name=mysql -- defaults 19 21274 dh_installinit -a --name=mysql -- defaults 19 21
277275
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec 2014-01-16 05:48:56 +0000
+++ build-ps/percona-server.spec 2014-01-28 10:44:01 +0000
@@ -25,17 +25,15 @@
25%define mysql_vendor Oracle and/or its affiliates25%define mysql_vendor Oracle and/or its affiliates
26%define percona_server_vendor Percona, Inc26%define percona_server_vendor Percona, Inc
2727
28%define mysql_version 5.6.1528%define mysql_version @@MYSQL_VERSION@@
29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
30%define majorversion 6230%define percona_server_version @@PERCONA_VERSION@@
31%define minorversion 0
32%define percona_server_version %{majorversion}.%{minorversion}
3331
34%define mysqld_user mysql32%define mysqld_user mysql
35%define mysqld_group mysql33%define mysqld_group mysql
36%define mysqldatadir /var/lib/mysql34%define mysqldatadir /var/lib/mysql
3735
38%define release rel%{majorversion}.%{minorversion}.1%{?dist}36%define release rel%{percona_server_version}.1%{?dist}
3937
40#38#
41# Macros we use which are not available in all supported versions of RPM39# Macros we use which are not available in all supported versions of RPM
@@ -227,7 +225,7 @@
227Release: %{release}225Release: %{release}
228Distribution: %{distro_description}226Distribution: %{distro_description}
229License: Copyright (c) 2000, 2010, %{mysql_vendor}. All rights reserved. Use is subject to license terms. Under %{license_type} license as shown in the Description field.227License: Copyright (c) 2000, 2010, %{mysql_vendor}. All rights reserved. Use is subject to license terms. Under %{license_type} license as shown in the Description field.
230Source: http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{majorversion}.%{minorversion}/source/%{src_dir}.tar.gz228Source: http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tar.gz
231URL: http://www.percona.com/229URL: http://www.percona.com/
232Packager: Percona MySQL Development Team <mysqldev@percona.com>230Packager: Percona MySQL Development Team <mysqldev@percona.com>
233Vendor: %{percona_server_vendor}231Vendor: %{percona_server_vendor}
@@ -364,10 +362,12 @@
364%if "%{_arch}" == "ia64"362%if "%{_arch}" == "ia64"
365RPM_OPT_FLAGS=363RPM_OPT_FLAGS=
366%endif364%endif
367365#
366RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS} | sed -e 's|-march=i386|-march=i686|g')
367#
368export PATH=${MYSQL_BUILD_PATH:-$PATH}368export PATH=${MYSQL_BUILD_PATH:-$PATH}
369export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}369export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
370export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}370export CXX=${MYSQL_BUILD_CXX:-${CXX:-g++}}
371export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}371export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
372export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-rtti}}372export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-rtti}}
373export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}373export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
@@ -463,33 +463,11 @@
463# Clean up the BuildRoot first463# Clean up the BuildRoot first
464[ "$RBR" != "/" ] && [ -d "$RBR" ] && rm -rf "$RBR";464[ "$RBR" != "/" ] && [ -d "$RBR" ] && rm -rf "$RBR";
465465
466# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921). This
467# needs to be during build phase as $CC is not set during install.
468if "$CC" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1
469then
470 libgcc=`$CC $CFLAGS --print-libgcc-file`
471 if [ -f $libgcc ]
472 then
473 mkdir -p $RBR%{_libdir}/mysql
474 install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
475 echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
476 fi
477fi
478
479# Move temporarily the saved files to the BUILD directory since the BUILDROOT
480# dir will be cleaned at the start of the install phase
481mkdir -p "$RPM_BUILD_DIR/%{_libdir}"
482mv $RBR%{_libdir} $RPM_BUILD_DIR/%{_libdir}
483
484##############################################################################466##############################################################################
485%install467%install
486468
487RBR=$RPM_BUILD_ROOT469RBR=$RPM_BUILD_ROOT
488MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}%{server_suffix}470MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}-%{percona_server_version}
489
490# Move back the libdir from BUILD dir to BUILDROOT
491mkdir -p "$RBR%{_libdir}"
492mv $RPM_BUILD_DIR/%{_libdir} $RBR%{_libdir}
493471
494# Ensure that needed directories exists472# Ensure that needed directories exists
495install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}473install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
@@ -517,6 +495,19 @@
517 make DESTDIR=$RBR install495 make DESTDIR=$RBR install
518)496)
519497
498# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921). This
499# needs to be during build phase as $CC is not set during install.
500if "$CC" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1
501then
502 libgcc=`$CC $CFLAGS --print-libgcc-file`
503 if [ -f $libgcc ]
504 then
505 mkdir -p $RBR%{_libdir}/mysql
506 install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
507 echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
508 fi
509fi
510
520# FIXME: at some point we should stop doing this and just install everything511# FIXME: at some point we should stop doing this and just install everything
521# FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming512# FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming
522# FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax513# FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax
523514
=== modified file 'cmake/ssl.cmake'
--- cmake/ssl.cmake 2013-06-01 05:18:49 +0000
+++ cmake/ssl.cmake 2014-01-28 10:44:01 +0000
@@ -232,8 +232,7 @@
232 MYSQL_USE_BUNDLED_SSL()232 MYSQL_USE_BUNDLED_SSL()
233 ENDIF()233 ENDIF()
234 ELSE()234 ELSE()
235 MESSAGE(SEND_ERROR235 MESSAGE(SEND_ERROR "Wrong option for WITH_SSL. Valid values are: " ${WITH_SSL_DOC})
236 "Wrong option for WITH_SSL. Valid values are : "${WITH_SSL_DOC})
237 ENDIF()236 ENDIF()
238ENDMACRO()237ENDMACRO()
239238

Subscribers

People subscribed via source and target branches