From ca91f8472470d4fa132b74275544f6d0b2797151 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jan 19 2015 21:11:07 +0000 Subject: setup branched configs for f22 only allow the f22 keys on rawhide --- diff --git a/configs/branched.arm.mash b/configs/branched.arm.mash index 7d73a60..216aa37 100644 --- a/configs/branched.arm.mash +++ b/configs/branched.arm.mash @@ -1,21 +1,22 @@ # mash config file -[21-arm] +[22-arm] rpm_path = %(arch)s/os/Packages repodata_path = %(arch)s/os/ source_path = source/SRPMS debuginfo = True multilib = True multilib_method = devel -tag = f21 +tag = f22 inherit = False strict_keys = True -keys = A0A7BADB -repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/21/%(arch)s/os/ +keys = A29CB19C +repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/22/%(arch)s/os/ repoviewtitle = "Fedora Branched - %(arch)s" arches = aarch64 delta = True max_delta_rpm_age = 604800 +delta_workers = 8 # Change distro_tags as fedora-release version gets bumped -distro_tags = cpe:/o:fedoraproject:fedora:21 Null +distro_tags = cpe:/o:fedoraproject:fedora:22 Twenty Two hash_packages = True diff --git a/configs/branched.mash b/configs/branched.mash index 7983ab0..7797a46 100644 --- a/configs/branched.mash +++ b/configs/branched.mash @@ -1,22 +1,23 @@ # mash config file -[21] +[22] rpm_path = %(arch)s/os/Packages repodata_path = %(arch)s/os/ source_path = source/SRPMS debuginfo = True multilib = True multilib_method = devel -tag = f21 +tag = f22 inherit = False strict_keys = True -keys = 95A43F54 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/21/%(arch)s/os/ +keys = 8E1431D5 +repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/22/%(arch)s/os/ repoviewtitle = "Fedora Branched - %(arch)s" arches = armhfp i386 x86_64 delta = True max_delta_rpm_size = 800000000 max_delta_rpm_age = 604800 +delta_workers = 8 # Change distro_tags as fedora-release version gets bumped -distro_tags = cpe:/o:fedoraproject:fedora:21 Null +distro_tags = cpe:/o:fedoraproject:fedora:22 Twenty Two hash_packages = True diff --git a/configs/branched.ppc.mash b/configs/branched.ppc.mash index 62f4b72..8361dd7 100644 --- a/configs/branched.ppc.mash +++ b/configs/branched.ppc.mash @@ -1,20 +1,21 @@ # mash config file -[21-ppc] +[22-ppc] rpm_path = %(arch)s/os/Packages repodata_path = %(arch)s/os/ source_path = source/SRPMS debuginfo = True multilib = False -tag = f21 +tag = f22 inherit = False strict_keys = True -keys = A0A7BADB -repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/21/%(arch)s/os/ +keys = A29CB19C +repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/22/%(arch)s/os/ repoviewtitle = "Fedora Branched - %(arch)s" arches = ppc64le ppc64 delta = True max_delta_rpm_age = 604800 +delta_workers = 8 # Change distro_tags as fedora-release version gets bumped -distro_tags = cpe:/o:fedoraproject:fedora:21 Null +distro_tags = cpe:/o:fedoraproject:fedora:22 Twenty Two hash_packages = True diff --git a/configs/branched.s390.mash b/configs/branched.s390.mash index c5115fc..d652227 100644 --- a/configs/branched.s390.mash +++ b/configs/branched.s390.mash @@ -1,21 +1,22 @@ # mash config file -[21-s390] +[22-s390] rpm_path = %(arch)s/os/Packages repodata_path = %(arch)s/os/ source_path = source/SRPMS debuginfo = True multilib = True multilib_method = devel -tag = f21 +tag = f22 inherit = False strict_keys = True -keys = A0A7BADB -repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/21/%(arch)s/os/ +keys = A29CB19C +repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/22/%(arch)s/os/ repoviewtitle = "Fedora Branched - %(arch)s" arches = s390 s390x delta = True max_delta_rpm_age = 604800 +delta_workers = 8 # Change distro_tags as fedora-release version gets bumped -distro_tags = cpe:/o:fedoraproject:fedora:21 Null +distro_tags = cpe:/o:fedoraproject:fedora:22 Twenty Two hash_packages = True diff --git a/configs/rawhide.arm.mash b/configs/rawhide.arm.mash index e487304..ec864ad 100644 --- a/configs/rawhide.arm.mash +++ b/configs/rawhide.arm.mash @@ -9,12 +9,13 @@ multilib = False tag = f22 inherit = False strict_keys = False -keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C +keys = A29CB19C repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/rawhide/%(arch)s/os/ repoviewtitle = "Fedora Rawhide - %(arch)s" arches = aarch64 delta = True max_delta_rpm_age = 604800 +delta_workers = 8 # Change distro_tags as fedora-release version gets bumped distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide hash_packages = True diff --git a/configs/rawhide.mash b/configs/rawhide.mash index 2e45d32..837d5c0 100644 --- a/configs/rawhide.mash +++ b/configs/rawhide.mash @@ -10,7 +10,7 @@ multilib_method = devel tag = f22 inherit = False strict_keys = False -keys = 246110C1, FB4b18E6, DE7F38BD, 22B3B81A, 1ACA3465, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, 8E1431D5 +keys = 8E1431D5 repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/ repoviewtitle = "Fedora Rawhide - %(arch)s" arches = i386 x86_64 armhfp diff --git a/configs/rawhide.ppc.mash b/configs/rawhide.ppc.mash index 6223b88..ed51062 100644 --- a/configs/rawhide.ppc.mash +++ b/configs/rawhide.ppc.mash @@ -9,12 +9,13 @@ multilib = False tag = f22 inherit = False strict_keys = False -keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C +keys = A29CB19C repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/rawhide/%(arch)s/os/ repoviewtitle = "Fedora Rawhide - %(arch)s" arches = ppc64le ppc64 delta = True max_delta_rpm_age = 604800 +delta_workers = 8 # Change distro_tags as fedora-release version gets bumped distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide hash_packages = True diff --git a/configs/rawhide.s390.mash b/configs/rawhide.s390.mash index 8de136c..c2a9d47 100644 --- a/configs/rawhide.s390.mash +++ b/configs/rawhide.s390.mash @@ -10,12 +10,13 @@ multilib_method = devel tag = f22 inherit = False strict_keys = False -keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C +keys = A29CB19C repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/rawhide/%(arch)s/os/ repoviewtitle = "Fedora Rawhide - %(arch)s" arches = s390 s390x delta = True max_delta_rpm_age = 604800 +delta_workers = 8 # Change distro_tags as fedora-release version gets bumped distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide hash_packages = True