Merge lp:~stewart/percona-xtrabackup/source-dist-refactor into lp:percona-xtrabackup/2.1

Proposed by Stewart Smith
Status: Merged
Merged at revision: 623
Proposed branch: lp:~stewart/percona-xtrabackup/source-dist-refactor
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 465 lines (+165/-102)
9 files modified
Makefile (+108/-0)
utils/build-binary.sh (+9/-11)
utils/build-dpkg.sh (+8/-44)
utils/build-rpm.sh (+4/-8)
utils/build.sh (+15/-22)
utils/debian/control (+14/-4)
utils/debian/percona-xtrabackup.install (+3/-3)
utils/debian/rules (+3/-9)
utils/debian/source/format (+1/-1)
To merge this branch: bzr merge lp:~stewart/percona-xtrabackup/source-dist-refactor
Reviewer Review Type Date Requested Status
Ignacio Nin (community) optionalenhancements Needs Fixing
Alexey Kopytov (community) Approve
Review via email: mp+167709@code.launchpad.net

Description of the change

This branch does a relatively major refactoring of how we produce source tarballs and build Debian (and RedHat) packages.

In order to have XtraBackup packages in the Debian/Ubuntu archives we absolutely can not require an internet connection during build. This means our source tarball needs to contain *everything* we need to build that isn't already a build-dependency.

So, the first part of this change is to add a top level Makefile with a "make dist" target that will ensure all the appropriate MySQL and Percona Server source trees are present. Since the Percona Server source tarballs from the versions we build against were not pure "bzr export" source tarballs, we have to construct them. So the make dist target calls targets to make that happen.

We then modify the build-dpkg.sh and build-rpm.sh scripts so that they will work from source tarballs (which now include a special REVNO file that will have the bzr revno in it so that we preserve this part of the binary/source tarball names.

I have also constructed a set of jenkins jobs that build a source tarball from the bzr tree, then use that source tarball to construct debian source packages, and then use those debian source packages to build debian binary packages. There is also a "build RPMs from source tarball" job.

I have also incorporated a couple of small changes based on feedback from Clint on our debian packaging: removing boilerplate comments, running an automated sort and indenter and switching to "3.0 (quilt)" rather than "3.0 (native)" format.

Jenkins run: http://jenkins.percona.com/job/percona-xtrabackup-2.1-param/326/

Jenkins jobs for new way of building: http://jenkins.percona.com/job/percona-xtrabackup-2.1-stewart/

Once we merge this, we start the official bit of having XtraBackup in Debian. This MP is the essential changes needed to get into that discussion with Debian.

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

Approved after fixing a wrong copy-paste:

109 + @echo "innodb51source - source tarball for MySQL 5.1 needed for XB"
110 + @echo "innodb55source - source tarball for MySQL 5.1 needed for XB"
111 + @echo "innodb56source - source tarball for MySQL 5.1 needed for XB"
112 +

review: Approve
Revision history for this message
Stewart Smith (stewart) wrote :

Alexey Kopytov <email address hidden> writes:
> Approved after fixing a wrong copy-paste:
>
> 109 + @echo "innodb51source - source tarball for MySQL 5.1 needed for XB"
> 110 + @echo "innodb55source - source tarball for MySQL 5.1 needed for XB"
> 111 + @echo "innodb56source - source tarball for MySQL 5.1 needed for XB"
> 112 +

fixed and pushed (as a sep commit as I've started building on top of
this branch in another one and who knows if rebase works anymore...)

--
Stewart Smith

Revision history for this message
Ignacio Nin (ignacio-nin) wrote :

make dist works perfectly, but a couple of comments in build-*.sh:

build-rpm.sh: shebang added -x, not sure why -- perhaps a debugging step?
- $SOURCEDIR/../percona-xtrabackup-$XTRABACKUP_VERSION*.tar.gz is hardcoded as the source, making the script unnecesarily fail in current cases (including the most common case). We can solve this by instead changing the bzr export for a cp -a, and we'd keep the script functional in the current cases.

build-dpkg: Unnecesarily stripping the ability to build in any directory (WORKDIR, SOURCEDIR). Again we can keep this functionality and add the new changes by substituting the bzr export for a cp -a, and the change would be even smaller.

I can rework to include these changes if wanted, else if you feel they aren't needed you can go ahead with the merge.

review: Needs Fixing (optionalenhancements)
Revision history for this message
Stewart Smith (stewart) wrote :

Ignacio Nin <email address hidden> writes:
> Review: Needs Fixing optionalenhancements
>
> make dist works perfectly, but a couple of comments in build-*.sh:
>
> build-rpm.sh: shebang added -x, not sure why -- perhaps a debugging
> step?

Yep, for debugging... I can't remember what I hit at some point, but it
helped in working things out.

> - $SOURCEDIR/../percona-xtrabackup-$XTRABACKUP_VERSION*.tar.gz is
> hardcoded as the source, making the script unnecesarily fail in
> current cases (including the most common case). We can solve this by
> instead changing the bzr export for a cp -a, and we'd keep the script
> functional in the current cases.

That could indeed work, although isn't current jobs having workdir as
subdir of sourcedir, which wouldn't work with cp -a.

> build-dpkg: Unnecesarily stripping the ability to build in any
> directory (WORKDIR, SOURCEDIR). Again we can keep this functionality
> and add the new changes by substituting the bzr export for a cp -a,
> and the change would be even smaller.

we'd need to point build-dpkg at the source tarball anyway.. so I'm not
too sure of the benefit (you have to build the source tarball before you
can build debs)

> I can rework to include these changes if wanted, else if you feel they
> aren't needed you can go ahead with the merge.

I'd be interested to see the patch, but I don't think it's urgent for
getting out some source tarballs that we can use for debian.

--
Stewart Smith

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Makefile'
2--- Makefile 1970-01-01 00:00:00 +0000
3+++ Makefile 2013-06-18 08:09:29 +0000
4@@ -0,0 +1,108 @@
5+MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
6+
7+.PHONY : dist
8+
9+# Here we specify what server versions we build against
10+
11+MYSQL_51_SOURCE=mysql-5.1.59.tar.gz
12+MYSQL_55_SOURCE=mysql-5.5.17.tar.gz
13+MYSQL_56_SOURCE=mysql-5.6.10.tar.gz
14+PS_51_VERSION=5.1.59-13.0
15+PS_51_SOURCE=Percona-Server-XtraBackup-$(PS_51_VERSION).tar.gz
16+PS_55_VERSION=5.5.16-22.0
17+PS_55_SOURCE=Percona-Server-XtraBackup-$(PS_55_VERSION).tar.gz
18+BZR_REVNO=$(shell bzr revno 2>/dev/null || cat REVNO)
19+XTRABACKUP_VERSION=$(shell sed -e 's/XTRABACKUP_VERSION=//' < VERSION)
20+
21+# targets for fetching server source tarballs
22+
23+SERVER_SOURCE_TARBALLS=$(MYSQL_51_SOURCE) $(MYSQL_55_SOURCE) $(MYSQL_56_SOURCE)
24+PS_SERVER=$(PS_51_SOURCE) $(PS_55_SOURCE)
25+
26+# PS server source tarballs are inadequate
27+# for these older versions, so we have to make them ourselves
28+
29+.PHONY: ps51source ps55source
30+
31+ps51source: $(PS_51_SOURCE)
32+
33+
34+$(PS_51_SOURCE):
35+ rm -rf percona-server-5.1-xtrabackup
36+ bzr branch -r tag:Percona-Server-$(PS_51_VERSION) lp:percona-server/5.1 percona-server-5.1-xtrabackup
37+ cd percona-server-5.1-xtrabackup && bzr export percona-server-5.1-xtrabackup.tar.gz
38+ mv percona-server-5.1-xtrabackup/percona-server-5.1-xtrabackup.tar.gz .
39+ rm -rf percona-server-5.1-xtrabackup
40+ tar xfz percona-server-5.1-xtrabackup.tar.gz
41+ cd percona-server-5.1-xtrabackup && make mysql-$(shell echo $(PS_51_VERSION) | sed -e 's/-.*//').tar.gz
42+ rm percona-server-5.1-xtrabackup.tar.gz
43+ tar cfz $(PS_51_SOURCE) percona-server-5.1-xtrabackup
44+ rm -rf percona-server-5.1-xtrabackup
45+
46+ps55source: $(PS_55_SOURCE)
47+
48+$(PS_55_SOURCE):
49+ rm -rf percona-server-5.5-xtrabackup
50+ bzr branch -r tag:Percona-Server-$(PS_55_VERSION) lp:percona-server/5.5 percona-server-5.5-xtrabackup
51+ cd percona-server-5.5-xtrabackup && bzr export percona-server-5.5-xtrabackup.tar.gz
52+ mv percona-server-5.5-xtrabackup/percona-server-5.5-xtrabackup.tar.gz .
53+ rm -rf percona-server-5.5-xtrabackup
54+ tar xfz percona-server-5.5-xtrabackup.tar.gz
55+ cd percona-server-5.5-xtrabackup && make mysql-$(shell echo $(PS_55_VERSION) | sed -e 's/-.*//').tar.gz
56+ rm percona-server-5.5-xtrabackup.tar.gz
57+ tar cfz $(PS_55_SOURCE) percona-server-5.5-xtrabackup
58+ rm -rf percona-server-5.5-xtrabackup
59+
60+# source dist targets
61+
62+dist: $(SERVER_SOURCE_TARBALLS) $(PS_SERVER)
63+ bzr export percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
64+ tar xfz percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
65+ cp $(SERVER_SOURCE_TARBALLS) $(PS_SERVER) percona-xtrabackup-$(XTRABACKUP_VERSION)/
66+ echo $(BZR_REVNO) > percona-xtrabackup-$(XTRABACKUP_VERSION)/REVNO
67+ rm percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
68+ tar cfz percona-xtrabackup-$(XTRABACKUP_VERSION)-$(BZR_REVNO).tar.gz percona-xtrabackup-$(XTRABACKUP_VERSION)
69+ rm -rf percona-xtrabackup-$(XTRABACKUP_VERSION)
70+
71+$(SERVER_SOURCE_TARBALLS):
72+ wget $(MASTER_SITE)/$@
73+
74+# fake clean/distclean targets... we explicitly do *NOT* want to clean
75+# away the tarballs as we actually need to ship them
76+
77+.PHONY: clean distclean
78+
79+clean:
80+
81+distclean:
82+
83+
84+.PHONY: innodb51source
85+
86+innodb51source: $(MYSQL_51_SOURCE)
87+
88+.PHONY: innodb55source
89+
90+innodb55source: $(MYSQL_55_SOURCE)
91+
92+.PHONY: innodb56source
93+
94+innodb56source: $(MYSQL_56_SOURCE)
95+
96+# HELP
97+
98+.PHONY: help
99+
100+help:
101+ @echo "Build targets for Percona XtraBackup"
102+ @echo "------------------------------------"
103+ @echo "Source:"
104+ @echo
105+ @echo "dist - source code tarball"
106+ @echo ""
107+ @echo "ps51source - source tarball for PS 5.1 for XB"
108+ @echo "ps55source - source tarball for PS 5.5 for XB"
109+ @echo "innodb51source - source tarball for MySQL 5.1 needed for XB"
110+ @echo "innodb55source - source tarball for MySQL 5.5 needed for XB"
111+ @echo "innodb56source - source tarball for MySQL 5.6 needed for XB"
112+
113
114=== modified file 'utils/build-binary.sh'
115--- utils/build-binary.sh 2013-05-08 09:56:30 +0000
116+++ utils/build-binary.sh 2013-06-18 08:09:29 +0000
117@@ -1,4 +1,4 @@
118-#!/bin/sh
119+#!/bin/bash
120 #
121 # Execute this tool to setup the environment and build binary releases
122 # for xtrabackup starting from a fresh tree.
123@@ -81,7 +81,7 @@
124 . $SOURCEDIR/VERSION
125
126 # Build information
127-REVISION="$(cd "$SOURCEDIR"; bzr revno)"
128+REVISION="$(cd "$SOURCEDIR"; bzr revno 2>/dev/null || cat REVNO)"
129
130 # Compilation flags
131 export CC=${CC:-gcc}
132@@ -92,7 +92,7 @@
133
134 # Create a temporary working directory
135 BASEINSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d xtrabackup-build.XXXXXX)"
136-INSTALLDIR="$WORKDIR_ABS/$BASEINSTALLDIR/percona-xtrabackup-$XTRABACKUP_VERSION" # Make it absolute
137+INSTALLDIR="$WORKDIR_ABS/$BASEINSTALLDIR/percona-xtrabackup-$XTRABACKUP_VERSION-`uname -s`-`arch`" # Make it absolute
138
139 mkdir "$INSTALLDIR"
140
141@@ -102,14 +102,12 @@
142 (
143 cd "$WORKDIR"
144
145- # Make a copy of the source
146- rm -f "percona-xtrabackup-$XTRABACKUP_VERSION"
147-
148- bzr export "percona-xtrabackup-$XTRABACKUP_VERSION" "$SOURCEDIR"
149+ # we don't make a copy of source, we build "in tree"
150+ # as we assume you've already done the extract source tarball thing.
151
152 # Build proper
153 (
154- cd "percona-xtrabackup-$XTRABACKUP_VERSION"
155+ cd $SOURCEDIR
156
157 # Install the files
158 mkdir "$INSTALLDIR/bin" "$INSTALLDIR/share"
159@@ -140,13 +138,13 @@
160
161 if test "x$exit_value" = "x0"
162 then
163- $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \
164+ $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION-`uname -s`-`arch`.tar.gz" \
165 --owner=0 --group=0 -C "$INSTALLDIR/../" \
166- "percona-xtrabackup-$XTRABACKUP_VERSION"
167+ "percona-xtrabackup-$XTRABACKUP_VERSION-`uname -s`-`arch`"
168 fi
169
170 # Clean up build dir
171- rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION"
172+ rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION-`uname -s`-`arch`"
173
174 exit $exit_value
175
176
177=== modified file 'utils/build-dpkg.sh'
178--- utils/build-dpkg.sh 2013-05-08 09:56:30 +0000
179+++ utils/build-dpkg.sh 2013-06-18 08:09:29 +0000
180@@ -1,4 +1,4 @@
181-#!/bin/sh
182+#!/bin/bash
183 # Usage: build-dpkg.sh [target dir]
184 # The default target directory is the current directory. If it is not
185 # supplied and the current directory is not empty, it will issue an error in
186@@ -37,43 +37,11 @@
187 esac
188 done
189
190-# Working directory
191-if test "$#" -eq 0
192-then
193- WORKDIR="$(pwd)"
194-
195- # Check that the current directory is not empty
196- if test "x$(echo *)" != "x*"
197- then
198- echo >&2 \
199- "Current directory is not empty. Use $0 . to force build in ."
200- exit 1
201- fi
202-
203-elif test "$#" -eq 1
204-then
205- WORKDIR="$1"
206-
207- # Check that the provided directory exists and is a directory
208- if ! test -d "$WORKDIR"
209- then
210- echo >&2 "$WORKDIR is not a directory"
211- exit 1
212- fi
213-
214-else
215- echo >&2 "Usage: $0 [target dir]"
216- exit 1
217-
218-fi
219-
220-SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
221-
222 # Read XTRABACKUP_VERSION from the VERSION file
223-. $SOURCEDIR/VERSION
224+. VERSION
225
226 DEBIAN_VERSION="$(lsb_release -sc)"
227-REVISION="$(cd "$SOURCEDIR"; bzr revno)"
228+REVISION="$(bzr revno 2>/dev/null || cat REVNO)"
229 FULL_VERSION="$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION"
230
231 # Build information
232@@ -90,15 +58,14 @@
233
234 # Build
235 (
236- # Make a copy in workdir and copy debian files
237- cd "$WORKDIR"
238- bzr export "percona-xtrabackup-$FULL_VERSION" "$SOURCEDIR"
239+ # we assume we're in the source directory, as we assume
240+ # that we've done "make dist" before.
241
242 (
243- cd "percona-xtrabackup-$FULL_VERSION"
244+ T=`ls -1 ../percona-xtrabackup*tar.gz`; TO=`echo $T|sed -e 's/percona-xtrabackup-/percona-xtrabackup_/; s/\.tar\.gz/.orig.tar.gz/;'`; mv $T $TO
245
246 # Move the debian dir to the appropriate place
247- cp -a "$SOURCEDIR/utils/debian/" .
248+ cp -a "utils/debian/" .
249
250 # Don't build transitional packages if requested
251 if test "x$NOTRANSITIONAL" = "xyes"
252@@ -107,12 +74,9 @@
253 fi
254
255 # Update distribution
256- dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION" 'Update distribution'
257+ dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$XTRABACKUP_VERSION-$REVISION-1" 'Update distribution'
258 # Issue dpkg-buildpackage command
259 dpkg-buildpackage $DPKG_BINSRC $BUILDPKG_KEY
260
261 )
262-
263- rm -rf "percona-xtrabackup-$FULL_VERSION"
264-
265 )
266
267=== modified file 'utils/build-rpm.sh'
268--- utils/build-rpm.sh 2013-05-08 09:56:30 +0000
269+++ utils/build-rpm.sh 2013-06-18 08:09:29 +0000
270@@ -1,4 +1,4 @@
271-#!/bin/bash
272+#!/bin/bash -x
273 #
274 # Execute this tool to setup and build RPMs for XtraBackup starting
275 # from a fresh tree
276@@ -100,7 +100,7 @@
277 # Build information
278 REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
279 cut -d ' ' -f 2)"
280-REVISION="$(cd "$SOURCEDIR"; bzr revno)"
281+REVISION="$(cd "$SOURCEDIR"; (bzr revno 2>/dev/null || cat REVNO))"
282
283 # Fix problems in rpmbuild for rhel4: _libdir and _arch are not correctly set.
284 if test "x$REDHAT_RELEASE" == "x4" && test "x$TARGET_ARG" == "xi686"
285@@ -126,12 +126,8 @@
286
287 mkdir -p BUILD SOURCES RPMS SRPMS
288
289- # Copy source to SOURCE dir -- create a suitable tar
290- rm -f "SOURCE/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz"
291-
292- bzr export \
293- "$WORKDIR_ABS/SOURCES/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz" \
294- "$SOURCEDIR"
295+ # FIXME: spec file should use the VERSION-REVISION instead.
296+ cp $SOURCEDIR/../percona-xtrabackup-$XTRABACKUP_VERSION*.tar.gz SOURCES/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz
297
298 # Issue RPM command
299 rpmbuild $SIGN $TARGET $TARGET_LIBDIR $TARGET_ARCH $DUMMY \
300
301=== modified file 'utils/build.sh'
302--- utils/build.sh 2013-05-07 13:32:47 +0000
303+++ utils/build.sh 2013-06-18 08:09:29 +0000
304@@ -108,7 +108,8 @@
305 then
306 if [ "$AUTO_DOWNLOAD" = "yes" ]
307 then
308- wget "$MASTER_SITE"/$i
309+ # Makefile has foo to download using wget
310+ make $i
311 else
312 echo "Put $i in $top_dir or set environment variable \
313 AUTO_DOWNLOAD to \"yes\""
314@@ -308,19 +309,15 @@
315 then
316 rm -rf $branch_dir
317 fi
318- if [ -d $branch_dir ]
319+
320+ if [ ! -f Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz ]
321 then
322- cd $branch_dir
323- (bzr upgrade || true)
324- bzr clean-tree --force --ignored
325- bzr revert
326- bzr pull --overwrite
327- else
328- bzr branch -r tag:Percona-Server-$PS_51_VERSION \
329- lp:percona-server/5.1 $branch_dir
330- cd $branch_dir
331+ make ps51source
332 fi
333
334+ rm -rf $branch_dir
335+ tar xfz Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz
336+ cd $branch_dir
337 $MAKE_CMD main
338 cd $top_dir
339 rm -rf $server_dir
340@@ -361,20 +358,16 @@
341 then
342 rm -rf $branch_dir
343 fi
344- if [ -d $branch_dir ]
345+
346+ if [ ! -f Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz ]
347 then
348- cd $branch_dir
349- yes | bzr break-lock
350- (bzr upgrade || true)
351- bzr clean-tree --force --ignored
352- bzr revert
353- bzr pull --overwrite
354- else
355- bzr branch -r tag:Percona-Server-$PS_55_VERSION \
356- lp:percona-server $branch_dir
357- cd $branch_dir
358+ make ps55source
359 fi
360
361+ rm -rf $branch_dir
362+ tar xfz Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz
363+ cd $branch_dir
364+
365 $MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
366 cd $top_dir
367 rm -rf $server_dir
368
369=== modified file 'utils/debian/control'
370--- utils/debian/control 2013-05-04 18:04:40 +0000
371+++ utils/debian/control 2013-06-18 08:09:29 +0000
372@@ -2,8 +2,18 @@
373 Section: misc
374 Priority: extra
375 Maintainer: Percona Development <mysql-dev@percona.com>
376-Build-Depends: debhelper (>= 7.3), libaio-dev, wget, automake,
377- libtool, bison, libncurses-dev, libz-dev, libssl-dev, cmake, bzr, ca-certificates
378+Build-Depends: automake,
379+ bison,
380+ bzr,
381+ ca-certificates,
382+ cmake,
383+ debhelper (>= 7.3),
384+ libaio-dev,
385+ libncurses-dev,
386+ libssl-dev,
387+ libtool,
388+ libz-dev,
389+ wget
390 Standards-Version: 3.9.3
391 Homepage: https://launchpad.net/percona-xtrabackup
392 Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.4/files
393@@ -11,7 +21,7 @@
394
395 Package: percona-xtrabackup
396 Architecture: any
397-Depends: ${shlibs:Depends}, ${misc:Depends}, libdbd-mysql-perl
398+Depends: libdbd-mysql-perl, ${misc:Depends}, ${shlibs:Depends}
399 Provides: xtrabackup
400 Breaks: xtrabackup (<< 2.0.0~)
401 Replaces: xtrabackup (<< 2.0.0~)
402@@ -31,7 +41,7 @@
403
404 Package: percona-xtrabackup-test
405 Architecture: any
406-Depends: percona-xtrabackup, python, ${misc:Depends}, mysql-client
407+Depends: mysql-client, percona-xtrabackup, python, ${misc:Depends}
408 Description: Test suite for Percona XtraBackup
409 Test suite for Percona XtraBackup. Install this package if you intend
410 to run XtraBackup's test suite.
411
412=== modified file 'utils/debian/percona-xtrabackup.install'
413--- utils/debian/percona-xtrabackup.install 2013-04-09 07:13:17 +0000
414+++ utils/debian/percona-xtrabackup.install 2013-06-18 08:09:29 +0000
415@@ -1,6 +1,6 @@
416+innobackupex usr/bin/
417+xbcrypt usr/bin/
418+xbstream usr/bin/
419 xtrabackup usr/bin/
420 xtrabackup_55 usr/bin/
421 xtrabackup_56 usr/bin/
422-xbstream usr/bin/
423-xbcrypt usr/bin/
424-innobackupex usr/bin/
425
426=== modified file 'utils/debian/rules'
427--- utils/debian/rules 2013-04-22 21:06:15 +0000
428+++ utils/debian/rules 2013-06-18 08:09:29 +0000
429@@ -1,12 +1,6 @@
430 #!/usr/bin/make -f
431 # -*- makefile -*-
432-# Sample debian/rules that uses debhelper.
433-# This file was originally written by Joey Hess and Craig Small.
434-# As a special exception, when this file is copied by dh-make into a
435-# dh-make output file, you may use that output file without restriction.
436-# This special exception was added by Craig Small in version 0.37 of dh-make.
437
438-# Uncomment this to turn on verbose mode.
439 #export DH_VERBOSE=1
440
441
442@@ -28,13 +22,13 @@
443 override_dh_auto_build:
444
445 ifeq "$(DEB_DUMMY)" ""
446- AUTO_DOWNLOAD=yes ./utils/build.sh xtradb
447+ ./utils/build.sh xtradb
448 cp src/xtrabackup src/xbstream src/xbcrypt .
449
450- AUTO_DOWNLOAD=yes ./utils/build.sh xtradb55
451+ ./utils/build.sh xtradb55
452 cp src/xtrabackup_55 .
453
454- AUTO_DOWNLOAD=yes ./utils/build.sh xtradb56
455+ ./utils/build.sh xtradb56
456 cp src/xtrabackup_56 .
457 else
458 # Dummy binaries that avoid compilation
459
460=== modified file 'utils/debian/source/format'
461--- utils/debian/source/format 2012-12-05 19:57:16 +0000
462+++ utils/debian/source/format 2013-06-18 08:09:29 +0000
463@@ -1,1 +1,1 @@
464-3.0 (native)
465+3.0 (quilt)

Subscribers

People subscribed via source and target branches