Changeset 1276 in ProjectBuilder

Timestamp:

Mar 22, 2011, 1:15:29 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds support for different sha algorithms for createrepo call, due to some distro with python 2.4 not supporting sha256.

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (2 diffs)

devel/pb-modules/etc/pb.conf

@@ -501 +501 @@
 oschkcmd deb = /usr/bin/lintian
 oschkopt deb = 
+
+# sha method for yum repo
+ossha rpm = sha256
+# RHEL before 6 had python 2.4
+ossha rhel-2.1 = sha1
+ossha rhel-3 = sha1
+ossha rhel-4 = sha1
+ossha rhel-5 = sha1
+ossha centos-3 = sha1
+ossha centos-4 = sha1
+ossha centos-5 = sha1
+# Fedora before 11 had python 2.4
+ossha fedora-6 = sha1
+ossha fedora-7 = sha1
+ossha fedora-8 = sha1
+ossha fedora-9 = sha1
+ossha fedora-10 = sha1

devel/pb-modules/etc/pb.conf.pod

@@ -223 +223 @@
  Conffile: pb
  Example: osrepo rpm = ftp://ftp.project-builder.org/$ddir/$dver/pb.repo
+
+=item B<ossha>
+
+ Nature: Optional (Mandatory if rpm type of package)
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: sha algorithm used br createrepo
+ Conffile: pb
+ Example: ossha fedora-10 = sha1
 
 =item B<ossuffix>

devel/pb/bin/pb

@@ -1684 +1684 @@
         open(PBS,"> $ENV{'PBBUILDDIR'}/pbscript.$$") || die "Unable to create $ENV{'PBBUILDDIR'}/pbscript.$$";
         if ($pbos->{'type'} eq "rpm") {
+            my $pbsha = pb_distro_get_param($pbos,pb_conf_get("ossha"));
             # Also make a pbscript to generate yum/urpmi bases
             print PBS << "EOF";
@@ -1704 +1705 @@
 fi
 # Create repodata
-createrepo .
+createrepo -s $pbsha .
 EOF
             if ($pbos->{'family'} eq "md") {