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

Merge lp:~tplavcic/percona-server/bug1319670-5.6 into lp:percona-server/5.6

  1. bug1319670-5.6
  2. Merge into 5.6
Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 598
Proposed branch: lp:~tplavcic/percona-server/bug1319670-5.6
Merge into: lp:percona-server/5.6
Diff against target: 89 lines (+16/-11)
3 files modified
build-ps/build-binary.sh (+10/-3)
build-ps/debian/rules (+4/-4)
build-ps/percona-server.spec (+2/-4)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1319670-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+221017@code.launchpad.net

This proposal supersedes a proposal from 2014-05-26.

Description of the change

Updated compilation comment and server suffix
Standard string should be like:
Server version: 5.5.37-35.0 Percona Server (GPL), Release 35.0, Revision 657
This was tested on version 5.6 (PS+TokuDB) but should be tested more before every release

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Same comment re. DEBVERSION as in 5.1/5.5.

review: Needs Fixing
Revision history for this message
Tomislav Plavcic (tplavcic) wrote :

DEBVERSION was removed

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
1=== modified file 'build-ps/build-binary.sh'
2--- build-ps/build-binary.sh 2014-04-25 15:30:49 +0000
3+++ build-ps/build-binary.sh 2014-05-27 06:21:40 +0000
4@@ -144,10 +144,18 @@
5 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
6
7 # Build information
8-REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
9+if test -e "$SOURCEDIR/Docs/INFO_SRC"
10+then
11+ REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
12+elif test -e "$SOURCEDIR/.bzr/branch/last-revision"
13+then
14+ REVISION="$(cd "$SOURCEDIR"; cat .bzr/branch/last-revision | awk -F ' ' '{print $1}')"
15+else
16+ REVISION=""
17+fi
18 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
19 PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}$TAG.$(uname -s).$TARGET"
20-COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
21+COMMENT="Percona Server (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
22 COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
23
24 # Compilation flags
25@@ -194,7 +202,6 @@
26 -DWITH_SSL=system \
27 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
28 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
29- -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
30 -DCOMPILATION_COMMENT="$COMMENT" \
31 -DWITH_PAM=ON \
32 -DWITH_INNODB_MEMCACHED=ON \
33
34=== modified file 'build-ps/debian/rules'
35--- build-ps/debian/rules 2014-05-20 08:54:02 +0000
36+++ build-ps/debian/rules 2014-05-27 06:21:40 +0000
37@@ -4,7 +4,9 @@
38 export DEB_BUILD_HARDENING=1
39
40 PACKAGE=percona-server-5.6
41-PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")
42+PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
43+REVISION = '@@REVISION@@'
44+COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
45
46 TMP=$(CURDIR)/debian/tmp/
47 prefix=/usr
48@@ -14,7 +16,6 @@
49 NCPU = $(shell grep -c processor /proc/cpuinfo)
50 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
51 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
52-DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
53
54 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
55 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
56@@ -74,8 +75,7 @@
57 -DWITH_LIBWRAP=ON \
58 -DWITH_ZLIB=system \
59 -DWITH_SSL=system \
60- -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
61- -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
62+ -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \
63 -DSYSTEM_TYPE="debian-linux-gnu" \
64 -DINSTALL_LAYOUT=RPM \
65 -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
66
67=== modified file 'build-ps/percona-server.spec'
68--- build-ps/percona-server.spec 2014-04-25 15:30:49 +0000
69+++ build-ps/percona-server.spec 2014-05-27 06:21:40 +0000
70@@ -399,8 +399,7 @@
71 -DINSTALL_SUPPORTFILESDIR=share/percona-server \
72 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
73 -DFEATURE_SET="%{feature_set}" \
74- -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
75- -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
76+ -DCOMPILATION_COMMENT="%{compilation_comment_debug}"
77 echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
78 make %{?_smp_mflags}
79 )
80@@ -420,8 +419,7 @@
81 -DINSTALL_SUPPORTFILESDIR=share/percona-server \
82 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
83 -DFEATURE_SET="%{feature_set}" \
84- -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
85- -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
86+ -DCOMPILATION_COMMENT="%{compilation_comment_release}"
87 echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
88 make %{?_smp_mflags}
89 )

Subscribers

People subscribed via source and target branches