Merge lp:~tsarev/percona-server/quilt-5.5-1 into lp:~stewart/percona-server/quilt-5.5

[Oleg Tsarev]

1. Makefile:
  * add symlink to quiltrc to $(PERCONA_SERVER) dir
  * split "main" target to "prepare" and "main" (prepare just unpack source code and setup for patch appling, main also apply patches)
  * add target "regenerate" (old normalize_patches.sh) (requires for future porting to new mysql version)
  * fix "clean" target
2. apply_patches:
  * fix usages: "--quiltrc=quiltrc"
  * now uses sh instead of bash
3. install_tests:
  * rename to install_tests from install_tests.sh
  * fix path to series
4. normalize_patches:
  * rename to normalize_patches from normalize_patches.sh
  * now use quilt for regenerate patches
5. quiltrc:
  * add QUILT_[REFRESH|DIFF|PATCH]_[ARGS|OPTS] options
6. regenerate_patch.sh:
  * removed (unecessary now)

1. Makefile:
  * add symlink to quiltrc to $(PERCONA_SERVER) dir
  * split "main" target to "prepare" and "main" (prepare just unpack source code and setup for patch appling, main also apply patches)
  * add target "regenerate" (old normalize_patches.sh) (requires for future porting to new mysql version)
  * fix "clean" target
2. apply_patches:
  * fix usages: "--quiltrc=quiltrc"
  * now uses sh instead of bash
3. install_tests:
  * rename to install_tests from install_tests.sh
  * fix path to series
4. normalize_patches:
  * rename to normalize_patches from normalize_patches.sh
  * now use quilt for regenerate patches
5. quiltrc:
  * add QUILT_[REFRESH|DIFF|PATCH]_[ARGS|OPTS] options
6. regenerate_patch.sh:
  * removed (unecessary now)

[Laurynas Biveinis (laurynas-biveinis)]

LGTM. As for 5.1 I think we should clean up Makefiles wrt phony targets, but not for this patch.

(For the future, I think this MP should have been made for trunk, specifying Stewart's lp:~stewart/percona-server/quilt-5.1 as the prerequisite branch.)

review: Approve

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2011-07-25 14:56:50 +0000
+++ Makefile	2011-07-27 11:16:15 +0000
@@ -68,7 +68,7 @@
 	@echo "Installing license files"
 	install -m 644 COPYING.* $(PERCONA_SERVER)
 
-main: mysql-$(MYSQL_VERSION).tar.gz
+prepare: mysql-$(MYSQL_VERSION).tar.gz
 	@echo "Prepare Percona Server sources"
 	rm -rf mysql-$(MYSQL_VERSION)
 	rm -rf $(PERCONA_SERVER);
@@ -79,19 +79,25 @@
 	ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
 	ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_2)
 	ln -s ../patches $(PERCONA_SERVER)/patches
+	rm $(PERCONA_SERVER)/sql/sql_yacc.cc $(PERCONA_SERVER)/sql/sql_yacc.h
+	ln -s ../quiltrc $(PERCONA_SERVER)/quiltrc
+
+main: prepare
 	(cd $(PERCONA_SERVER) && ../apply_patches)
-	rm $(PERCONA_SERVER)/sql/sql_yacc.cc $(PERCONA_SERVER)/sql/sql_yacc.h
+
+regenerate: clean prepare
+	(cd $(PERCONA_SERVER) && ../normalize_patches)
 
 mysql-$(MYSQL_VERSION).tar.gz:
 	@echo "Downloading MySQL sources from $(MASTER_SITE)"
 	$(FETCH_CMD) $(MASTER_SITE)/mysql-$(MYSQL_VERSION).tar.gz
 
 tests:
-	PERCONA_SERVER=${PERCONA_SERVER} sh install_tests.sh
+	PERCONA_SERVER=${PERCONA_SERVER} sh install_tests
 
 misc:
 	@echo "Installing other files"
 	install -m 644 lrusort.py $(PERCONA_SERVER)/scripts
 
 clean:
-	rm -rf mysql-$(MYSQL_VERSION) $(PERCONA_SERVER)
+	rm -rf mysql-$(MYSQL_VERSION) $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1) $(PERCONA_SERVER_SHORT_2)

=== modified file 'apply_patches'
--- apply_patches	2011-07-22 16:56:42 +0000
+++ apply_patches	2011-07-27 11:16:15 +0000
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 
 if [ `which quilt` ]; then
    echo; echo 'Using quilt'; echo
-   quilt push -a
+   quilt push -a --quiltrc=quiltrc
 else
    echo; echo 'WARNING: Not using quilt, not suitable for dev environment';
    echo;

=== renamed file 'install_tests.sh' => 'install_tests'
--- install_tests.sh	2011-07-22 16:56:42 +0000
+++ install_tests	2011-07-27 11:16:15 +0000
@@ -30,7 +30,7 @@
 current=0;
 count=`wc -l patches/series`;
 install_path mysql-test "global" $current $count
-for test_name in `cat series`; do
+for test_name in `cat patches/series`; do
     current=$((current+1));
     install_path mysql-test/$test_name $test_name $current $count
 done

=== renamed file 'normalize_patches.sh' => 'normalize_patches'
--- normalize_patches.sh	2011-06-22 10:48:58 +0000
+++ normalize_patches	2011-07-27 11:16:15 +0000
@@ -1,51 +1,6 @@
-#!/usr/bin/env bash
-
-MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \
-    | cut -d = -f 2)"
-PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "Makefile" \
-    | cut -d = -f 2)"
-PERCONA_SERVER="Percona-Server-${MYSQL_VERSION}-${PERCONA_SERVER_VERSION}"
-MYSQL_DIR=mysql-${MYSQL_VERSION}
-MYSQL_TAR_GZ=${MYSQL_DIR}.tar.gz
-
-echo "===== Prepare source code for patch's adaptation...";
-echo "===== Remove 'a' copy...";
-rm -rf a;
-echo "===== Remove 'b' copy..."
-rm -rf b;
-echo "===== Remove '${PERCONA_SERVER}' copy..."
-rm -rf ${PERCONA_SERVER};
-echo "===== Unpack ${MYSQL_DIR} to ${PERCONA_SERVER}..."
-tar zxf ${MYSQL_TAR_GZ};
-mv ${MYSQL_DIR} ${PERCONA_SERVER};
-echo "===== Prepare 'a' copy..."
-cp -R ${PERCONA_SERVER} a;
-echo "===== Prepare 'b' copy..."
-cp -R ${PERCONA_SERVER} b;
-echo "===== Ok, let's go patch adaptation..."
-for patch_name in `cat series`; do
-    echo "========================================================="
-    echo "===== Check patch $patch_name";
-    echo "===== Apply patch $patch_name...";
-    patch -p1 -d b < $patch_name >result;
-    fail=`cat result | grep FAIL | wc -l`;
-    hunk=`cat result | grep Hunk | wc -l`;
-    echo "===== Patch $patch_name FAILED: $fail";
-    echo "===== Patch $patch_name HUNK:   $hunk";
-    if [ $fail -ne 0 ]; then
-	echo "===== Patch $patch_name are failed";
-	exit 1;
-    fi;
-    if [ $hunk -ne 0 ]; then
-	./regenerate_patch.sh a b $patch_name
-    fi;
-    patch -p1 -d ${PERCONA_SERVER} < $patch_name > /dev/null;
-    patch -p1 -d a < $patch_name > /dev/null;
-    echo "===== Patch $patch_name regenerated succesfully"
-    if [ $hunk -ne 0 ]; then
-	echo "===== Remove temporary 'b' version"
-	rm -rf b;
-	echo "===== Prepare 'b' copy..."
-	cp -R ${PERCONA_SERVER} b;
-    fi;
+#!/bin/sh
+
+for patch_name in `cat patches/series`; do
+  quilt push ${patch_name} --quiltrc=quiltrc;
+  quilt refresh --quiltrc=quiltrc;
 done;

=== modified file 'quiltrc'
--- quiltrc	2011-07-22 16:56:42 +0000
+++ quiltrc	2011-07-27 11:16:15 +0000
@@ -1,3 +1,8 @@
 QUILT_NO_DIFF_TIMESTAMPS=1
 QUILT_NO_DIFF_INDEX=1
-QUILT_REFRESH_ARGS="-pab"
+QUILT_REFRESH_OPTS="-ruN"
+QUILT_REFRESH_ARGS="-p ab"
+QUILT_DIFF_OPTS="-ruN"
+QUILT_DIFF_ARGS="-p ab"
+QUILT_PATCH_OPTS="-ruN"
+QUILT_PATCH_ARGS="-p ab"

=== removed file 'regenerate_patch.sh'
--- regenerate_patch.sh	2010-12-09 18:30:58 +0000
+++ regenerate_patch.sh	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/usr/bin/env sh
-a=$1
-b=$2
-patch_name=$3
-prefix="[$patch_name]"
-big_prefix="$prefix ===== "
-echo "$big_prefix Regenerate patch $patch_name based thought $a and $b"
-echo "$big_prefix Header is:"
-cat $patch_name | head -n7;
-echo "$big_prefix Ok, let's go:"
-patch_name_new=$patch_name.new;
-patch_name_split=$patch_name.split;
-echo "$prefix Remove $patch_name_new if exists..."
-rm -f $patch_name_new;
-echo "$prefix Remove $patch_name_split if exists..."
-rm -rf $patch_name_split;
-echo "$prefix Create $patch_name_split"
-mkdir $patch_name_split;
-cd $patch_name_split;
-echo "$prefix Add header"
-cat ../$patch_name | head -n7 > ../$patch_name_new
-echo "$prefix Split to separated files"
-for filename in `splitdiff -a -d ../$patch_name | awk '{ print $2 }' | sed -e "s/>//g"`; do
-    echo "$prefix extract diff metainformation from $filename"
-    a_head=`cat $filename | head -n2 | head -n1`;
-    b_head=`cat $filename | head -n2 | tail -n1`;
-    a_path=`echo $a_head | awk '{ print $2 }'`;
-    b_path=`echo $b_head | awk '{ print $2 }'`;
-    diff_string="diff -ruN $a_path $b_path";
-    echo "$big_prefix $filename metainformation is:";
-    echo "$prefix $diff_string";
-    echo "$prefix $a_head"
-    echo "$prefix $b_head"
-    echo "$big_prefix Update patch by $filename"    
-    (cd ..; echo $diff_string >> $patch_name_new);
-    (cat $filename | head -n2 | head -n1 >> ../$patch_name_new);
-    (cat $filename | head -n2 | tail -n1 >> ../$patch_name_new);
-    (cd ..; diff -ruN $a_path $b_path | tail -n+3 >> $patch_name_new);
-done;
-cd ..;
-echo "$prefix Rename temporary patch to final"
-cat $patch_name_new > $patch_name;
-echo "$prefix Remove temporary files"
-rm $patch_name_new;
-rm -rf $patch_name_split;
-echo "$big_prefix Complete"