summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--buildfct17
-rwxr-xr-xgetmock23
-rwxr-xr-xmkallrepo26
-rwxr-xr-xmkmodular60
-rwxr-xr-xmkrepo16
5 files changed, 113 insertions, 29 deletions
diff --git a/buildfct b/buildfct
index ffe00c7..f2922c2 100644
--- a/buildfct
+++ b/buildfct
@@ -50,6 +50,17 @@ alias mockfc35xscl74=" mock --configdir=$mocketc -r fc35xscl74
alias mockfc35xscl80=" mock --configdir=$mocketc -r fc35xscl80 rebuild "
alias mockfc35xscl81=" mock --configdir=$mocketc -r fc35xscl81 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 mockfc36xscl74=" mock --configdir=$mocketc -r fc36xscl74 rebuild "
+alias mockfc36xscl80=" mock --configdir=$mocketc -r fc36xscl80 rebuild "
+alias mockfc36xscl81=" mock --configdir=$mocketc -r fc36xscl81 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 "
@@ -438,7 +449,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 35
+ for i in 35 36
do
echo -n "$(date +%X) 74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -490,7 +501,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 35 34
+ for i in 35 34 36
do
echo -n "$(date +%X) 81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -516,7 +527,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 34
+ for i in 34 36
do
echo -n "$(date +%X) 80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 7cea166..69f72d7 100755
--- a/getmock
+++ b/getmock
@@ -390,6 +390,7 @@ elif [ $1 = all74 ]; then
[ $opt = remi ] && opt=php74
[ $opt = test ] && opt=test74
getOneMock fc35x74 $opt '*7.4*'
+ getOneMock fc36x74 $opt '*7.4*'
getOneMock el7x74 $opt '*7.4*'
getOneMock el8x74 $opt '*7.4*'
getOneMock el9x74 $opt '*7.4*'
@@ -397,8 +398,8 @@ elif [ $1 = all74 ]; then
elif [ $1 = all80 ]; then
[ $opt = remi ] && opt=php80
[ $opt = test ] && opt=test80
- getOneMock fc33x80 $opt '*8.0*'
getOneMock fc34x80 $opt '*8.0*'
+ getOneMock fc36x80 $opt '*8.0*'
getOneMock el7x80 $opt '*8.0*'
getOneMock el8x80 $opt '*8.0*'
getOneMock el9x80 $opt '*8.0*'
@@ -406,9 +407,9 @@ elif [ $1 = all80 ]; then
elif [ $1 = all81 ]; then
[ $opt = remi ] && opt=php81
[ $opt = test ] && opt=test81
- getOneMock fc33x81 $opt '*8.1*'
getOneMock fc34x81 $opt '*8.1*'
getOneMock fc35x81 $opt '*8.1*'
+ getOneMock fc36x81 $opt '*8.1*'
getOneMock el7x81 $opt '*8.1*'
getOneMock el8x81 $opt '*8.1*'
getOneMock el9x81 $opt '*8.1*'
@@ -430,7 +431,7 @@ elif [ $1 = for55 ]; then
done
elif [ $1 = allx ]; then
- for i in 33 34 35
+ for i in 34 35 36
do
getOneMock fc${i}x $opt
done
@@ -452,7 +453,7 @@ elif [ $1 = scl55 ]; then
done
elif [ $1 = scl56 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl56fc${i}x $opt
done
@@ -462,7 +463,7 @@ elif [ $1 = scl56 ]; then
done
elif [ $1 = scl70 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl70fc${i}x $opt
done
@@ -472,7 +473,7 @@ elif [ $1 = scl70 ]; then
done
elif [ $1 = scl71 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl71fc${i}x $opt
done
@@ -482,7 +483,7 @@ elif [ $1 = scl71 ]; then
done
elif [ $1 = scl81 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl81fc${i}x $opt
done
@@ -492,7 +493,7 @@ elif [ $1 = scl81 ]; then
done
elif [ $1 = scl80 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl80fc${i}x $opt
done
@@ -502,7 +503,7 @@ elif [ $1 = scl80 ]; then
done
elif [ $1 = scl74 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl74fc${i}x $opt
done
@@ -512,7 +513,7 @@ elif [ $1 = scl74 ]; then
done
elif [ $1 = scl73 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl73fc${i}x $opt
done
@@ -522,7 +523,7 @@ elif [ $1 = scl73 ]; then
done
elif [ $1 = scl72 ]; then
- for i in 33 34 35
+ for i in 34 35
do
getOneMock scl72fc${i}x $opt
done
diff --git a/mkallrepo b/mkallrepo
index 49e6e93..8c2d1ee 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -7,10 +7,11 @@ TMPSIG3=$(mktemp -t XXXXXXXX.2018)
TMPSIG4=$(mktemp -t XXXXXXXX.2019)
TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
+TMPSIG2022=$(mktemp -t XXXXXXXX.2022)
cd /home/rpmbuild/site/rpms
-for dep in fedora/{33,34,35}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{33,34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
@@ -51,39 +52,48 @@ if [ -s $TMPSIG ]; then
grep fc34 $TMPSIG > $TMPSIG2021
grep fc35 $TMPSIG >> $TMPSIG2021
grep el9 $TMPSIG >> $TMPSIG2021
- grep src.rpm $TMPSIG >> $TMPSIG2021
+ # 2022
+ grep fc36 $TMPSIG > $TMPSIG2022
+ grep src.rpm $TMPSIG >> $TMPSIG2022
+ if [ -s $TMPSIG2022 ]; then
+ echo "== Signature des $(cat $TMPSIG2022 | wc -l) nouveaux RPM (2022) =="
+ if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 845160D23149DAD504F0A32D83C0639E1FEF0014" --addsign $(cat $TMPSIG2022)
+ then echo done.
+ else exit 1
+ fi
+ fi
if [ -s $TMPSIG2021 ]; then
echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2021)
+ if rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021)
then echo done.
else exit 1
fi
fi
if [ -s $TMPSIG2020 ]; then
echo "== Signature des $(cat $TMPSIG2020 | wc -l) nouveaux RPM (2020) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2020)
+ if rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name 34C10BDBCC6F1B252E50BA1A0714919E4C21A808" --addsign $(cat $TMPSIG2020)
then echo done.
else exit 1
fi
fi
if [ -s $TMPSIG4 ]; then
echo "== Signature des $(cat $TMPSIG4 | wc -l) nouveaux RPM (2019) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupg2019' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG4)
+ if rpmsign --define '_gpg_path /home/remi/.gnupg2019' --define "_gpg_name 5F136145BF10369B7685D8DE503666CCBBAE6F1B" --addsign $(cat $TMPSIG4)
then echo done.
else exit 1
fi
fi
if [ -s $TMPSIG3 ]; then
echo "== Signature des $(cat $TMPSIG3 | wc -l) nouveaux RPM (2018) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG3)
+ if rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --addsign $(cat $TMPSIG3)
then echo done.
else exit 1
fi
fi
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)
+ if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --addsign $(cat $TMPSIG1)
then echo done.
else exit 1
fi
@@ -106,7 +116,7 @@ then echo "== Création des liens (noarch) =="
else echo "Rien à lier."
fi
-for dep in SRPMS fedora/{33,34,35}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{33,34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index 77c5e13..7da9171 100755
--- a/mkmodular
+++ b/mkmodular
@@ -335,23 +335,30 @@ chdir($dest);
// Key
[$dis,$ver]=explode("/", $dest);
-$GPG_NAME="Remi's RPM repository";
if ($dis == "fedora") {
- if ($ver >= 34) {
+ if ($ver >= 36) {
+ $GPG_PATH="/home/remi/.gnupgrpm";
+ $GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014";
+ } else if ($ver >= 34) {
$GPG_PATH="/home/remi/.gnupg2021";
+ $GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
} else if ($ver >= 32) {
$GPG_PATH="/home/remi/.gnupg2020";
+ $GPG_NAME="34C10BDBCC6F1B252E50BA1A0714919E4C21A808";
} else {
$GPG_PATH="/home/remi/.gnupg2019";
+ $GPG_NAME="5F136145BF10369B7685D8DE503666CCBBAE6F1B";
}
} else {
if ($ver >= 9) {
$GPG_PATH="/home/remi/.gnupg2021";
+ $GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
} else if ($ver == 8) {
$GPG_PATH="/home/remi/.gnupg2018";
+ $GPG_NAME="6B38FEA7231F87F52B9CA9D8555097595F11735A";
} else {
$GPG_PATH="/home/remi/.gnupgrpm";
- $GPG_NAME="Remi Collet";
+ $GPG_NAME="1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56";
}
}
echo "Metadata, signing with $GPG_PATH, ";
@@ -494,6 +501,53 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$mod .= genModule('fedora/35/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
}
+if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) {
+ $dest = 'fedora/36/modular/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f36'];
+ $mod .= genModule('fedora/36/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/36/debug-modular/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f36'];
+ $mod .= genModule('fedora/36/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/debug-remi/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+ $dest = 'fedora/36/modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f36'];
+ $mod .= genModule('fedora/36/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/test/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/36/debug-modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f36'];
+ $mod .= genModule('fedora/36/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/debug-test/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular-test/x86_64';
diff --git a/mkrepo b/mkrepo
index 4ca6bce..0e6c165 100755
--- a/mkrepo
+++ b/mkrepo
@@ -12,7 +12,7 @@ then
elif [ "$nom" = "SRPMS" ]
then
dis=fedora
- ver=34
+ ver=36
old=8
dst=/data/rpms/SRPMS.remi
else
@@ -23,18 +23,24 @@ else
dst=/data/rpms/old
fi
-GPG_NAME="Remi's RPM repository"
if [ "$dis" == "fedora" ]; then
# Fedora
- if [ "$ver" -ge 34 ]
+ if [ "$ver" -ge 36 ]
+ then echo "key 2022"
+ GPG_PATH=/home/remi/.gnupgrpm
+ GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014"
+ elif [ "$ver" -ge 34 ]
then echo "key 2021"
GPG_PATH=/home/remi/.gnupg2021
+ GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947"
elif [ "$ver" -ge 32 ]
then echo "key 2020"
GPG_PATH=/home/remi/.gnupg2020
+ GPG_NAME="34C10BDBCC6F1B252E50BA1A0714919E4C21A808"
elif [ "$ver" -ge 30 ]
then echo "key 2019"
GPG_PATH=/home/remi/.gnupg2019
+ GPG_NAME="5F136145BF10369B7685D8DE503666CCBBAE6F1B"
else echo "older key"
exit 1
fi
@@ -43,12 +49,14 @@ else
if [ "$ver" -ge 9 ]
then echo "key 2021"
GPG_PATH=/home/remi/.gnupg2021
+ GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947"
elif [ "$ver" -ge 8 ]
then echo "key 2018"
GPG_PATH=/home/remi/.gnupg2018
+ GPG_NAME="6B38FEA7231F87F52B9CA9D8555097595F11735A"
else echo "old key"
GPG_PATH=/home/remi/.gnupgrpm
- GPG_NAME="Remi Collet"
+ GPG_NAME="1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56"
fi
fi
generated by cgit (git 2.34.1) at 2024-04-29 18:46:06 +0000