From aa54d84b3f942d69ef67c8341237ba1d62392211 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Feb 2022 11:01:41 +0100 Subject: all keys moved in same folder --- mkmodular | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'mkmodular') diff --git a/mkmodular b/mkmodular index 474a973..11254a1 100755 --- a/mkmodular +++ b/mkmodular @@ -335,29 +335,23 @@ chdir($dest); // Key [$dis,$ver]=explode("/", $dest); +$GPG_PATH="/home/remi/.gnupgrpm"; if ($dis == "fedora") { 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="1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56"; } } @@ -379,7 +373,7 @@ rename($data, "$data.$arch"); exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PATH\" repodata/repomd.xml"); chdir($old); } - +/* if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) { $dest = 'fedora/33/modular/x86_64'; echo "Populate $dest\n"; @@ -405,7 +399,7 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/33/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } - +*/ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) { $dest = 'fedora/34/modular/x86_64'; echo "Populate $dest\n"; @@ -413,7 +407,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f34']; - $mod .= genModule('fedora/34/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/34/remi/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/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']); @@ -425,7 +419,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f34']; - $mod .= genModule('fedora/34/debug-remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/34/debug-remi/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -437,7 +431,7 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f34']; - $mod .= genModule('fedora/34/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/34/test/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -448,7 +442,7 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f34']; - $mod .= genModule('fedora/34/debug-test/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/34/debug-test/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/34/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -462,7 +456,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) { $deps = ['platform' => 'f35']; $mod .= genModule('fedora/35/php74/x86_64', $dest, '*rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/35/remi/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/35/remi/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/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); @@ -474,7 +468,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) { $deps = ['platform' => 'f35']; $mod .= genModule('fedora/35/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/35/debug-remi/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/35/debug-remi/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -486,7 +480,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $deps = ['platform' => 'f35']; $mod .= genModule('fedora/35/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/35/test/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/35/test/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -497,7 +491,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $deps = ['platform' => 'f35']; $mod .= genModule('fedora/35/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/35/debug-test/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/35/debug-test/x86_64', $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } -- cgit