From d675abbcffd65f92b3eda5eac29892b3dc1cdb21 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Apr 2020 17:22:23 +0200 Subject: helpers for php80 new SCL --- buildfct | 47 +++++++++++++++++++++++++++++++---------------- getmock | 16 ++++++++++++++++ 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/buildfct b/buildfct index 2943b1a..01d7b4d 100644 --- a/buildfct +++ b/buildfct @@ -5,21 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg' mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock -alias mockfc29i=" setarch i686 mock --configdir=$mocketc -r fc29i --arch i686 rebuild " -alias mockfc29ir=" setarch i686 mock --configdir=$mocketc -r fc29ir --arch i686 rebuild " -alias mockfc29i73="setarch i686 mock --configdir=$mocketc -r fc29i73 --arch i686 rebuild " -alias mockfc29i74="setarch i686 mock --configdir=$mocketc -r fc29i74 --arch i686 rebuild " -alias mockfc29x=" mock --configdir=$mocketc -r fc29x rebuild " -alias mockfc29xr=" mock --configdir=$mocketc -r fc29xr rebuild " -alias mockfc29x73=" mock --configdir=$mocketc -r fc29x73 rebuild " -alias mockfc29x74=" mock --configdir=$mocketc -r fc29x74 rebuild " -alias mockfc29xscl56=" mock --configdir=$mocketc -r fc29xscl56 rebuild " -alias mockfc29xscl70=" mock --configdir=$mocketc -r fc29xscl70 rebuild " -alias mockfc29xscl71=" mock --configdir=$mocketc -r fc29xscl71 rebuild " -alias mockfc29xscl72=" mock --configdir=$mocketc -r fc29xscl72 rebuild " -alias mockfc29xscl73=" mock --configdir=$mocketc -r fc29xscl73 rebuild " -alias mockfc29xscl74=" mock --configdir=$mocketc -r fc29xscl74 rebuild " - alias mockfc30i=" setarch i686 mock --configdir=$mocketc -r fc30i --arch i686 rebuild " alias mockfc30ir=" setarch i686 mock --configdir=$mocketc -r fc30ir --arch i686 rebuild " alias mockfc30i74="setarch i686 mock --configdir=$mocketc -r fc30i74 --arch i686 rebuild " @@ -43,6 +28,7 @@ alias mockfc31xscl71=" mock --configdir=$mocketc -r fc31xscl71 alias mockfc31xscl72=" mock --configdir=$mocketc -r fc31xscl72 rebuild " alias mockfc31xscl73=" mock --configdir=$mocketc -r fc31xscl73 rebuild " alias mockfc31xscl74=" mock --configdir=$mocketc -r fc31xscl74 rebuild " +alias mockfc31xscl80=" mock --configdir=$mocketc -r fc31xscl80 rebuild " alias mockfc32x=" mock --configdir=$mocketc -r fc32x rebuild " alias mockfc32xd=" mock --configdir=$mocketc -r fc32xd rebuild " @@ -53,6 +39,7 @@ alias mockfc32xscl71=" mock --configdir=$mocketc -r fc32xscl71 alias mockfc32xscl72=" mock --configdir=$mocketc -r fc32xscl72 rebuild " alias mockfc32xscl73=" mock --configdir=$mocketc -r fc32xscl73 rebuild " alias mockfc32xscl74=" mock --configdir=$mocketc -r fc32xscl74 rebuild " +alias mockfc32xscl80=" mock --configdir=$mocketc -r fc32xscl80 rebuild " alias mockel6i=" setarch i686 mock --configdir=$mocketc -r el6i --arch i686 rebuild " alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it --arch i686 rebuild " @@ -98,6 +85,7 @@ alias mockel7xscl71=" mock --configdir=$mocketc -r el7xscl71 r alias mockel7xscl72=" mock --configdir=$mocketc -r el7xscl72 rebuild " alias mockel7xscl73=" mock --configdir=$mocketc -r el7xscl73 rebuild " alias mockel7xscl74=" mock --configdir=$mocketc -r el7xscl74 rebuild " +alias mockel7xscl80=" mock --configdir=$mocketc -r el7xscl80 rebuild " alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " @@ -111,6 +99,7 @@ alias mockel8xscl71=" mock --configdir=$mocketc -r el8xscl71 r alias mockel8xscl72=" mock --configdir=$mocketc -r el8xscl72 rebuild " alias mockel8xscl73=" mock --configdir=$mocketc -r el8xscl73 rebuild " alias mockel8xscl74=" mock --configdir=$mocketc -r el8xscl74 rebuild " +alias mockel8xscl80=" mock --configdir=$mocketc -r el8xscl80 rebuild " alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild " alias mockepel873=" mock --configdir=$mocketc -r epel873 rebuild " @@ -849,7 +838,33 @@ else fi } -# Build All distribution / version / 64bits for remi/scl-php73 +# Build All distribution / version / 64bits for remi/scl-php80 +mockscl80x() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 31 32 + do + echo -n "$(date +%X) scl80 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild $1 && echo " Ok." || echo " Error !" + done + for i in 7 8 + do + echo -n "$(date +%X) scl80 el$i " + mock $quiet --configdir=$mocketc -r el${i}xscl80 rebuild $1 && echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + +# Build All distribution / version / 64bits for remi/scl-php74 mockscl74x() { quiet="" diff --git a/getmock b/getmock index 04476d6..a69d345 100755 --- a/getmock +++ b/getmock @@ -15,6 +15,9 @@ esac rep=${2-remi} case $dep in +scl80el*) dep=${dep#scl80el} + type=enterprise + ;; scl74el*) dep=${dep#scl74el} type=enterprise ;; @@ -78,6 +81,9 @@ fc*) dep=${dep#fc} scl74fc*) dep=${dep#scl74fc} type=fedora ;; +scl80fc*) dep=${dep#scl80fc} + type=fedora + ;; scl73fc*) dep=${dep#scl73fc} type=fedora ;; @@ -420,6 +426,16 @@ elif [ $1 = scl71 ]; then getOneMock scl71el${i}x $opt done +elif [ $1 = scl80 ]; then + for i in 31 32 + do + getOneMock scl80fc${i}x $opt + done + for i in 7 8 + do + getOneMock scl80el${i}x $opt + done + elif [ $1 = scl74 ]; then for i in 30 31 32 do -- cgit