From 65acd8e8e330b6b72e44667b7cc819cde394e391 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jan 18 2012 22:09:06 +0000 Subject: setup mash to do branched for f17 and use f17 key in branch and f17 and f18 in rawhide --- diff --git a/configs/branched.mash b/configs/branched.mash index b4db8e3..b726313 100644 --- a/configs/branched.mash +++ b/configs/branched.mash @@ -1,19 +1,19 @@ # mash config file -[16] +[17] rpm_path = %(arch)s/os/Packages repodata_path = %(arch)s/os/ source_path = source/SRPMS debuginfo = True multilib = True multilib_method = devel -tag = f16 -inherit = True +tag = f17 +inherit = False strict_keys = True -keys = A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 +keys = 1ACA3465, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/15/%(arch)s/os/ repoviewtitle = "Fedora Branched - %(arch)s" arches = i386 x86_64 delta = True # Change distro_tags as fedora-release version gets bumped -distro_tags = cpe:/o:fedoraproject:fedora:16 rawhide +distro_tags = cpe:/o:fedoraproject:fedora:17 rawhide diff --git a/configs/rawhide.mash b/configs/rawhide.mash index 86a4845..8ee7b69 100644 --- a/configs/rawhide.mash +++ b/configs/rawhide.mash @@ -10,7 +10,7 @@ multilib_method = devel tag = dist-rawhide inherit = True strict_keys = False -keys = A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 +keys = 22B3B81A, 1ACA3465, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/ repoviewtitle = "Fedora Rawhide - %(arch)s" arches = i386 x86_64