Changeset 652

Timestamp:

01/14/09 01:47:26 (4 years ago)

Author:

bruno

Message:

• Improves SuSE 11.1 build
• Improves ntp handling in VMs (depending on distro)
• Removes > version deps type at the end of line also

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (7 diffs)

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

@@ -106 +106 @@
     $dtype="rpm";
     $dsuf=".$ddir$dver";
-    $dupd="export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -y ";
+    $dupd="export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i ";
 } elsif (($ddir =~ /redhat/) ||
         ($ddir =~ /rhel/) ||
@@ -412 +412 @@
     pb_log(2,"found deps: $_\n");
     s/$regexp/$1/;
-    # Remove conditions
-    s/>[=]*.*,//g;
+    # Remove conditions in the middle and at the end
+    s/[><=]+.*,/,/g;
+    s/[><=]+.*$//g;
     # Improve string format (remove , and spaces at start, end and in double
-    s/,//g;
+    s/,/ /g;
     s/^\s*//;
     s/\s*$//;

devel/pb/bin/pb

@@ -1501 +1501 @@
 
 my $vtype = shift;
+my $v = shift;
 
 my ($ntp) = pb_conf_get($vtype."ntp");
@@ -1507 +1508 @@
 
 if (defined $vntp) {
-    $ntpline = "sudo /usr/sbin/ntpdate $vntp";
+    my ($ntpcmd) = pb_conf_get($vtype."ntpcmd");
+    my $vntpcmd;
+    if (defined $ntpcmd->{$v}) {
+        $vntpcmd = $ntpcmd->{$v};
+    } elsif (defined $vntpcmd->{$ENV{'PBPROJ'}}) {
+        $vntpcmd = $ntpcmd->{$ENV{'PBPROJ'}};
+    } else {
+        $vntpcmd = "/bin/true";
+    }
+    $ntpline = "sudo $vntpcmd $vntp";
 } else {
     $ntpline = undef;
@@ -1524 +1534 @@
 my $vtype = shift;
 
-# Prepare the script to be executed on the VM/VE
-# in $ENV{'PBDESTDIR'}/pbscript
-my ($ntpline,$dateline) = pb_date_v($vtype);
-open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
-print SCRIPT "#!/bin/bash\n";
-print SCRIPT "echo ... Execution needed\n";
-print SCRIPT "# This is in directory delivery\n";
-print SCRIPT "# Setup the variables required for building\n";
-print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";
-print SCRIPT "# Preparation for pb\n";
-print SCRIPT "mv .pbrc \$HOME\n";
-print SCRIPT "cd ..\n";
-print SCRIPT "# Time sync\n";
-if (defined $ntpline) {
-    print SCRIPT "if [ -x /usr/sbin/ntpdate ]; then\n";
-    print SCRIPT "  $ntpline\n";
-    print SCRIPT "else\n";
-}
-print SCRIPT "  $dateline\n";
-if (defined $ntpline) {
-    print SCRIPT "fi\n";
-}
-
-# Get list of packages to build and get some ENV vars as well
-my $ptr = pb_get_pkg();
-@pkgs = @$ptr;
-my $p = join(' ',@pkgs) if (@pkgs);
-print SCRIPT "export PBPROJVER=$ENV{'PBPROJVER'}\n";
-print SCRIPT "export PBPROJTAG=$ENV{'PBPROJTAG'}\n";
-print SCRIPT "export PBPACKAGER=\"$ENV{'PBPACKAGER'}\"\n";
-print SCRIPT "# Build\n";
-print SCRIPT "echo Building packages on $vtype...\n";
-
-# Transmit the verbosity level to the virtual env/mach.
-my $verbose = "";
-my $i = 0;                          # minimal debug level
-while ($i lt $pbdebug) {
-    $verbose .= "-v ";
-    $i++;
-}
-# Quiet if asked to be so on the original system
-$verbose = "-q" if ($pbdebug eq -1);
-print SCRIPT "pb $verbose -p $ENV{'PBPROJ'} build2pkg $p\n";
-close(SCRIPT);
-chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";
-
 my ($v,$all) = pb_get_v($vtype);
 
@@ -1578 +1542 @@
 
 foreach my $v (@$v) {
+    # Prepare the script to be executed on the VM/VE
+    # in $ENV{'PBDESTDIR'}/pbscript
+    open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
+    print SCRIPT "#!/bin/bash\n";
+    print SCRIPT "echo ... Execution needed\n";
+    print SCRIPT "# This is in directory delivery\n";
+    print SCRIPT "# Setup the variables required for building\n";
+    print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";
+    print SCRIPT "# Preparation for pb\n";
+    print SCRIPT "mv .pbrc \$HOME\n";
+    print SCRIPT "cd ..\n";
+    
+    # Get list of packages to build and get some ENV vars as well
+    my $ptr = pb_get_pkg();
+    @pkgs = @$ptr;
+    my $p = join(' ',@pkgs) if (@pkgs);
+    print SCRIPT "export PBPROJVER=$ENV{'PBPROJVER'}\n";
+    print SCRIPT "export PBPROJTAG=$ENV{'PBPROJTAG'}\n";
+    print SCRIPT "export PBPACKAGER=\"$ENV{'PBPACKAGER'}\"\n";
+
+    my ($ntpline,$dateline) = pb_date_v($vtype,$v);
+    print SCRIPT "# Time sync\n";
+    if (defined $ntpline) {
+        print SCRIPT "$ntpline\n";
+    } else {
+        print SCRIPT "$dateline\n";
+    }
+
+    # Transmit the verbosity level to the virtual env/mach.
+    my $verbose = "";
+    my $i = 0;                          # minimal debug level
+    while ($i lt $pbdebug) {
+        $verbose .= "-v ";
+        $i++;
+    }
+    # Quiet if asked to be so on the original system
+    $verbose = "-q" if ($pbdebug eq -1);
+
+    print SCRIPT "# Build\n";
+    print SCRIPT "echo Building packages on $vtype...\n";
+    print SCRIPT "pb $verbose -p $ENV{'PBPROJ'} build2pkg $p\n";
+    close(SCRIPT);
+    chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";
+    
     if ($vtype eq "vm") {
         # Launch the VM
@@ -1728 +1736 @@
 my $pbscript = "$ENV{'PBDESTDIR'}/setupv";
 
-# Deal with date sync.
-my ($ntpline,$dateline) = pb_date_v($vtype);
-
 foreach my $v (@$vm) {
+    # Deal with date sync.
+    my ($ntpline,$dateline) = pb_date_v($vtype,$v);
+
     # Name of the account to deal with for VM/VE
     # Do not use the one passed potentially with -a
@@ -1811 +1819 @@
 EOF
         if (defined $ntpline) {
-            print SCRIPT "if ( -x \"/usr/sbin/ntpdate\" ) {\n";
-            print SCRIPT "  system(\"$ntpline\")\n";
-            print SCRIPT "} else {\n";
-        }
-        print SCRIPT "  system(\"$dateline\")\n";
-        if (defined $ntpline) {
-            print SCRIPT "}\n";
+            print SCRIPT "system(\"$ntpline\");\n";
+        } else {
+            print SCRIPT "system(\"$dateline\");\n";
         }
     }
@@ -2018 +2022 @@
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
+    pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"make wget patch sudo ntp"));
     pb_system("$insmb","$cmtmb");
     pb_system("$insfm","$cmtfm");
     pb_system("$insfb","$cmtfb");
-    pb_system("$insms","$cmtms");
-    pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail ntp"));
+    pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"perl-Date-Manip perl-File-HomeDir perl-Mail-Sendmail"));
+    if ($dver < 11) {
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"ntp"));
+    } else {
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"sntp"));
+    }
 } elsif ( $dfam eq "md" ) {
         my $addp = "";