diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2011-06-07 21:52:18 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2011-06-07 21:52:18 +0000 |
| commit | 302a3b4d9287c09aeee0e810062104713c2ff42b (patch) | |
| tree | 965827b1fcbf8c04a9ef2969923c2d301986dc4a | |
| parent | 60f88137064d4394db49c96314e71867451fcb3d (diff) | |
| download | puppet-302a3b4d9287c09aeee0e810062104713c2ff42b.tar puppet-302a3b4d9287c09aeee0e810062104713c2ff42b.tar.gz puppet-302a3b4d9287c09aeee0e810062104713c2ff42b.tar.bz2 puppet-302a3b4d9287c09aeee0e810062104713c2ff42b.tar.xz puppet-302a3b4d9287c09aeee0e810062104713c2ff42b.zip | |
Start preparing uploads to 1
| -rw-r--r-- | modules/buildsystem/templates/repsys.conf | 13 | ||||
| -rw-r--r-- | modules/buildsystem/templates/submit-todo.conf | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/modules/buildsystem/templates/repsys.conf b/modules/buildsystem/templates/repsys.conf index b41fb737..4bfddc7f 100644 --- a/modules/buildsystem/templates/repsys.conf +++ b/modules/buildsystem/templates/repsys.conf @@ -39,9 +39,14 @@ host = pkgsubmit.<%= domain %> [submit cauldron] target = <%= sched_home_dir %>/repsys/srpms -allowed = svn+ssh://svn.<%= domain %>/svn/packages/cauldron svn+ssh://svn.<%= domain %>/svn/packages/branches/cauldron +allowed = svn+ssh://svn.<%= domain %>/svn/packages/cauldron rpm-macros = global cauldron +[submit 1] +target = <%= sched_home_dir %>/repsys/srpms +allowed = svn+ssh://svn.<%= domain %>/svn/packages/updates/1 +rpm-macros = global 1 + [macros global] distsuffix = .mga # mkrel definition to be removed when rpm-setup is updated on main build node @@ -54,9 +59,13 @@ _real_vendor = mageia distro_release = 2 # 100 * major + minor mgaversion = 200 -manbo_release = 2 mageia_branch = cauldron +[macros cauldron] +distro_release = 1 +# 100 * major + minor +mgaversion = 100 + [helper] create-srpm = /usr/share/repsys/create-srpm upload-srpm = /usr/local/bin/mga-youri-submit diff --git a/modules/buildsystem/templates/submit-todo.conf b/modules/buildsystem/templates/submit-todo.conf index c1239eda..48c2822d 100644 --- a/modules/buildsystem/templates/submit-todo.conf +++ b/modules/buildsystem/templates/submit-todo.conf @@ -47,7 +47,7 @@ targets: - tag - acl - host - - section + #- section - rpmlint - recency #- history @@ -121,7 +121,7 @@ checks: version: class: Youri::Submit::Check::Version options: - 1.0: + 1: authorized_packages: none_package_authorized authorized_sections: ^(core|nonfree|tainted)/(updates|updates_testing|backports|backports_testing)$ authorized_arches: none |