diff options
| -rwxr-xr-x | mkmodular | 4 | ||||
| -rwxr-xr-x | mkrepo | 15 |
2 files changed, 4 insertions, 15 deletions
@@ -370,7 +370,7 @@ exec("mkrepo nocheck noclean"); $data = '/tmp/modules.yaml'; file_put_contents($data, $mod); $hash = hash('sha256', $mod); -exec("modifyrepo_c --mdtype=modules $data repodata >/dev/null"); +exec("modifyrepo_c --compress-type=bz2 --mdtype=modules $data repodata >/dev/null"); $arch = basename($dest); rename($data, "$data.$arch"); @@ -984,7 +984,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genDefaults('php', '7.2', ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); @@ -87,7 +87,6 @@ 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 12 \ @@ -96,20 +95,10 @@ if true; then --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 12 \ - --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 |