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

Proposed by Tomislav Plavcic on 2014-05-27
Status: Merged
Approved by: Laurynas Biveinis on 2014-05-28
Approved revision: 647
Merged at revision: 663
Proposed branch: lp:~tplavcic/percona-server/bug1319670-5.5
Merge into: lp:percona-server/5.5
Diff against target: 94 lines (+20/-9) (has conflicts)
3 files modified
build-ps/build-binary.sh (+14/-3)
build-ps/debian/rules (+4/-4)
build-ps/percona-server.spec (+2/-2)
Text conflict in build-ps/build-binary.sh
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1319670-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-05-27 Approve on 2014-05-28
Review via email: mp+221016@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.
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Same comment re. DEBVERSION as in 5.1.

review: Needs Fixing
Tomislav Plavcic (tplavcic) wrote :

DEBVERSION was removed

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-18 04:06:52 +0000
3+++ build-ps/build-binary.sh 2014-05-27 06:20:52 +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@@ -192,7 +200,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 $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY
33@@ -217,7 +224,11 @@
34 # Build UDF
35 (
36 cd "UDF"
37+<<<<<<< TREE
38 autoreconf --install
39+=======
40+ autoreconf --install
41+>>>>>>> MERGE-SOURCE
42 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
43 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
44 make $MAKE_JFLAG
45
46=== modified file 'build-ps/debian/rules'
47--- build-ps/debian/rules 2014-03-31 05:35:44 +0000
48+++ build-ps/debian/rules 2014-05-27 06:20:52 +0000
49@@ -4,7 +4,9 @@
50 export DEB_BUILD_HARDENING=1
51
52 PACKAGE=percona-server-5.5
53-PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")
54+PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
55+REVISION = '@@REVISION@@'
56+COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
57
58 TMP=$(CURDIR)/debian/tmp/
59 prefix=/usr
60@@ -13,7 +15,6 @@
61 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
62 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
63 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
64-DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
65
66 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
67 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
68@@ -71,8 +72,7 @@
69 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
70 -DWITH_LIBWRAP=ON \
71 -DWITH_SSL=system \
72- -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
73- -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
74+ -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \
75 -DSYSTEM_TYPE="debian-linux-gnu" \
76 -DINSTALL_LAYOUT=RPM \
77 -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
78
79=== modified file 'build-ps/percona-server.spec'
80--- build-ps/percona-server.spec 2014-04-26 13:57:29 +0000
81+++ build-ps/percona-server.spec 2014-05-27 06:20:52 +0000
82@@ -98,10 +98,10 @@
83 # Server comment strings
84 # ----------------------------------------------------------------------------
85 %if %{undefined compilation_comment_debug}
86-%define compilation_comment_debug Percona Server - Debug (GPL), Release rel%{percona_server_version}, Revision %{revision}
87+%define compilation_comment_debug Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{revision}
88 %endif
89 %if %{undefined compilation_comment_release}
90-%define compilation_comment_release Percona Server (GPL), Release rel%{percona_server_version}, Revision %{revision}
91+%define compilation_comment_release Percona Server (GPL), Release %{percona_server_version}, Revision %{revision}
92 %endif
93
94 # ----------------------------------------------------------------------------

Subscribers

People subscribed via source and target branches