aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Lécureuil <neoclust@mageia.org>2014-02-03 17:16:27 +0000
committerNicolas Lécureuil <neoclust@mageia.org>2014-02-03 17:16:27 +0000
commit41b331b6dd195f5a1d93e1c11e38624dc3c787a0 (patch)
treee2bd5b21feffce759194dc4245308256d9634a9a
parentc558248f7a14c4b9fb2f8191d8c1ac0b132fb1b3 (diff)
downloadpuppet-41b331b6dd195f5a1d93e1c11e38624dc3c787a0.tar
puppet-41b331b6dd195f5a1d93e1c11e38624dc3c787a0.tar.gz
puppet-41b331b6dd195f5a1d93e1c11e38624dc3c787a0.tar.bz2
puppet-41b331b6dd195f5a1d93e1c11e38624dc3c787a0.tar.xz
puppet-41b331b6dd195f5a1d93e1c11e38624dc3c787a0.zip
Add mga4 support in youri
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp70
1 files changed, 69 insertions, 1 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index b8800276..9a37683f 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -350,6 +350,45 @@ class mga_buildsystem::config {
],
}
+ # rpmlint check options for Mageia 4
+ $mga4_rpmlint = {
+ 'config' => '/usr/share/rpmlint/config',
+ 'path' => '/usr/bin/rpmlint',
+ 'results' => [
+ 'buildprereq-use',
+ 'no-description-tag',
+ 'no-summary-tag',
+ 'non-standard-group',
+ 'non-xdg-migrated-menu',
+ 'percent-in-conflicts',
+ 'percent-in-dependency',
+ 'percent-in-obsoletes',
+ 'percent-in-provides',
+ 'summary-ended-with-dot',
+ 'unexpanded-macro',
+ 'unknown-lsb-keyword',
+ 'malformed-line-in-lsb-comment-block',
+ 'empty-%postun',
+ 'empty-%post',
+ 'invalid-desktopfile',
+ 'standard-dir-owned-by-package',
+ 'use-tmp-in-%postun',
+ 'bogus-variable-use-in-%posttrans',
+ 'dir-or-file-in-usr-local',
+ 'dir-or-file-in-tmp',
+ 'dir-or-file-in-mnt',
+ 'dir-or-file-in-opt',
+ 'dir-or-file-in-home',
+ 'dir-or-file-in-var-local',
+ 'tmpfiles-conf-in-etc',
+ 'non-ghost-in-run',
+ 'non-ghost-in-var-run',
+ 'non-ghost-in-var-lock',
+ 'systemd-unit-in-etc',
+ 'udev-rule-in-etc',
+ ],
+ }
+
# rpmlint check options for cauldron
$cauldron_rpmlint = {
'config' => '/usr/share/rpmlint/config',
@@ -507,7 +546,7 @@ class mga_buildsystem::config {
},
},
- '3' => {
+ '3' => {
'arch' => $std_arch,
'no_media_cfg_update' => true,
'medias' => $std_medias,
@@ -535,6 +574,35 @@ class mga_buildsystem::config {
},
},
+ '4' => {
+ 'arch' => $std_arch,
+ 'no_media_cfg_update' => true,
+ 'medias' => $std_medias,
+ 'base_media' => $std_base_media,
+ 'branch' => 'Official',
+ 'version' => '4',
+ 'submit_allowed' => "${svn_root_packages}/updates/4",
+ 'backports_allowed' => "${svn_root_packages}/backports/4",
+ 'macros' => $std_macros,
+ 'repo_allow_from' => $repo_allow_from,
+ 'youri' => {
+ 'upload' => {
+ 'targets' => $std_youri_upload_targets,
+ 'checks' => {
+ 'rpmlint' => $mga4_rpmlint,
+ },
+ },
+ 'todo' => {
+ 'targets' => $std_youri_todo_targets,
+ 'checks' => {
+ 'rpmlint' => $mga4_rpmlint,
+ 'version' => $std_version_check,
+ },
+ },
+ },
+ },
+
+
'infra_1' => {
'arch' => $std_arch,
'medias' => $infra_medias,