From af494fe2d5a77b0dddd4dd83f038dcd487f4cc5b Mon Sep 17 00:00:00 2001 From: Mike McGrath Date: Mon, 20 Oct 2008 11:16:32 -0500 Subject: [PATCH] this is what we're currently running --- scripts/epel-repoclosure/PackageOwners.py | 2 +- scripts/epel-repoclosure/checkEpel.sh | 2 +- scripts/epel-repoclosure/demo.sh | 10 -- .../epel-repoclosure/rc-epel5-20080113.txt | 166 ------------------ scripts/epel-repoclosure/rc-report-epel.cfg | 9 - scripts/epel-repoclosure/yum.epel.conf | 75 +++++++- 6 files changed, 74 insertions(+), 190 deletions(-) delete mode 100755 scripts/epel-repoclosure/demo.sh delete mode 100644 scripts/epel-repoclosure/rc-epel5-20080113.txt delete mode 100644 scripts/epel-repoclosure/rc-report-epel.cfg diff --git a/scripts/epel-repoclosure/PackageOwners.py b/scripts/epel-repoclosure/PackageOwners.py index 7c5777f..1902191 100644 --- a/scripts/epel-repoclosure/PackageOwners.py +++ b/scripts/epel-repoclosure/PackageOwners.py @@ -244,7 +244,7 @@ class PackageOwners: fields = line.split(',') try: user = fields[0] - addr = fields[1] + addr = '%s@fedoraproject.org' % user except IndexError: print line raise diff --git a/scripts/epel-repoclosure/checkEpel.sh b/scripts/epel-repoclosure/checkEpel.sh index 87ff314..14f4fc7 100755 --- a/scripts/epel-repoclosure/checkEpel.sh +++ b/scripts/epel-repoclosure/checkEpel.sh @@ -13,7 +13,7 @@ process_deps() mail=$4 [ -z $4 ] && mail="no" || mail="yes" [ $arch = "ppc" ] && arch_label=ppc64 || arch_label=$arch - command="/usr/local/bin/rc-modified -d mdcache -n -c $YUM_CONF_LOC -a $arch_label -r rhel-$release-$arch -r fedora-epel-$release-$arch" + command="/usr/local/bin/rc-modified -d mdcache -n -c $YUM_CONF_LOC -a $arch_label -r rhel-$release-$arch -r fedora-epel-$release-$arch -r buildsys-$release-$arch -r rhel-$arch-server-productivity-$release" [ $release -eq 5 ] && command="$command -r rhel-$release-$arch-vt " [ "$testing" = "testing" ] && command="$command -r fedora-epel-testing-$release-$arch " OUTFILE=$OUTPUT_DIR/epel${release}${arch}-$DATE.txt diff --git a/scripts/epel-repoclosure/demo.sh b/scripts/epel-repoclosure/demo.sh deleted file mode 100755 index 573a6ac..0000000 --- a/scripts/epel-repoclosure/demo.sh +++ /dev/null @@ -1,10 +0,0 @@ -# Run Extras repoclosure against EPEL 5. - -# i386 -#./rc-modified -q -d mdcache -n -c yum.epel.conf -a i686 -r centos-5-i386 -r centos-updates-5-i386 -r fedora-epel-5-i386 -r fedora-epel-testing-5-i386 > rc-epel5-20080113.txt - -# x86_64 : APPEND! -#./rc-modified -q -d mdcache -n -c yum.epel.conf -a x86_64 -r centos-5-x86_64 -r centos-updates-5-x86_64 -r fedora-epel-5-x86_64 -r fedora-epel-testing-5-x86_64 >> rc-epel5-20080113.txt - -# Show summary which can be sent to mailing-list. -./rc-report.py rc-epel5-20080113.txt -k epel -c rc-report-epel.cfg -w testing diff --git a/scripts/epel-repoclosure/rc-epel5-20080113.txt b/scripts/epel-repoclosure/rc-epel5-20080113.txt deleted file mode 100644 index d05c186..0000000 --- a/scripts/epel-repoclosure/rc-epel5-20080113.txt +++ /dev/null @@ -1,166 +0,0 @@ -source rpm: R-2.6.1-1.el5.src.rpm -package: R - 2.6.1-1.el5.i386 from fedora-epel-needsign-5-i386 - unresolved deps: - perl(File::Copy::Recursive) - -source rpm: bodhi-0.4.4-1.el5.src.rpm -package: bodhi-server - 0.4.4-1.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - yum-utils >= 0:1.1.7 - mash - -source rpm: fedora-packager-0.1.1-1.el5.src.rpm -package: fedora-packager - 0.1.1-1.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - plague-client - -source rpm: hspell-1.0-7.el5.src.rpm -package: hunspell-he - 1.0-7.el5.i386 from fedora-epel-testing-5-i386 - unresolved deps: - hunspell - -source rpm: koji-1.2.3-1.el5.src.rpm -package: koji-builder - 1.2.3-1.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - createrepo >= 0:0.4.11 - -source rpm: moodle-1.8.2-1.el5.src.rpm -package: moodle - 1.8.2-1.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - mimetex - -source rpm: bzr-gtk-0.93.0-2.el5.src.rpm -package: nautilus-bzr - 0.93.0-2.el5.i386 from fedora-epel-testing-5-i386 - unresolved deps: - nautilus-python >= 0:0.4.3-4 - -source rpm: nautilus-sendto-0.7-5.fc6.src.rpm -package: nautilus-sendto - 0.7-5.fc6.i386 from centos-5-i386 - unresolved deps: - libgaim.so.0 - -source rpm: perl-Test-Base-0.53-1.el5.src.rpm -package: perl-Test-Base - 0.53-1.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - perl(Module::Install::Base) - -source rpm: perl-libwhisker2-2.4-3.el5.src.rpm -package: perl-libwhisker2 - 2.4-3.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - perl(MD5) - -source rpm: python-Coherence-0.2.1-3.el5.src.rpm -package: python-Coherence - 0.2.1-3.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - python-twisted-core - python-nevow - python-twisted-web - -source rpm: revisor-2.0.5-15.el5.src.rpm -package: revisor-jigdo - 2.0.5-15.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - jigdo - -source rpm: snake-0.9-0.5git.el5.src.rpm -package: snake-server - 0.9-0.5git.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - pykickstart >= 0:1.1 - -source rpm: translate-toolkit-0.10.1-1.el5.src.rpm -package: translate-toolkit - 0.10.1-1.el5.noarch from fedora-epel-testing-5-i386 - unresolved deps: - python-enchant - -source rpm: R-2.6.1-1.el5.src.rpm -package: R - 2.6.1-1.el5.i386 from fedora-epel-needsign-5-x86_64 - unresolved deps: - perl(File::Copy::Recursive) - -source rpm: R-2.6.1-1.el5.src.rpm -package: R - 2.6.1-1.el5.x86_64 from fedora-epel-needsign-5-x86_64 - unresolved deps: - perl(File::Copy::Recursive) - -source rpm: bodhi-0.4.4-1.el5.src.rpm -package: bodhi-server - 0.4.4-1.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - yum-utils >= 0:1.1.7 - mash - -source rpm: fedora-packager-0.1.1-1.el5.src.rpm -package: fedora-packager - 0.1.1-1.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - plague-client - -source rpm: hspell-1.0-7.el5.src.rpm -package: hunspell-he - 1.0-7.el5.x86_64 from fedora-epel-testing-5-x86_64 - unresolved deps: - hunspell - -source rpm: koji-1.2.3-1.el5.src.rpm -package: koji-builder - 1.2.3-1.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - createrepo >= 0:0.4.11 - -source rpm: openib-1.2-6.el5.src.rpm -package: libcxgb3-devel - 1.0-6.el5.i386 from centos-5-x86_64 - unresolved deps: - libcxgb3 = 0:1.0-6.el5 - -source rpm: moodle-1.8.2-1.el5.src.rpm -package: moodle - 1.8.2-1.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - mimetex - -source rpm: mozldap-6.0.4-1.el5.src.rpm -package: mozldap-devel - 6.0.4-1.el5.i386 from centos-5-x86_64 - unresolved deps: - mozldap = 0:6.0.4-1.el5 - -source rpm: nagios-2.9-1.el5.src.rpm -package: nagios-devel - 2.9-1.el5.i386 from fedora-epel-5-x86_64 - unresolved deps: - nagios = 0:2.9-1.el5 - -source rpm: bzr-gtk-0.93.0-2.el5.src.rpm -package: nautilus-bzr - 0.93.0-2.el5.x86_64 from fedora-epel-testing-5-x86_64 - unresolved deps: - nautilus-python >= 0:0.4.3-4 - -source rpm: nautilus-sendto-0.7-5.fc6.src.rpm -package: nautilus-sendto - 0.7-5.fc6.x86_64 from centos-5-x86_64 - unresolved deps: - libgaim.so.0()(64bit) - -source rpm: perl-Test-Base-0.53-1.el5.src.rpm -package: perl-Test-Base - 0.53-1.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - perl(Module::Install::Base) - -source rpm: perl-libwhisker2-2.4-3.el5.src.rpm -package: perl-libwhisker2 - 2.4-3.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - perl(MD5) - -source rpm: python-Coherence-0.2.1-3.el5.src.rpm -package: python-Coherence - 0.2.1-3.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - python-twisted-core - python-nevow - python-twisted-web - -source rpm: revisor-2.0.5-15.el5.src.rpm -package: revisor-jigdo - 2.0.5-15.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - jigdo - -source rpm: snake-0.9-0.5git.el5.src.rpm -package: snake-server - 0.9-0.5git.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - pykickstart >= 0:1.1 - -source rpm: translate-toolkit-0.10.1-1.el5.src.rpm -package: translate-toolkit - 0.10.1-1.el5.noarch from fedora-epel-testing-5-x86_64 - unresolved deps: - python-enchant - diff --git a/scripts/epel-repoclosure/rc-report-epel.cfg b/scripts/epel-repoclosure/rc-report-epel.cfg deleted file mode 100644 index 1c5fe33..0000000 --- a/scripts/epel-repoclosure/rc-report-epel.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[FAS] -project = Fedora EPEL -user = fedorasy -passwd = mypass - -[Mail] -from = Fedora Extras repoclosure -replyto = epel-devel-list@redhat.com -subject = Broken dependencies in EPEL diff --git a/scripts/epel-repoclosure/yum.epel.conf b/scripts/epel-repoclosure/yum.epel.conf index 5dcbac9..cfff087 100644 --- a/scripts/epel-repoclosure/yum.epel.conf +++ b/scripts/epel-repoclosure/yum.epel.conf @@ -13,7 +13,7 @@ retries=20 [rhel-5-i386] name=RHEL5 -baseurl=http://infrastructure.fedoraproject.org/rhel/RHEL5-$basearch/Server +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-i386-server-5/ enabled=0 [rhel-5-i386-vt] @@ -23,7 +23,7 @@ enabled=0 [rhel-5-x86_64] name=RHEL 5 - x86_64 -baseurl=http://infrastructure.fedoraproject.org/rhel/RHEL5-$basearch/Server +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-x86_64-server-5/ enabled=0 [rhel-5-x86_64-vt] @@ -33,7 +33,7 @@ enabled=0 [rhel-5-ppc] name=RHEL 5 ppc -baseurl=http://infrastructure.fedoraproject.org/rhel/RHEL5-$basearch/Server +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-ppc-server-5/ [rhel-5-ppc-vt] name=RHEL5 @@ -83,6 +83,11 @@ name=RHEL 4 - x86_64 baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-x86_64-as-4/ enabled=0 +#Redhat doesnt ship a 32 bit ppc kernel. we use the CentOS one +[kernel] +name=kernel +baseurl=http://infrastructure.fedoraproject.org/buildsys/4/ppc/ + [rhel-4-ppc] name=RHEL 4 - ppc baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-ppc-as-4/ @@ -117,3 +122,67 @@ enabled=0 name=Fedora EPEL Test Updates 4 - ppc baseurl=file:///pub/epel/testing/4/ppc/ enabled=0 + + +# Custom created stuff for compatability +[rhel-ppc-server-productivity-5] +name=RHEL 5 - ppc +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-ppc-server-productivity-5/ +enabled=0 + +[rhel-x86_64-server-productivity-5] +name=RHEL 5 - x86_64 +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-x86_64-server-productivity-5/ +enabled=0 + +[rhel-i386-server-productivity-5] +name=RHEL 5 - i386 +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-i386-server-productivity-5/ +enabled=0 + +[rhel-ppc-server-productivity-4] +name=RHEL 4 - ppc +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-ppc-server-productivity-4/ +enabled=0 + +[rhel-x86_64-server-productivity-4] +name=RHEL 4 - x86_64 +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-x86_64-server-productivity-4/ +enabled=0 + +[rhel-i386-server-productivity-4] +name=RHEL 4 - i386 +baseurl=http://infrastructure.fedoraproject.org/rhel/rhel-i386-server-productivity-4/ +enabled=0 + +[buildsys-5-x86_64] +name=buildsys 5 - x86_64 +baseurl=http://infrastructure.fedoraproject.org/buildsys/5/x86_64/ +enabled=0 + +[buildsys-5-i386] +name=buildsys 5 - i386 +baseurl=http://infrastructure.fedoraproject.org/buildsys/5/i386/ +enabled=0 + +[buildsys-5-ppc] +name=buildsys 5 - ppc +baseurl=http://infrastructure.fedoraproject.org/buildsys/5/ppc/ +enabled=0 + +[buildsys-4-x86_64] +name=buildsys 4 - x86_64 +baseurl=http://infrastructure.fedoraproject.org/buildsys/4/x86_64/ +enabled=0 + +[buildsys-4-i386] +name=buildsys 4 - i386 +baseurl=http://infrastructure.fedoraproject.org/buildsys/4/i386/ +enabled=0 + +[buildsys-4-ppc] +name=buildsys 4 - ppc +baseurl=http://infrastructure.fedoraproject.org/buildsys/4/ppc/ +enabled=0 + +