Changeset 620 in ProjectBuilder

Timestamp:

Nov 29, 2008, 7:17:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

• change pb_distro_init interface and add a 6th parameter which is the update CLI to use for that distro.

Location:

devel

Files:

• pb-modules/bin/pbdistrocheck (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (7 diffs)
• pb/bin/pb (modified) (9 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -28 +28 @@
 pb_log_init($pbdebug, $pbLOG);
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
-print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
+my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
+print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n";

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -73 +73 @@
 my $dtype = "unknown";
 my $dsuf = "unknown";
+my $dupd = "unknown";
 
 # If we don't know which distribution we're on, then guess it
@@ -84 +85 @@
     $dtype="deb";
     $dsuf=".$ddir$dver";
+    $dupd="apt-get -y install ";
 } elsif ($ddir =~ /gentoo/) {
     $dfam="gen";
@@ -89 +91 @@
     $dver="nover";
     $dsuf=".$ddir";
+    $dupd="emerge ";
 } elsif ($ddir =~ /slackware/) {
     $dfam="slack";
@@ -101 +104 @@
     $dtype="rpm";
     $dsuf=".$ddir$dver";
+    $dupd="yast2 -y ";
 } elsif (($ddir =~ /redhat/) ||
         ($ddir =~ /rhel/) ||
@@ -110 +114 @@
     my $dver1 = $dver;
     $dver1 =~ s/\.//;
+
+    # By defaut propose yum
+    my $arch=`uname -m`;
+    my $opt = "";
+    chomp($arch);
+    if ($arch eq "x86_64") {
+        $opt="--exclude=*.i?86";
+    }
+    $dupd="yum -y $opt install ";
     if ($ddir =~ /fedora/) {
         $dsuf=".fc$dver1";
     } elsif ($ddir =~ /redhat/) {
         $dsuf=".rh$dver1";
+        $dupd="unknown";
     } elsif ($ddir =~ /vmware/) {
         $dsuf=".vwm$dver1";
+        $dupd="unknown";
     } else {
+        # older versions of rhel and centos ran up2date
+        if (($dver eq "2.1") || ($dver eq "3") || ($dver eq "4")) {
+            $dupd="up2date -y ";
+        }
         $dsuf=".$ddir$dver1";
     }
@@ -134 +153 @@
         $dsuf=".mdv$dver";
     }
+    $dupd="urpmi --auto ";
 } elsif ($ddir =~ /freebsd/) {
     $dfam="bsd";
@@ -142 +162 @@
 } else {
     $dfam="unknown";
-    $dtype="unknown";
-    $dsuf="unknown";
-}
-
-return($ddir, $dver, $dfam, $dtype, $dsuf);
+}
+
+return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd);
 }
 

devel/pb/bin/pb

@@ -587 +587 @@
                 chomp($arch);
                 my ($ddir, $dver, $dfam);
-                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}) = pb_distro_init($name,$ver);
+                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}) = pb_distro_init($name,$ver);
                 pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
@@ -785 +785 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
-    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
+    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
+    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n");
 
     # Get list of packages to build
@@ -1028 +1028 @@
             ($odir,$over,$oarch) = split(/-/,$v);
         }
-        ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over);
+        ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($odir,$over);
         pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
 
@@ -1449 +1449 @@
         my ($name,$ver,$darch) = split(/-/,$v);
         chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
+        my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver);
 
         if ($vetype eq "chroot") {
@@ -1919 +1919 @@
 # We need to have that pb_distro_init function
 # Get it from Project-Builder::Distribution
-my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init(); 
+my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init(); 
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
 
@@ -1939 +1939 @@
 if ( $ddir eq "fedora" ) {
     pb_system("yum clean all","Cleaning yum env");
-    #system "yum update -y";
-    my $arch=`uname -m`;
-    my $opt = "";
-    chomp($arch);
-    if ($arch eq "x86_64") {
-        $opt="--exclude=*.i?86";
-    }
-
     if ($dver == 4) {
-        pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker",$cmtall);
+        pb_system("$pbupd rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker",$cmtall);
         pb_system("$insmb","$cmtmb");
         pb_system("$insfm","$cmtfm");
@@ -1955 +1947 @@
         pb_system("$inslg","$cmtlg");
     } else {
-        pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail",$cmtall);
+        pb_system("$pbupd rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail",$cmtall);
         if ($dver > 9) {
-            pb_system("yum -y $opt install perl-gettext",$cmtall);
+            pb_system("$pbupd perl-gettext",$cmtall);
         } else {
             pb_system("$inslg","$cmtlg");
@@ -1977 +1969 @@
     pb_system("$insfb","$cmtfb");
     pb_system("$insms","$cmtms");
-    pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail ntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi","$cmtall");
+    pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail ntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then $pbupd \$liste ; fi","$cmtall");
 } elsif ( $dfam eq "md" ) {
-        pb_system("urpmi.update -a ; urpmi --auto rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext","$cmtall");
+        pb_system("urpmi.update -a ; $pbupd rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext","$cmtall");
         if (($ddir eq "mandrake") && ($dver eq "10.1")) {
             pb_system("$insdm","$cmtdm");
             pb_system("$inslg","$cmtlg");
         } else {
-            pb_system("urpmi --auto perl-DateManip","$cmtdm");
-            pb_system("urpmi --auto perl-Locale-gettext","$cmtdm");
+            pb_system("$pbupd perl-DateManip","$cmtdm");
+            pb_system("$pbupd perl-Locale-gettext","$cmtdm");
         }
 } elsif ( $dfam eq "du" ) {
@@ -1998 +1990 @@
 } elsif ( $dfam eq "gen" ) {
         #system "emerge -u system";
-        pb_system("emerge wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall");
+        pb_system("$pbudp wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall");
 } else {
     pb_log(0,"No pkg to install\n");