From 8ba471302e1a483b475b91bd57704b5dce5c686c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Aug 2019 17:23:18 +0200 Subject: F31 build helpers --- buildfct | 74 ++++++++++++++++++++++++--------------------------------------- getmock | 18 ++++++++-------- mkallrepo | 10 ++++----- 3 files changed, 42 insertions(+), 60 deletions(-) diff --git a/buildfct b/buildfct index e880cd4..2b07e3a 100644 --- a/buildfct +++ b/buildfct @@ -5,33 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg' mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock -#alias mockfc27i=" setarch i686 mock --configdir=$mocketc -r fc27i --arch i686 rebuild " -#alias mockfc27ir=" setarch i686 mock --configdir=$mocketc -r fc27ir --arch i686 rebuild " -#alias mockfc27i72="setarch i686 mock --configdir=$mocketc -r fc27i72 --arch i686 rebuild " -#alias mockfc27i73="setarch i686 mock --configdir=$mocketc -r fc27i73 --arch i686 rebuild " -#alias mockfc27x=" mock --configdir=$mocketc -r fc27x rebuild " -#alias mockfc27xr=" mock --configdir=$mocketc -r fc27xr rebuild " -#alias mockfc27x72=" mock --configdir=$mocketc -r fc27x72 rebuild " -#alias mockfc27x73=" mock --configdir=$mocketc -r fc27x73 rebuild " -#alias mockfc27xt=" mock --configdir=$mocketc -r fc27xt rebuild " -#alias mockfc27xscl56=" mock --configdir=$mocketc -r fc27xscl56 rebuild " -#alias mockfc27xscl70=" mock --configdir=$mocketc -r fc27xscl70 rebuild " -#alias mockfc27xscl71=" mock --configdir=$mocketc -r fc27xscl71 rebuild " -#alias mockfc27xscl72=" mock --configdir=$mocketc -r fc27xscl72 rebuild " -#alias mockfc27xscl73=" mock --configdir=$mocketc -r fc27xscl73 rebuild " - -alias mockfc28i=" setarch i686 mock --configdir=$mocketc -r fc28i --arch i686 rebuild " -alias mockfc28ir=" setarch i686 mock --configdir=$mocketc -r fc28ir --arch i686 rebuild " -alias mockfc28i73="setarch i686 mock --configdir=$mocketc -r fc28i73 --arch i686 rebuild " -alias mockfc28x=" mock --configdir=$mocketc -r fc28x rebuild " -alias mockfc28xr=" mock --configdir=$mocketc -r fc28xr rebuild " -alias mockfc28x73=" mock --configdir=$mocketc -r fc28x73 rebuild " -alias mockfc28xscl56=" mock --configdir=$mocketc -r fc28xscl56 rebuild " -alias mockfc28xscl70=" mock --configdir=$mocketc -r fc28xscl70 rebuild " -alias mockfc28xscl71=" mock --configdir=$mocketc -r fc28xscl71 rebuild " -alias mockfc28xscl72=" mock --configdir=$mocketc -r fc28xscl72 rebuild " -alias mockfc28xscl73=" mock --configdir=$mocketc -r fc28xscl73 rebuild " - 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 " @@ -56,6 +29,17 @@ alias mockfc30xscl72=" mock --configdir=$mocketc -r fc30xscl72 alias mockfc30xscl73=" mock --configdir=$mocketc -r fc30xscl73 rebuild " alias mockfc30xscl74=" mock --configdir=$mocketc -r fc30xscl74 rebuild " +alias mockfc31i=" setarch i686 mock --configdir=$mocketc -r fc31i --arch i686 rebuild " +alias mockfc31ir=" setarch i686 mock --configdir=$mocketc -r fc31ir --arch i686 rebuild " +alias mockfc31x=" mock --configdir=$mocketc -r fc31x rebuild " +alias mockfc31xr=" mock --configdir=$mocketc -r fc31xr rebuild " +alias mockfc31xscl56=" mock --configdir=$mocketc -r fc31xscl56 rebuild " +alias mockfc31xscl70=" mock --configdir=$mocketc -r fc31xscl70 rebuild " +alias mockfc31xscl71=" mock --configdir=$mocketc -r fc31xscl71 rebuild " +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 mockel6i=" setarch i686 mock --configdir=$mocketc -r el6i --arch i686 rebuild " alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it --arch i686 rebuild " alias mockel6i55="setarch i686 mock --configdir=$mocketc -r el6i55 --arch i686 rebuild " @@ -124,7 +108,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 30 29 28 + for i in 31 30 29 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 !" @@ -147,7 +131,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 30 29 28 + for i in 31 30 29 do echo -n "$(date +%X) fc$i " setarch i686 mock $quiet --configdir=$mocketc -r fc${i}ir --arch i686 rebuild $1 && echo " Ok." || echo " Error !" @@ -167,7 +151,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 30 29 28 + for i in 30 29 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 !" @@ -315,8 +299,6 @@ fi if [ -f "$1" ]; then echo -n "$(date +%X) 73 fc29 " setarch i686 mock $quiet --configdir=$mocketc -r fc29i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !" - echo -n "$(date +%X) 73 fc28 " - setarch i686 mock $quiet --configdir=$mocketc -r fc28i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !" echo -n "$(date +%X) 73 el6 " setarch i686 mock $quiet --configdir=$mocketc -r el6i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !" date +%X @@ -353,7 +335,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 28 30 + for i in 29 30 31 do echo -n "$(date +%X) fc$i " mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !" @@ -379,7 +361,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 28 30 + for i in 29 30 31 do echo -n "$(date +%X) fc$i " mock $quiet --configdir=$mocketc -r fc${i}xr rebuild $1 && echo " Ok." || echo " Error !" @@ -405,7 +387,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 28 30 + for i in 29 30 do echo -n "$(date +%X) fc$i " mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !" @@ -469,7 +451,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 30 29 28 + for i in 31 30 29 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (56) fc$i Ok." || echo "fc$1 Error !")& @@ -502,7 +484,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 30 29 28 + for i in 31 30 29 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")& @@ -535,7 +517,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 28 29 30 + for i in 29 30 31 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (71) fc$i Ok." || echo "fc$1 Error !")& @@ -568,7 +550,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 28 29 30 + for i in 29 30 31 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (72) fc$i Ok." || echo "fc$1 Error !")& @@ -728,7 +710,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 28 + for i in 29 do echo -n "$(date +%X) 73 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x73 rebuild $1 && echo " Ok." || echo " Error !" @@ -754,7 +736,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 30 + for i in 29 30 31 do echo -n "$(date +%X) scl74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild $1 && echo " Ok." || echo " Error !" @@ -780,7 +762,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 30 28 + for i in 29 30 31 do echo -n "$(date +%X) scl73 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !" @@ -806,7 +788,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 28 30 + for i in 29 30 31 do echo -n "$(date +%X) scl72 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !" @@ -832,7 +814,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 28 30 + for i in 29 31 30 do echo -n "$(date +%X) scl71 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !" @@ -858,7 +840,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 30 28 + for i in 29 30 31 do echo -n "$(date +%X) scl70 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !" @@ -884,7 +866,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 29 28 30 + for i in 29 31 30 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 5d3eccf..63cabde 100755 --- a/getmock +++ b/getmock @@ -260,7 +260,7 @@ if [ $1 = devs -o $1 = dev ]; then fi if [ $1 = all ]; then - for i in 28 29 30 + for i in 29 30 31 do getOneMock fc${i}i $opt done @@ -316,7 +316,7 @@ elif [ $1 = all72 ]; then elif [ $1 = all73 ]; then [ $opt = remi ] && opt=php73 [ $opt = test ] && opt=test73 - for n in 28 29 + for n in 29 do getOneMock fc${n}i $opt '*7.3*' getOneMock fc${n}x $opt '*7.3*' @@ -349,7 +349,7 @@ elif [ $1 = for55 ]; then done elif [ $1 = allx ]; then - for i in 28 29 30 + for i in 29 30 31 do getOneMock fc${i}x $opt done @@ -371,7 +371,7 @@ elif [ $1 = scl55 ]; then done elif [ $1 = scl56 ]; then - for i in 28 29 30 + for i in 29 30 31 do getOneMock scl56fc${i}x $opt done @@ -381,7 +381,7 @@ elif [ $1 = scl56 ]; then done elif [ $1 = scl70 ]; then - for i in 28 29 30 + for i in 29 30 31 do getOneMock scl70fc${i}x $opt done @@ -391,7 +391,7 @@ elif [ $1 = scl70 ]; then done elif [ $1 = scl71 ]; then - for i in 28 29 30 + for i in 29 30 31 do getOneMock scl71fc${i}x $opt done @@ -401,7 +401,7 @@ elif [ $1 = scl71 ]; then done elif [ $1 = scl74 ]; then - for i in 29 30 + for i in 29 30 31 do getOneMock scl74fc${i}x $opt done @@ -411,7 +411,7 @@ elif [ $1 = scl74 ]; then done elif [ $1 = scl73 ]; then - for i in 28 29 30 + for i in 29 30 31 do getOneMock scl73fc${i}x $opt done @@ -421,7 +421,7 @@ elif [ $1 = scl73 ]; then done elif [ $1 = scl72 ]; then - for i in 28 29 30 + for i in 29 30 31 do getOneMock scl72fc${i}x $opt done diff --git a/mkallrepo b/mkallrepo index 63507fb..fc0cf27 100755 --- a/mkallrepo +++ b/mkallrepo @@ -9,7 +9,7 @@ TMPSIG4=$(mktemp -t XXXXXXXX.2019) cd /home/rpmbuild/site/rpms -for dep in fedora/{28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp} +for dep in fedora/{29,30,31}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp} do [[ $dep =~ /modular ]] && continue @@ -35,11 +35,11 @@ find SRPMS -name \*.rpm -a -newer SRPMS/repodata -print >>$TMPSIG if [ -s $TMPSIG ]; then echo "À signer:"; sort < $TMPSIG - grep fc28 $TMPSIG > $TMPSIG3 - grep fc29 $TMPSIG >> $TMPSIG3 + grep fc29 $TMPSIG > $TMPSIG3 grep el8 $TMPSIG >> $TMPSIG3 grep fc30 $TMPSIG > $TMPSIG4 + grep fc31 $TMPSIG >> $TMPSIG4 grep src.rpm $TMPSIG >> $TMPSIG4 if [ -s $TMPSIG4 ]; then @@ -56,7 +56,7 @@ if [ -s $TMPSIG ]; then else exit 1 fi fi - grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v fc30 | grep -v src.rpm | grep -v el8 > $TMPSIG1 + grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v fc30 | grep -v fc31 | grep -v src.rpm | grep -v el8 > $TMPSIG1 if [ -s $TMPSIG1 ]; then echo "== Signature des $(cat $TMPSIG1 | wc -l) nouveaux RPM (old) ==" if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG1) @@ -81,7 +81,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp} +for dep in SRPMS fedora/{29,30,31}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp} do [[ $dep =~ /modular ]] && continue -- cgit