Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Leo Le Bouter
slapos
Commits
c2c6ff41
Commit
c2c6ff41
authored
Jul 27, 2011
by
Kazuhiko Shiozaki
Committed by
Cédric de Saint Martin
Oct 26, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up : xtrabackup-1.6.2.
parent
8585e77a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
24 deletions
+25
-24
component/xtrabackup/buildout.cfg
component/xtrabackup/buildout.cfg
+2
-2
component/xtrabackup/xtrabackup_build.patch
component/xtrabackup/xtrabackup_build.patch
+23
-22
No files found.
component/xtrabackup/buildout.cfg
View file @
c2c6ff41
...
...
@@ -36,8 +36,8 @@ filename = ${:_buildout_section_name_}
[xtrabackup]
recipe = hexagonit.recipe.cmmi
url = http://www.percona.com/redir/downloads/XtraBackup/
XtraBackup-1.6/source/xtrabackup-1.6
.tar.gz
md5sum =
7c263723312cba36539df4cd7a119744
url = http://www.percona.com/redir/downloads/XtraBackup/
xtrabackup-1.6.2/source/xtrabackup-1.6.2
.tar.gz
md5sum =
933243ae362156c98f1211eb87b3b4ea
make-binary = true
patches =
${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename}
...
...
component/xtrabackup/xtrabackup_build.patch
View file @
c2c6ff41
diff --git a/Makefile b/Makefile
index dbb15d5..852a627 100644
--- a/Makefile
+++ b/Makefile
@@ -137,5 +137,5 @@
$(TARGET): xtrabackup.o $(INNODBOBJS) $(MYSQLOBJS)
diff -ur xtrabackup-1.6.2.orig/Makefile xtrabackup-1.6.2/Makefile
--- xtrabackup-1.6.2.orig/Makefile 2011-07-19 05:16:22.000000000 +0900
+++ xtrabackup-1.6.2/Makefile 2011-07-27 17:58:38.108925111 +0900
@@ -137,5 +137,5 @@
clean:
rm -f *.o xtrabackup_*
install:
- install -m 755 innobackupex-1.5.1 $(BIN_DIR)
+ install -m 755 innobackupex-1.5.1 $(BIN_DIR)/innobackupex
install -m 755 xtrabackup_* $(BIN_DIR)
diff --git a/utils/build.sh b/utils/build.sh
index 3f0cee7..c41dc89 100755
--- a/utils/build.sh
+++ b/utils/build.sh
@@ -21,12 +21,14 @@
function usage()
diff -ur xtrabackup-1.6.2.orig/utils/build.sh xtrabackup-1.6.2/utils/build.sh
--- xtrabackup-1.6.2.orig/utils/build.sh 2011-07-19 05:16:22.000000000 +0900
+++ xtrabackup-1.6.2/utils/build.sh 2011-07-27 18:01:53.809212142 +0900
@@ -21,12 +21,14 @@
{
echo "Build an xtrabackup binary against the specified InnoDB flavor."
echo
...
...
@@ -29,7 +27,7 @@ index 3f0cee7..c41dc89 100755
exit -1
}
@@ -79,7 +81,12 @@
function build_server()
@@ -79,7 +81,12 @@
{
echo "Configuring the server"
cd $server_dir
...
...
@@ -43,19 +41,22 @@ index 3f0cee7..c41dc89 100755
eval $configure_cmd
echo "Building the server"
@@ -92,
9 +99,10 @@
function build_xtrabackup()
@@ -92,
12 +99,13 @@
echo "Building XtraBackup"
mkdir $build_dir
cp $top_dir/Makefile $top_dir/xtrabackup.c $build_dir
+ cp $top_dir/innobackupex $build_dir/innobackupex-1.5.1
# Read XTRABACKUP_VERSION from the VERSION file
. $top_dir/VERSION
cd $build_dir
- $MAKE_CMD $xtrabackup_target
+ $MAKE_CMD
PREFIX=$1 $xtrabackup_target
- $MAKE_CMD $xtrabackup_target
XTRABACKUP_VERSION=$XTRABACKUP_VERSION
+ $MAKE_CMD
$xtrabackup_target XTRABACKUP_VERSION=$XTRABACKUP_VERSION PREFIX=$1
cd $top_dir
}
@@ -10
3,11 +111,36 @@
function build_tar4ibd()
@@ -10
6,11 +114,36 @@
echo "Building tar4ibd"
unpack_and_patch libtar-1.2.11.tar.gz tar4ibd_libtar-1.2.11.patch
cd libtar-1.2.11
...
...
@@ -93,7 +94,7 @@ index 3f0cee7..c41dc89 100755
################################################################################
# Do all steps to build the server, xtrabackup and tar4ibd
# Expects the following variables to be set before calling:
@@ -1
36,9 +169,15 @@
function build_all()
@@ -1
41,9 +174,15 @@
build_server
...
...
@@ -111,7 +112,7 @@ index 3f0cee7..c41dc89 100755
}
if ! test -f xtrabackup.c
@@ -1
48,6 +187,15 @@
then
@@ -1
53,6 +192,15 @@
fi
type=$1
...
...
@@ -127,20 +128,20 @@ index 3f0cee7..c41dc89 100755
top_dir=`pwd`
case "$type" in
@@ -16
1,9 +209,10 @@
case "$type" in
@@ -16
6,9 +214,10 @@
--with-plugins=innobase \
--with-zlib-dir=bundled \
--enable-shared \
- --with-extra-charsets=
complex
"
+ --with-extra-charsets=
complex
\
+
--prefix=$2"
- --with-extra-charsets=
all
"
+ --with-extra-charsets=
all
\
+
--prefix=$2"
- build_all
+ build_all $2
;;
"innodb55" | "5.5")
@@ -2
25,7 +274,7 @@
case "$type" in
@@ -2
30,7 +279,7 @@
build_server
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment