Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~abychko/percona-xtrabackup/XB-2.2-BLD-68 into lp:percona-xtrabackup/2.2

  1. XB-2.2-BLD-68
  2. Merge into 2.2
Proposed by Alexey Bychko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 4953
Proposed branch: lp:~abychko/percona-xtrabackup/XB-2.2-BLD-68
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 328 lines (+52/-115)
11 files modified
cmake/make_dist.cmake.in (+0/-9)
cmake/mysql_version.cmake (+1/-1)
cmake/ssl.cmake (+1/-1)
storage/innobase/xtrabackup/utils/build-binary.sh (+4/-23)
storage/innobase/xtrabackup/utils/build-dpkg.sh (+27/-47)
storage/innobase/xtrabackup/utils/build-rpm.sh (+5/-5)
storage/innobase/xtrabackup/utils/debian/control (+1/-1)
storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install (+0/-1)
storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install (+0/-6)
storage/innobase/xtrabackup/utils/debian/rules (+2/-8)
storage/innobase/xtrabackup/utils/percona-xtrabackup.spec (+11/-13)
To merge this branch: bzr merge lp:~abychko/percona-xtrabackup/XB-2.2-BLD-68
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+209922@code.launchpad.net

Description of the change

[*] fixed tar name in cmake dist target
[*] fixed build-binary.sh
[*] fixed build-rpm.sh
[*] fixed rpm spec
[*] fixed build-deb.sh
[*] fixed debian build file & logic

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cmake/make_dist.cmake.in'
--- cmake/make_dist.cmake.in 2013-02-26 05:45:28 +0000
+++ cmake/make_dist.cmake.in 2014-03-07 13:36:02 +0000
@@ -119,15 +119,6 @@
119CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc119CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
120 ${PACKAGE_DIR}/sql/sql_yacc.cc COPYONLY)120 ${PACKAGE_DIR}/sql/sql_yacc.cc COPYONLY)
121121
122# Copy spec files
123SET(SPECFILENAME "mysql.${VERSION}.spec")
124IF("${VERSION}" MATCHES "-ndb-")
125 STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
126 SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
127ENDIF()
128CONFIGURE_FILE(${CMAKE_BINARY_DIR}/support-files/${SPECFILENAME}
129 ${PACKAGE_DIR}/support-files/${SPECFILENAME} COPYONLY)
130
131# Add documentation, if user has specified where to find them122# Add documentation, if user has specified where to find them
132IF(MYSQL_DOCS_LOCATION)123IF(MYSQL_DOCS_LOCATION)
133 MESSAGE("Copying documentation files from " ${MYSQL_DOCS_LOCATION})124 MESSAGE("Copying documentation files from " ${MYSQL_DOCS_LOCATION})
134125
=== modified file 'cmake/mysql_version.cmake'
--- cmake/mysql_version.cmake 2013-11-27 08:36:11 +0000
+++ cmake/mysql_version.cmake 2014-03-07 13:36:02 +0000
@@ -128,7 +128,7 @@
128ENDIF()128ENDIF()
129129
130IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)130IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
131 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-${VERSION}")131 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "percona-xtrabackup-${XB_VERSION}")
132 IF("${VERSION}" MATCHES "-ndb-")132 IF("${VERSION}" MATCHES "-ndb-")
133 STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")133 STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
134 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-cluster-gpl-${NDBVERSION}")134 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-cluster-gpl-${NDBVERSION}")
135135
=== modified file 'cmake/ssl.cmake'
--- cmake/ssl.cmake 2013-02-26 05:45:28 +0000
+++ cmake/ssl.cmake 2014-03-07 13:36:02 +0000
@@ -234,7 +234,7 @@
234 ENDIF()234 ENDIF()
235 ELSE()235 ELSE()
236 MESSAGE(SEND_ERROR236 MESSAGE(SEND_ERROR
237 "Wrong option for WITH_SSL. Valid values are : "${WITH_SSL_DOC})237 "Wrong option for WITH_SSL. Valid values are: " ${WITH_SSL_DOC})
238 ENDIF()238 ENDIF()
239ENDMACRO()239ENDMACRO()
240240
241241
=== modified file 'storage/innobase/xtrabackup/utils/build-binary.sh'
--- storage/innobase/xtrabackup/utils/build-binary.sh 2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/utils/build-binary.sh 2014-03-07 13:36:02 +0000
@@ -43,7 +43,7 @@
43# Working directory43# Working directory
44if test "$#" -eq 044if test "$#" -eq 0
45then45then
46 WORKDIR="$(pwd)"46 WORKDIR="$(readlink -f $(dirname $0)/../../../../)"
47 47
48 # Check that the current directory is not empty48 # Check that the current directory is not empty
49 if test "x$(echo *)" != "x*"49 if test "x$(echo *)" != "x*"
@@ -107,28 +107,9 @@
107 cd $SOURCEDIR107 cd $SOURCEDIR
108108
109 # Install the files109 # Install the files
110 mkdir "$INSTALLDIR/bin" "$INSTALLDIR/share"110 mkdir -p "$INSTALLDIR"
111 mkdir -p "$INSTALLDIR/share/doc/percona-xtrabackup"111 cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" . && make $MAKE_JFLAG
112112 make install
113 cmake -DBUILD_CONFIG=xtrabackup_release . && make $MAKE_JFLAG
114
115 install -m 755 storage/innobase/xtrabackup/src/xtrabackup \
116 "$INSTALLDIR/bin"
117
118 install -m 755 storage/innobase/xtrabackup/src/xbstream \
119 "$INSTALLDIR/bin"
120
121 install -m 755 storage/innobase/xtrabackup/src/xbcrypt \
122 "$INSTALLDIR/bin"
123
124 install -m 755 storage/innobase/xtrabackup/innobackupex \
125 "$INSTALLDIR/bin"
126
127 install -m 644 storage/innobase/xtrabackup/COPYING \
128 "$INSTALLDIR/share/doc/percona-xtrabackup"
129
130 cp -R storage/innobase/xtrabackup/test \
131 "$INSTALLDIR/share/percona-xtrabackup-test"
132113
133 )114 )
134 exit_value=$?115 exit_value=$?
135116
=== modified file 'storage/innobase/xtrabackup/utils/build-dpkg.sh'
--- storage/innobase/xtrabackup/utils/build-dpkg.sh 2013-11-27 10:55:41 +0000
+++ storage/innobase/xtrabackup/utils/build-dpkg.sh 2014-03-07 13:36:02 +0000
@@ -40,7 +40,7 @@
40 esac40 esac
41done41done
4242
43SOURCEDIR="$(cd $(dirname "$0"); pwd)"43SOURCEDIR="$(readlink -f $(dirname "$0")/../../../../)"
4444
45# Read version info from the XB_VERSION file45# Read version info from the XB_VERSION file
46. $SOURCEDIR/XB_VERSION46. $SOURCEDIR/XB_VERSION
@@ -87,53 +87,33 @@
87export DEB_DUMMY="$DUMMY"87export DEB_DUMMY="$DUMMY"
8888
89# Build89# Build
90(90 # Prepare source directory for dpkg-source
91 (91 TMPDIR=$(mktemp -d)
92 # Prepare source directory for dpkg-source92 cd ${TMPDIR}
93 cd "$SOURCEDIR"93 cmake "$SOURCEDIR"
94
95 make DUMMY="$DUMMY" dist94 make DUMMY="$DUMMY" dist
96
97 if ! test -d debian
98 then
99 cp -a utils/debian/ .
100 fi
101
102 # Update distribution
103 dch -m -D "$DEBIAN_VERSION" --force-distribution \
104 -v "$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX" 'Update distribution'
105
106 )
107
108 # Create the original tarball95 # Create the original tarball
109 mv "$SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \96 mv "${TMPDIR}/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz" \
110 "$WORKDIR/percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"97 "$WORKDIR/percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
11198 rm -fr ${TMPDIR}
112 (99 #
113 cd "$WORKDIR"100 cd "$WORKDIR"
114101 rm -fr percona-xtrabackup-$XTRABACKUP_VERSION
115 # Create the rest of the source, ignoring changes since we may be in the102 tar xzf percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz
116 # sourcedir.103 cd percona-xtrabackup-$XTRABACKUP_VERSION
117 dpkg-source -i'.*' -b "$SOURCEDIR"104 cp -a storage/innobase/xtrabackup/utils/debian .
118105
119 # Unpack it106 # Update distribution
120 dpkg-source -x "percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX.dsc"107 dch -m -D "$DEBIAN_VERSION" --force-distribution \
121108 -v "$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX" 'Update distribution'
122 (109
123 cd "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"110 #Do not build transitional packages if requested
124111 if test "x$NOTRANSITIONAL" = "xyes"
125 # Don't build transitional packages if requested112 then
126 if test "x$NOTRANSITIONAL" = "xyes"113 sed -i '/Package: xtrabackup/,/^$/d' debian/control
127 then114 fi
128 sed -i '/Package: xtrabackup/,/^$/d' debian/control115
129 fi116 # Issue dpkg-buildpackage command
130117 dpkg-buildpackage $DPKG_BINSRC $BUILDPKG_KEY
131 # Issue dpkg-buildpackage command118 rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION"
132 dpkg-buildpackage $DPKG_BINSRC $BUILDPKG_KEY119
133
134 )
135
136 rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"
137
138 )
139)
140120
=== modified file 'storage/innobase/xtrabackup/utils/build-rpm.sh'
--- storage/innobase/xtrabackup/utils/build-rpm.sh 2013-11-27 10:55:41 +0000
+++ storage/innobase/xtrabackup/utils/build-rpm.sh 2014-03-07 13:36:02 +0000
@@ -91,7 +91,7 @@
9191
92fi92fi
9393
94SOURCEDIR="$(cd $(dirname "$0"); cd ../../../../; pwd)"94SOURCEDIR="$(readlink -f $(dirname "$0")/../../../..)"
95test -e "$SOURCEDIR/XB_VERSION" || exit 295test -e "$SOURCEDIR/XB_VERSION" || exit 2
9696
97# Read version info from the XB_VERSION file97# Read version info from the XB_VERSION file
@@ -129,14 +129,14 @@
129 mkdir -p BUILD SOURCES RPMS SRPMS129 mkdir -p BUILD SOURCES RPMS SRPMS
130130
131 # Create the source archive131 # Create the source archive
132 (cd "$SOURCEDIR"; make DUMMY="$DUMMY" dist)132 (cd "$SOURCEDIR"; cmake .; make DUMMY="$DUMMY" dist)
133133
134 cp $SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz \134 cp $SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz SOURCES/
135 SOURCES/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz135 cp $SOURCEDIR/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec SPECS/
136136
137 # Issue RPM command137 # Issue RPM command
138 rpmbuild $SIGN $TARGET $TARGET_LIBDIR $TARGET_ARCH $DUMMY \138 rpmbuild $SIGN $TARGET $TARGET_LIBDIR $TARGET_ARCH $DUMMY \
139 -ba --clean "$SOURCEDIR/utils/xtrabackup.spec" \139 -ba --clean SPECS/percona-xtrabackup.spec \
140 --define "_topdir $WORKDIR_ABS" \140 --define "_topdir $WORKDIR_ABS" \
141 --define "xtrabackup_version $XTRABACKUP_VERSION" \141 --define "xtrabackup_version $XTRABACKUP_VERSION" \
142 --define "xtrabackup_revision $REVISION" \142 --define "xtrabackup_revision $REVISION" \
143143
=== modified file 'storage/innobase/xtrabackup/utils/debian/control'
--- storage/innobase/xtrabackup/utils/debian/control 2013-12-11 01:06:14 +0000
+++ storage/innobase/xtrabackup/utils/debian/control 2014-03-07 13:36:02 +0000
@@ -2,7 +2,7 @@
2Section: database2Section: database
3Priority: extra3Priority: extra
4Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>4Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
5Uploaders: Stewart Smith <stewart.smith@percona.com>, Alexey Bychko <alexey.bychko@percona.com>, Clint Byrum <clint@fewbar.com>5Uploaders: Alexey Bychko <alexey.bychko@percona.com>, Clint Byrum <clint@fewbar.com>
6Build-Depends: automake,6Build-Depends: automake,
7 bison,7 bison,
8 ca-certificates,8 ca-certificates,
99
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.dirs' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install'
--- storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.dirs 2013-09-26 06:20:33 +0000
+++ storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install 2014-03-07 13:36:02 +0000
@@ -1,1 +1,1 @@
1usr/share/percona-xtrabackup-test1/usr/share/percona-xtrabackup-test
22
=== removed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install'
--- storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install 2013-09-26 06:20:33 +0000
+++ storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1test/* usr/share/percona-xtrabackup-test
20
=== added file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install'
--- storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install 2014-03-07 13:36:02 +0000
@@ -0,0 +1,1 @@
1/usr/bin
02
=== removed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install'
--- storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install 2013-09-26 06:20:33 +0000
+++ storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1innobackupex usr/bin/
2xbcrypt usr/bin/
3xbstream usr/bin/
4xtrabackup usr/bin/
5xtrabackup_55 usr/bin/
6xtrabackup_56 usr/bin/
70
=== modified file 'storage/innobase/xtrabackup/utils/debian/rules'
--- storage/innobase/xtrabackup/utils/debian/rules 2013-11-27 03:29:12 +0000
+++ storage/innobase/xtrabackup/utils/debian/rules 2014-03-07 13:36:02 +0000
@@ -20,14 +20,8 @@
20override_dh_auto_build:20override_dh_auto_build:
2121
22ifeq "$(DEB_DUMMY)" ""22ifeq "$(DEB_DUMMY)" ""
23 ./utils/build.sh xtradb23 cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \
24 cp src/xtrabackup src/xbstream src/xbcrypt .24 -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test .
25
26 ./utils/build.sh xtradb55
27 cp src/xtrabackup_55 .
28
29 ./utils/build.sh xtradb56
30 cp src/xtrabackup_56 .
31else25else
32 # Dummy binaries that avoid compilation26 # Dummy binaries that avoid compilation
33 echo 'main() { return 300; }' | gcc -x c - -o xtrabackup27 echo 'main() { return 300; }' | gcc -x c - -o xtrabackup
3428
=== renamed file 'storage/innobase/xtrabackup/utils/xtrabackup.spec' => 'storage/innobase/xtrabackup/utils/percona-xtrabackup.spec'
--- storage/innobase/xtrabackup/utils/xtrabackup.spec 2013-11-27 10:55:41 +0000
+++ storage/innobase/xtrabackup/utils/percona-xtrabackup.spec 2014-03-07 13:36:02 +0000
@@ -3,7 +3,7 @@
3#3#
4%{!?redhat_version:%define redhat_version 5}4%{!?redhat_version:%define redhat_version 5}
5%{!?buildnumber:%define buildnumber 1}5%{!?buildnumber:%define buildnumber 1}
6%define distribution rhel%{redhat_version}6%define distribution el%{redhat_version}
7%define release %{buildnumber}.%{distribution}7%define release %{buildnumber}.%{distribution}
8%{!?xtrabackup_revision:%define xtrabackup_revision undefined}8%{!?xtrabackup_revision:%define xtrabackup_revision undefined}
99
@@ -63,9 +63,12 @@
63export CXX=${CXX-"g++"}63export CXX=${CXX-"g++"}
64export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 64export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
65export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 65export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
66cp src/xtrabackup_56 .66#
67cmake -DBUILD_CONFIG=xtrabackup_release . && make -j667
68cp storage/innobase/xtrabackup/src/xtrabackup .68cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=%{_prefix} \
69 -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test .
70%{__make} %{?_smp_mflags}
71
69%else72%else
70# Dummy binaries that avoid compilation73# Dummy binaries that avoid compilation
71echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xtrabackup74echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xtrabackup
@@ -75,15 +78,10 @@
7578
76%install79%install
77[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}80[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}
78install -d %{buildroot}%{_bindir}81
79install -d %{buildroot}%{_datadir}82%makeinstall
80# install binaries and configs83%{__make} install DESTDIR=$RPM_BUILD_ROOT
8184
82install -m 755 storage/innobase/xtrabackup/src/xtrabackup %{buildroot}%{_bindir}
83install -m 755 storage/innobase/xtrabackup/innobackupex %{buildroot}%{_bindir}
84install -m 755 storage/innobase/xtrabackup/src/xbstream %{buildroot}%{_bindir}
85install -m 755 storage/innobase/xtrabackup/src/xbcrypt %{buildroot}%{_bindir}
86cp -R storage/innobase/xtrabackup/test %{buildroot}%{_datadir}/percona-xtrabackup-test
8785
88%clean86%clean
89[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}87[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}

Subscribers

People subscribed via source and target branches