summaryrefslogtreecommitdiffstats
path: root/mkrepo
diff options
context:
space:
mode:
Diffstat (limited to 'mkrepo')
-rwxr-xr-xmkrepo48
1 files changed, 24 insertions, 24 deletions
diff --git a/mkrepo b/mkrepo
index 93e946e..429811d 100755
--- a/mkrepo
+++ b/mkrepo
@@ -12,7 +12,7 @@ then
elif [ "$nom" = "SRPMS" ]
then
dis=fedora
- ver=34
+ ver=40
old=8
dst=/data/rpms/SRPMS.remi
else
@@ -23,29 +23,40 @@ else
dst=/data/rpms/old
fi
-GPG_NAME="Remi's RPM repository"
+GPG_PATH=/home/remi/.gnupgrpm
if [ "$dis" == "fedora" ]; then
# Fedora
- if [ "$ver" -ge 34 ]
+ if [ "$ver" -ge 40 ]
+ then echo "key 2024"
+ GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"
+ elif [ "$ver" -ge 38 ]
+ then echo "key 2023"
+ GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E"
+ elif [ "$ver" -ge 36 ]
+ then echo "key 2022"
+ 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
else
# Enterprise
- if [ "$dis" == "enterprise" -a "$ver" -ge 8 ]
+ if [ "$ver" -ge 9 ]
+ then echo "key 2021"
+ 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
@@ -79,29 +90,18 @@ cache=/home/rpmbuild/site/rpms/.createrepocache/$nom
mkdir -p $cache
check=sha256
#if [ "$dis" == "fedora" -a "$ver" -ge 99 ]; then
-if true; then
cleanoldmeta repodata
echo "+ Génération repodata (createrepo_c, $check)"
- createrepo_c --workers 4 \
+ createrepo_c --workers 12 \
--cachedir $cache \
--unique-md-filenames \
--retain-old-md 8 \
--changelog-limit 3 \
--compress-type=bz2 \
+ --general-compress-type=bz2 \
--quiet \
--database $(pwd)
-else
- cleanoldmeta repodata
- echo "+ Génération repodata (createrepo, $check)"
- createrepo --workers 4 \
- --cachedir $cache \
- --checksum $check \
- --unique-md-filenames \
- --retain-old-md 8 \
- --changelog-limit 3 \
- --compress-type=bz2 \
- --database .
-fi
+#fi
rm -f repodata/repomd.xml.asc
gpg --armor --detach-sign --default-key "$GPG_NAME" --homedir "$GPG_PATH" repodata/repomd.xml