summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct160
-rwxr-xr-xgetmock24
-rwxr-xr-xmkallrepo7
-rwxr-xr-xmkmodular68
-rwxr-xr-xmockit4
-rwxr-xr-xmockrun2
6 files changed, 25 insertions, 240 deletions
diff --git a/buildfct b/buildfct
index f9b5468..4c6eb91 100644
--- a/buildfct
+++ b/buildfct
@@ -5,98 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg'
mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
-#alias mockfc34i=" setarch i686 mock --configdir=$mocketc -r fc34i --arch i686 rebuild "
-#alias mockfc34x=" mock --configdir=$mocketc -r fc34x rebuild "
-#alias mockfc34xd=" mock --configdir=$mocketc -r fc34xd rebuild "
-#alias mockfc34xr=" mock --configdir=$mocketc -r fc34xr rebuild "
-#alias mockfc34x80=" mock --configdir=$mocketc -r fc34x80 rebuild "
-#alias mockfc34x81=" mock --configdir=$mocketc -r fc34x81 rebuild "
-#alias mockfc34xscl56=" mock --configdir=$mocketc -r fc34xscl56 rebuild "
-#alias mockfc34xscl70=" mock --configdir=$mocketc -r fc34xscl70 rebuild "
-#alias mockfc34xscl71=" mock --configdir=$mocketc -r fc34xscl71 rebuild "
-#alias mockfc34xscl72=" mock --configdir=$mocketc -r fc34xscl72 rebuild "
-#alias mockfc34xscl73=" mock --configdir=$mocketc -r fc34xscl73 rebuild "
-#alias mockfc34xscl74=" mock --configdir=$mocketc -r fc34xscl74 rebuild "
-#alias mockfc34xscl80=" mock --configdir=$mocketc -r fc34xscl80 rebuild "
-#alias mockfc34xscl81=" mock --configdir=$mocketc -r fc34xscl81 rebuild "
-
-#alias mockfc35i=" setarch i686 mock --configdir=$mocketc -r fc35i --arch i686 rebuild "
-#alias mockfc35x=" mock --configdir=$mocketc -r fc35x rebuild "
-#alias mockfc35xd=" mock --configdir=$mocketc -r fc35xd rebuild "
-#alias mockfc35xr=" mock --configdir=$mocketc -r fc35xr rebuild "
-#alias mockfc35x74=" mock --configdir=$mocketc -r fc35x74 rebuild "
-#alias mockfc35x81=" mock --configdir=$mocketc -r fc35x81 rebuild "
-#alias mockfc35n81=" mock --configdir=$mocketc -r fc35n81 rebuild "
-#alias mockfc35x82=" mock --configdir=$mocketc -r fc35x82 rebuild "
-#alias mockfc35xscl56=" mock --configdir=$mocketc -r fc35xscl56 rebuild "
-#alias mockfc35xscl70=" mock --configdir=$mocketc -r fc35xscl70 rebuild "
-#alias mockfc35xscl71=" mock --configdir=$mocketc -r fc35xscl71 rebuild "
-#alias mockfc35xscl72=" mock --configdir=$mocketc -r fc35xscl72 rebuild "
-#alias mockfc35xscl73=" mock --configdir=$mocketc -r fc35xscl73 rebuild "
-#alias mockfc35xscl74=" mock --configdir=$mocketc -r fc35xscl74 rebuild "
-#alias mockfc35xscl80=" mock --configdir=$mocketc -r fc35xscl80 rebuild "
-#alias mockfc35xscl81=" mock --configdir=$mocketc -r fc35xscl81 rebuild "
-#alias mockfc35xscl82=" mock --configdir=$mocketc -r fc35xscl82 rebuild "
-
-#alias mockfc36i=" setarch i686 mock --configdir=$mocketc -r fc36i --arch i686 rebuild "
-#alias mockfc36x=" mock --configdir=$mocketc -r fc36x rebuild "
-#alias mockfc36xd=" mock --configdir=$mocketc -r fc36xd rebuild "
-#alias mockfc36xr=" mock --configdir=$mocketc -r fc36xr rebuild "
-#alias mockfc36x74=" mock --configdir=$mocketc -r fc36x74 rebuild "
-#alias mockfc36x80=" mock --configdir=$mocketc -r fc36x80 rebuild "
-#alias mockfc36x81=" mock --configdir=$mocketc -r fc36x81 rebuild "
-#alias mockfc36x82=" mock --configdir=$mocketc -r fc36x82 rebuild "
-#alias mockfc36xscl74=" mock --configdir=$mocketc -r fc36xscl74 rebuild "
-#alias mockfc36xscl80=" mock --configdir=$mocketc -r fc36xscl80 rebuild "
-#alias mockfc36xscl81=" mock --configdir=$mocketc -r fc36xscl81 rebuild "
-#alias mockfc36xscl82=" mock --configdir=$mocketc -r fc36xscl82 rebuild "
-#alias mockfc36xr60=" mock --configdir=$mocketc -r fc36xr60 rebuild "
-#alias mockfc36xr62=" mock --configdir=$mocketc -r fc36xr62 rebuild "
-#alias mockfc36xr70=" mock --configdir=$mocketc -r fc36xr70 rebuild "
-#alias mockfc36xr72=" mock --configdir=$mocketc -r fc36xr72 rebuild "
-#alias mockfc36xm=" mock --configdir=$mocketc -r fc36xm rebuild "
-
-#alias mockfc37i=" setarch i686 mock --configdir=$mocketc -r fc37i --arch i686 rebuild "
-#alias mockfc37x=" mock --configdir=$mocketc -r fc37x rebuild "
-#alias mockfc37xd=" mock --configdir=$mocketc -r fc37xd rebuild "
-#alias mockfc37xr=" mock --configdir=$mocketc -r fc37xr rebuild "
-#alias mockfc37x74=" mock --configdir=$mocketc -r fc37x74 rebuild "
-#alias mockfc37x80=" mock --configdir=$mocketc -r fc37x80 rebuild "
-#alias mockfc37x81=" mock --configdir=$mocketc -r fc37x81 rebuild "
-#alias mockfc37x82=" mock --configdir=$mocketc -r fc37x82 rebuild "
-#alias mockfc37x83=" mock --configdir=$mocketc -r fc37x83 rebuild "
-#alias mockfc37xscl74=" mock --configdir=$mocketc -r fc37xscl74 rebuild "
-#alias mockfc37xscl80=" mock --configdir=$mocketc -r fc37xscl80 rebuild "
-#alias mockfc37xscl81=" mock --configdir=$mocketc -r fc37xscl81 rebuild "
-#alias mockfc37xscl82=" mock --configdir=$mocketc -r fc37xscl82 rebuild "
-#alias mockfc37xscl83=" mock --configdir=$mocketc -r fc37xscl83 rebuild "
-#alias mockfc37xr60=" mock --configdir=$mocketc -r fc37xr60 rebuild "
-#alias mockfc37xr62=" mock --configdir=$mocketc -r fc37xr62 rebuild "
-#alias mockfc37xr70=" mock --configdir=$mocketc -r fc37xr70 rebuild "
-#alias mockfc37xr72=" mock --configdir=$mocketc -r fc37xr72 rebuild "
-#alias mockfc37xm=" mock --configdir=$mocketc -r fc37xm rebuild "
-
-alias mockfc38i=" setarch i686 mock --configdir=$mocketc -r fc38i --arch i686 rebuild "
-alias mockfc38x=" mock --configdir=$mocketc -r fc38x rebuild "
-alias mockfc38xd=" mock --configdir=$mocketc -r fc38xd rebuild "
-alias mockfc38xr=" mock --configdir=$mocketc -r fc38xr rebuild "
-alias mockfc38x74=" mock --configdir=$mocketc -r fc38x74 rebuild "
-alias mockfc38x80=" mock --configdir=$mocketc -r fc38x80 rebuild "
-alias mockfc38x81=" mock --configdir=$mocketc -r fc38x81 rebuild "
-alias mockfc38x82=" mock --configdir=$mocketc -r fc38x82 rebuild "
-alias mockfc38x83=" mock --configdir=$mocketc -r fc38x83 rebuild "
-alias mockfc38xscl74=" mock --configdir=$mocketc -r fc38xscl74 rebuild "
-alias mockfc38xscl80=" mock --configdir=$mocketc -r fc38xscl80 rebuild "
-alias mockfc38xscl81=" mock --configdir=$mocketc -r fc38xscl81 rebuild "
-alias mockfc38xscl82=" mock --configdir=$mocketc -r fc38xscl82 rebuild "
-alias mockfc38xscl83=" mock --configdir=$mocketc -r fc38xscl83 rebuild "
-alias mockfc38xscl84=" mock --configdir=$mocketc -r fc38xscl84 rebuild "
-alias mockfc38xr60=" mock --configdir=$mocketc -r fc38xr60 rebuild "
-alias mockfc38xr62=" mock --configdir=$mocketc -r fc38xr62 rebuild "
-alias mockfc38xr70=" mock --configdir=$mocketc -r fc38xr70 rebuild "
-alias mockfc38xr72=" mock --configdir=$mocketc -r fc38xr72 rebuild "
-alias mockfc38xm=" mock --configdir=$mocketc -r fc38xm rebuild "
-
alias mockfc39x=" mock --configdir=$mocketc -r fc39x rebuild "
alias mockfc39x74=" mock --configdir=$mocketc -r fc39x74 rebuild "
alias mockfc39x80=" mock --configdir=$mocketc -r fc39x80 rebuild "
@@ -265,36 +173,6 @@ else
fi
}
-# Build All distribution / version / noarch for remi using PHP >= 8.0
-mock80n()
-{
-quiet="--quiet"
-if [ "$1" = "-q" ]; then
- shift
-fi
-
-if [ -f "$1" ]; then
- date +%X
- pids=""
- for i in 39 38
- do
- echo -n ""
- (mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo "$(date +%X) (8x) fc$i Ok." || echo "fc$1 Error !")&
- pids="$pids $!"
- done
- echo -n ""
- (mock $quiet --configdir=$mocketc -r el8x rebuild "$@" && echo "$(date +%X) (74) el8 Ok." || echo "el8 Error !")&
- pids="$pids $!"
- echo -n ""
- (mock $quiet --configdir=$mocketc -r el9x rebuild "$@" && echo "$(date +%X) (80) el9 Ok." || echo "el9 Error !")&
- pids="$pids $!"
- wait $pids
- date +%X
-else
- echo "file not found '$1'"
-fi
-}
-
# Build All distribution / version / noarch for remi using PHP >= 8.1
mock81n()
{
@@ -313,9 +191,6 @@ if [ -f "$1" ]; then
(mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")&
pids="$pids $!"
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc38x rebuild "$@" && echo "$(date +%X) (82) fc38 Ok." || echo "fc38 Error !")&
- pids="$pids $!"
- echo -n ""
(mock $quiet --configdir=$mocketc -r el8n81 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")&
pids="$pids $!"
echo -n ""
@@ -346,9 +221,6 @@ if [ -f "$1" ]; then
(mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")&
pids="$pids $!"
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc38x rebuild "$@" && echo "$(date +%X) (82) fc38 Ok." || echo "fc38 Error !")&
- pids="$pids $!"
- echo -n ""
(mock $quiet --configdir=$mocketc -r el8n82 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")&
pids="$pids $!"
echo -n ""
@@ -434,7 +306,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 38 39 40
+ for i in 39 40
do
echo -n "$(date +%X) 74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -460,7 +332,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 38 40
+ for i in 39 40
do
echo -n "$(date +%X) scl84 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -486,7 +358,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 38 40
+ for i in 39 40
do
echo -n "$(date +%X) scl83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -512,7 +384,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 40 38
+ for i in 39 40
do
echo -n "$(date +%X) scl82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -538,7 +410,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 38 40
+ for i in 39 40
do
echo -n "$(date +%X) scl81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -564,8 +436,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r60 f38 "
- mock $quiet --configdir=$mocketc -r fc38xr60 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r60 f39 "
mock $quiet --configdir=$mocketc -r fc39xr60 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r60 el9 "
@@ -588,8 +458,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r62 f38 "
- mock $quiet --configdir=$mocketc -r fc38xr62 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r62 f39 "
mock $quiet --configdir=$mocketc -r fc39xr62 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r62 el9 "
@@ -612,8 +480,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r72 f38 "
- mock $quiet --configdir=$mocketc -r fc38xr72 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r72 f39 "
mock $quiet --configdir=$mocketc -r fc39xr72 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r72 el9 "
@@ -636,8 +502,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r70 f38 "
- mock $quiet --configdir=$mocketc -r fc38xr70 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r70 f39 "
mock $quiet --configdir=$mocketc -r fc39xr70 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r70 el9 "
@@ -660,7 +524,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 38 40 39
+ for i in 40 39
do
echo -n "$(date +%X) 83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -707,7 +571,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 38 39
+ for i in 39
do
echo -n "$(date +%X) 83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -728,7 +592,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 40 39 38
+ for i in 40 39
do
echo -n "$(date +%X) 82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -754,7 +618,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 38 40 39
+ for i in 40 39
do
echo -n "$(date +%X) 81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -780,7 +644,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 38 39 40
+ for i in 39 40
do
echo -n "$(date +%X) 80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -806,7 +670,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 40 38
+ for i in 39 40
do
echo -n "$(date +%X) scl80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -832,7 +696,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 40 39 38
+ for i in 40 39
do
echo -n "$(date +%X) scl74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 34aadb5..eb5ed10 100755
--- a/getmock
+++ b/getmock
@@ -483,7 +483,6 @@ elif [ $1 = all73 ]; then
elif [ $1 = all74 ]; then
[ $opt = remi ] && opt=php74
[ $opt = test ] && opt=test74
- getOneMock fc38x74 $opt '*7.4*'
getOneMock fc39x74 $opt '*7.4*'
getOneMock fc39a74 $opt '*7.4*'
getOneMock fc40x74 $opt '*7.4*'
@@ -496,7 +495,6 @@ elif [ $1 = all74 ]; then
elif [ $1 = all80 ]; then
[ $opt = remi ] && opt=php80
[ $opt = test ] && opt=test80
- getOneMock fc38x80 $opt '*8.0*'
getOneMock fc39x80 $opt '*8.0*'
getOneMock fc39a80 $opt '*8.0*'
getOneMock fc40x80 $opt '*8.0*'
@@ -509,7 +507,6 @@ elif [ $1 = all80 ]; then
elif [ $1 = all81 ]; then
[ $opt = remi ] && opt=php81
[ $opt = test ] && opt=test81
- getOneMock fc38x81 $opt '*8.1*'
getOneMock fc39x81 $opt '*8.1*'
getOneMock fc39a81 $opt '*8.1*'
getOneMock fc40x81 $opt '*8.1*'
@@ -522,7 +519,6 @@ elif [ $1 = all81 ]; then
elif [ $1 = all82 ]; then
[ $opt = remi ] && opt=php82
[ $opt = test ] && opt=test82
- getOneMock fc38x82 $opt '*8.2*'
getOneMock fc39x82 $opt '*8.2*'
getOneMock fc39a82 $opt '*8.2*'
getOneMock fc40x82 $opt '*8.2*'
@@ -535,7 +531,6 @@ elif [ $1 = all82 ]; then
elif [ $1 = all83 ]; then
[ $opt = remi ] && opt=php83
[ $opt = test ] && opt=test83
- getOneMock fc38x83 $opt '*8.3*'
getOneMock fc39x83 $opt '*8.3*'
getOneMock fc39a83 $opt '*8.3*'
getOneMock fc40x83 $opt '*8.3*'
@@ -547,7 +542,6 @@ elif [ $1 = all83 ]; then
elif [ $1 = allr60 ]; then
opt=redis60
- getOneMock fc38x $opt '*6.0*'
getOneMock fc39x $opt '*6.0*'
getOneMock fc39a $opt '*6.0*'
getOneMock fc40x $opt '*6.0*'
@@ -559,7 +553,6 @@ elif [ $1 = allr60 ]; then
elif [ $1 = allr62 ]; then
opt=redis62
- getOneMock fc38x $opt '*6.2*'
getOneMock fc39x $opt '*6.2*'
getOneMock fc39a $opt '*6.2*'
getOneMock fc40x $opt '*6.2*'
@@ -571,7 +564,6 @@ elif [ $1 = allr62 ]; then
elif [ $1 = allr70 ]; then
opt=redis70
- getOneMock fc38x $opt '*7.0*'
getOneMock fc39x $opt '*7.0*'
getOneMock fc39a $opt '*7.0*'
getOneMock fc40x $opt '*7.0*'
@@ -583,7 +575,6 @@ elif [ $1 = allr70 ]; then
elif [ $1 = allr72 ]; then
opt=redis72
- getOneMock fc38x $opt '*7.2*'
getOneMock fc39x $opt '*7.2*'
getOneMock fc39a $opt '*7.2*'
getOneMock fc40x $opt '*7.2*'
@@ -598,7 +589,6 @@ elif [ $1 = allm ]; then
getOneMock el8x $opt '*1.6*'
getOneMock el8a $opt '*1.6*'
opt=memcached
- getOneMock fc38x $opt '*1.6*'
getOneMock fc39x $opt '*1.6*'
getOneMock fc39a $opt '*1.6*'
getOneMock fc40x $opt '*1.6*'
@@ -607,7 +597,7 @@ elif [ $1 = allm ]; then
getOneMock el9a $opt '*1.6*'
elif [ $1 = allx ]; then
- for i in 38 39 40
+ for i in 39 40
do
getOneMock fc${i}x $opt
done
@@ -645,7 +635,7 @@ elif [ $1 = scl71 ]; then
done
elif [ $1 = scl84 ]; then
- for i in fc38 fc39 fc40 el8 el9
+ for i in fc39 fc40 el8 el9
do
getOneMock scl84${i}x $opt
done
@@ -655,7 +645,7 @@ elif [ $1 = scl84 ]; then
getOneMock scl84el9a $opt
elif [ $1 = scl83 ]; then
- for i in fc38 fc39 fc40 el8 el9
+ for i in fc39 fc40 el8 el9
do
getOneMock scl83${i}x $opt
done
@@ -665,7 +655,7 @@ elif [ $1 = scl83 ]; then
getOneMock scl83el9a $opt
elif [ $1 = scl82 ]; then
- for i in 38 39 40
+ for i in 39 40
do
getOneMock scl82fc${i}x $opt
done
@@ -679,7 +669,7 @@ elif [ $1 = scl82 ]; then
getOneMock scl82el9a $opt
elif [ $1 = scl81 ]; then
- for i in 38 39 40
+ for i in 39 40
do
getOneMock scl81fc${i}x $opt
done
@@ -693,7 +683,7 @@ elif [ $1 = scl81 ]; then
getOneMock scl81el9a $opt
elif [ $1 = scl80 ]; then
- for i in 38 39 40
+ for i in 39 40
do
getOneMock scl80fc${i}x $opt
done
@@ -707,7 +697,7 @@ elif [ $1 = scl80 ]; then
getOneMock scl80el9a $opt
elif [ $1 = scl74 ]; then
- for i in 38 39 40
+ for i in 39 40
do
getOneMock scl74fc${i}x $opt
done
diff --git a/mkallrepo b/mkallrepo
index 7a28747..434ab0a 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -10,7 +10,7 @@ TMPSIG2024=$(mktemp -t XXXXXXXX.2024)
cd /home/rpmbuild/site/rpms
-for dep in fedora/{38,39,40}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{39,40}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
@@ -46,8 +46,7 @@ if [ -s $TMPSIG ]; then
# 2021
grep el9 $TMPSIG > $TMPSIG2021
# 2023
- grep fc38 $TMPSIG > $TMPSIG2023
- grep fc39 $TMPSIG >> $TMPSIG2023
+ grep fc39 $TMPSIG > $TMPSIG2023
# 2024
grep src.rpm $TMPSIG > $TMPSIG2024
grep fc40 $TMPSIG >> $TMPSIG2024
@@ -105,7 +104,7 @@ then echo "== Création des liens (noarch) =="
else echo "Rien à lier."
fi
-for dep in SRPMS fedora/{38,39,40}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{39,40}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index 412f0ad..1eb655f 100755
--- a/mkmodular
+++ b/mkmodular
@@ -389,74 +389,6 @@ exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PAT
chdir($old);
}
-if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) {
- $dest = 'fedora/38/modular/x86_64';
- echo "Populate $dest\n";
- cleanup($dest);
- $mod = '';
-
- $deps = ['platform' => 'f38'];
- $mod .= genModule('fedora/38/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
- $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
- $mod .= genModule('fedora/38/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
- $mod .= genModule('fedora/38/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
- $mod .= genModule('fedora/38/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
- $mod .= genModule('fedora/38/redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
- $mod .= genModule('fedora/38/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
- $mod .= genDefaults('memcached', false, ['remi']);
- createRepo($dest, $mod);
-
- $dest = 'fedora/38/debug-modular/x86_64';
- echo "Populate $dest\n";
- cleanup($dest);
- $mod = '';
-
- $deps = ['platform' => 'f38'];
- $mod .= genModule('fedora/38/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
- $mod .= genModule('fedora/38/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
- $mod .= genModule('fedora/38/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
- $mod .= genModule('fedora/38/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
- $mod .= genModule('fedora/38/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
- createRepo($dest, $mod);
-}
-if (in_array('f38', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
- $dest = 'fedora/38/modular-test/x86_64';
- echo "Populate $dest\n";
- cleanup($dest);
- $mod = '';
-
- $deps = ['platform' => 'f38'];
- $mod .= genModule('fedora/38/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
- createRepo($dest, $mod);
-
- $dest = 'fedora/38/debug-modular-test/x86_64';
- echo "Populate $dest\n";
- cleanup($dest);
- $mod = '';
-
- $deps = ['platform' => 'f38'];
- $mod .= genModule('fedora/38/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/38/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
- createRepo($dest, $mod);
-}
-
if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv'])) {
$dest = 'fedora/39/modular/x86_64';
echo "Populate $dest\n";
diff --git a/mockit b/mockit
index ca8ee24..829717f 100755
--- a/mockit
+++ b/mockit
@@ -131,7 +131,7 @@ fi
# PHP version matrix
echo mockit $SRPM $DIST $MIN $MAX $@
case $DIST in
- fc38x|fc39x|fc39a|fc40x|fc40a|el9x|el9a)
+ fc39x|fc39a|fc40x|fc40a|el9x|el9a)
LST="82 81 74 80 83"
SCL="74 80 81 82 83 84"
;;
@@ -145,7 +145,7 @@ case $DIST in
;;
allx)
if [ $REDIS -ge 1 ]; then
- for i in fc38x fc39x fc40x el8x el9x fc39a fc40a el8a el9a
+ for i in fc39x fc40x el8x el9x fc39a fc40a el8a el9a
do
[ $BUILD_BASE -ge 1 ] && $0 --redis --base $SRPM $i $MIN $MAX $@
[ $BUILD_SCLS -ge 1 ] && $0 --redis --scl $SRPM $i $MIN $MAX $@
diff --git a/mockrun b/mockrun
index 4554626..cf0efeb 100755
--- a/mockrun
+++ b/mockrun
@@ -43,7 +43,7 @@ do
fi
TXT="$(echo $CMD | sed -e 's/^.*-r //;s/ .*$//') "
RPM="$(echo $CMD | sed -e 's:\.rpm.*$:.rpm:;s:^.*/::')"
- echo -en "\r$(date +%X) $RPM ${TXT:0:10}"
+ echo -en "\r$(date +%X) $RPM ${TXT:0:10} "
$CMD --uniqueext=$PPID && echo " Ok." || echo " Error !"
done