summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-12-18 09:42:23 +0100
committerRemi Collet <remi@remirepo.net>2017-12-18 09:42:23 +0100
commit0f1b2cbf895b53a1ecac1a2f09dcc881a2ccf5bb (patch)
tree79474ea25f7286f696dee64d20df3bf83870a7f4
parentddc380e1de3a0d2877462f575f20f85fd8297542 (diff)
build F27 first
-rw-r--r--buildfct56
-rwxr-xr-xgetmock48
-rwxr-xr-xpearup1
3 files changed, 71 insertions, 34 deletions
diff --git a/buildfct b/buildfct
index a548d9d..0e3d152 100644
--- a/buildfct
+++ b/buildfct
@@ -139,7 +139,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 27 24
+ for i in 27 26 25 24
do
echo -n "$(date +%X) fc$i "
setarch i686 mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -162,7 +162,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 27
+ for i in 27 26 25
do
echo -n "$(date +%X) fc$i "
setarch i686 mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -348,7 +348,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 27 24
+ for i in 27 26 25 24
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -374,7 +374,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 27
+ for i in 27 26 25
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -462,7 +462,7 @@ else
fi
}
-# Build All distribution / version / noarch for remi/remi-php56
+# Build All distribution / version / noarch for remi using PHP >= 7.0
mock70n()
{
quiet="--quiet"
@@ -498,6 +498,42 @@ else
fi
}
+# Build All distribution / version / noarch for remi using PHP >= 7.1
+mock71n()
+{
+quiet="--quiet"
+if [ "$1" = "-q" ]; then
+ shift
+fi
+
+if [ -f "$1" ]; then
+ date +%X
+ pids=""
+ for i in 27 26
+ do
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
+ pids="$pids $!"
+ done
+ for i in 25 24
+ do
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
+ pids="$pids $!"
+ done
+ for i in 7 6
+ do
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r el${i}x71 rebuild $1 && echo "$(date +%X) (70) el$i Ok." || echo "el$i Error !")&
+ pids="$pids $!"
+ done
+ wait $pids
+ date +%X
+else
+ echo "file not found '$1'"
+fi
+}
+
# Build All distribution / version / 64bits for remi/remi-php55
mock55x()
{
@@ -602,7 +638,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 27
+ for i in 27 26 25
do
echo -n "$(date +%X) 72 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -628,7 +664,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 24 27
+ for i in 27 26 24 25
do
echo -n "$(date +%X) scl72 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -654,7 +690,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 27 24
+ for i in 27 26 25 24
do
echo -n "$(date +%X) scl71 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -680,7 +716,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 27 24
+ for i in 27 26 25 24
do
echo -n "$(date +%X) scl70 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -706,7 +742,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24 26 27
+ for i in 27 26 25 24
do
echo -n "$(date +%X) scl56 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 2ef8d62..0720fe0 100755
--- a/getmock
+++ b/getmock
@@ -205,71 +205,71 @@ if [ $1 = all ]; then
elif [ $1 = all55 ]; then
for n in 6
do
- getOneMock el${n}i php55 '*remi.5.5*'
- getOneMock el${n}x php55 '*remi.5.5*'
+ getOneMock el${n}i php55 '*5.5*'
+ getOneMock el${n}x php55 '*5.5*'
done
n=7
- getOneMock el${n}x php55 '*remi.5.5*'
+ getOneMock el${n}x php55 '*5.5*'
elif [ $1 = all56 ]; then
for n in 6
do
- getOneMock el${n}i php56 '*remi.5.6*'
- getOneMock el${n}x php56 '*remi.5.6*'
+ getOneMock el${n}i php56 '*5.6*'
+ getOneMock el${n}x php56 '*5.6*'
done
n=7
- getOneMock el${n}x php56 '*remi.5.6*'
+ getOneMock el${n}x php56 '*5.6*'
elif [ $1 = all70 ]; then
[ $opt = remi ] && opt=php70
[ $opt = test ] && opt=test70
for n in 24
do
- getOneMock fc${n}i $opt '*remi.7.0*'
- getOneMock fc${n}x $opt '*remi.7.0*'
+ getOneMock fc${n}i $opt '*7.0*'
+ getOneMock fc${n}x $opt '*7.0*'
done
n=6
- getOneMock el${n}i $opt '*remi.7.0*'
- getOneMock el${n}x $opt '*remi.7.0*'
+ getOneMock el${n}i $opt '*7.0*'
+ getOneMock el${n}x $opt '*7.0*'
n=7
- getOneMock el${n}x $opt '*remi.7.0*'
+ getOneMock el${n}x $opt '*7.0*'
elif [ $1 = all71 ]; then
[ $opt = remi ] && opt=php71
[ $opt = test ] && opt=test71
for n in 24 25
do
- getOneMock fc${n}i $opt '*remi.7.1*'
- getOneMock fc${n}x $opt '*remi.7.1*'
+ getOneMock fc${n}i $opt '*7.1*'
+ getOneMock fc${n}x $opt '*7.1*'
done
n=6
- getOneMock el${n}i $opt '*remi.7.1*'
- getOneMock el${n}x $opt '*remi.7.1*'
+ getOneMock el${n}i $opt '*7.1*'
+ getOneMock el${n}x $opt '*7.1*'
n=7
- getOneMock el${n}x $opt '*remi.7.1*'
+ getOneMock el${n}x $opt '*7.1*'
elif [ $1 = all72 ]; then
[ $opt = remi ] && opt=php72
[ $opt = test ] && opt=test72
for n in 25 26 27
do
- getOneMock fc${n}i $opt '*remi.7.2*'
- getOneMock fc${n}x $opt '*remi.7.2*'
+ getOneMock fc${n}i $opt '*7.2*'
+ getOneMock fc${n}x $opt '*7.2*'
done
n=6
- getOneMock el${n}i $opt '*remi.7.2*'
- getOneMock el${n}x $opt '*remi.7.2*'
+ getOneMock el${n}i $opt '*7.2*'
+ getOneMock el${n}x $opt '*7.2*'
n=7
- getOneMock el${n}x $opt '*remi.7.2*'
+ getOneMock el${n}x $opt '*7.2*'
elif [ $1 = all54 ]; then
for n in 6
do
- getOneMock el${n}i remi '*remi.5.4*'
- getOneMock el${n}x remi '*remi.5.4*'
+ getOneMock el${n}i remi '*5.4*'
+ getOneMock el${n}x remi '*5.4*'
done
n=7
- getOneMock el${n}x remi '*remi.5.4*'
+ getOneMock el${n}x remi '*5.4*'
elif [ $1 = for56 ]; then
for i in 24
diff --git a/pearup b/pearup
index 3ed4d2c..30a98b9 100755
--- a/pearup
+++ b/pearup
@@ -21,6 +21,7 @@ else echo "Release inchangée"
fi
if ! grep -q "^Version:.*$2" $name; then
sed -e "/^Version:/s/$1/$2/" \
+ -e "/upstream_version/s/$1/$2/" \
-e "s/%changelog/%changelog\n* $rpmdate $vendor - $2-1\n- Update to $2\n/" \
-e 's/\$RPM_BUILD_ROOT/%{buildroot}/' \
-i $name