Changeset 1276


Ignore:
Timestamp:
Mar 22, 2011, 1:15:29 AM (8 years ago)
Author:
bruno
Message:
  • Adds support for different sha algorithms for createrepo call, due to some distro with python 2.4 not supporting sha256.
Location:
devel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r1254 r1276  
    501501oschkcmd deb = /usr/bin/lintian
    502502oschkopt deb =
     503
     504# sha method for yum repo
     505ossha rpm = sha256
     506# RHEL before 6 had python 2.4
     507ossha rhel-2.1 = sha1
     508ossha rhel-3 = sha1
     509ossha rhel-4 = sha1
     510ossha rhel-5 = sha1
     511ossha centos-3 = sha1
     512ossha centos-4 = sha1
     513ossha centos-5 = sha1
     514# Fedora before 11 had python 2.4
     515ossha fedora-6 = sha1
     516ossha fedora-7 = sha1
     517ossha fedora-8 = sha1
     518ossha fedora-9 = sha1
     519ossha fedora-10 = sha1
  • devel/pb-modules/etc/pb.conf.pod

    r1217 r1276  
    223223 Conffile: pb
    224224 Example: osrepo rpm = ftp://ftp.project-builder.org/$ddir/$dver/pb.repo
     225
     226=item B<ossha>
     227
     228 Nature: Optional (Mandatory if rpm type of package)
     229 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
     230 Value: sha algorithm used br createrepo
     231 Conffile: pb
     232 Example: ossha fedora-10 = sha1
    225233
    226234=item B<ossuffix>
  • devel/pb/bin/pb

    r1275 r1276  
    16841684        open(PBS,"> $ENV{'PBBUILDDIR'}/pbscript.$$") || die "Unable to create $ENV{'PBBUILDDIR'}/pbscript.$$";
    16851685        if ($pbos->{'type'} eq "rpm") {
     1686            my $pbsha = pb_distro_get_param($pbos,pb_conf_get("ossha"));
    16861687            # Also make a pbscript to generate yum/urpmi bases
    16871688            print PBS << "EOF";
     
    17041705fi
    17051706# Create repodata
    1706 createrepo .
     1707createrepo -s $pbsha .
    17071708EOF
    17081709            if ($pbos->{'family'} eq "md") {
Note: See TracChangeset for help on using the changeset viewer.