~tsarev/percona-server/quilt-5.5-2

Committer: Oleg Tsarev
Date: 2011-07-27 11:13:05 UTC
Revision ID: oleg.tsarev@percona.com-20110727111305-cb1vgegkotimc8gn

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)

files removed:
regenerate_patch.sh

files renamed:
install_tests.sh => install_tests

normalize_patches.sh => normalize_patches

files modified:
Makefile

apply_patches

quiltrc

Show diffs side-by-side

added added

removed removed

normalize_patches

#!/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;

Older »