Changeset 721 in ProjectBuilder

Timestamp:

Mar 6, 2009, 6:09:05 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds support for pre and post scripts for VM/VE launched before and after the build to allow for local setup.
• Adds additional repo support for debian type as well.
• Fix a bug around architecture compatibility check.
• Transmit verbosity level
• Adds support for proxy environment variables at setup and build time
• Do not reinstall a repo which was already there (except for urpmi)

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

@@ -514 +514 @@
     if ($dtype eq "rpm") {
         if ($bn =~ /\.rpm$/) {
-        pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repostory");
-    } elsif ($bn =~ /\.repo$/) {
+            my $pn = $bn;
+            $pn =~ s/\.rpm//;
+            if (pb_system("rpm -q --quiet $pn","","quiet") != 0) {
+                pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repository");
+            }
+        } elsif ($bn =~ /\.repo$/) {
             # Yum repo
-            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/yum.repo.d","Adding yum repository");
+            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/yum.repos.d","Adding yum repository") if (not -f "/etc/yum.repos.d/$bn");
         } elsif ($bn =~ /\.addmedia/) {
             # URPMI repo
+            # We should test that it's not already a urpmi repo
             pb_system("chmod 755 $ENV{'PBTMP'}/$bn ; sudo $ENV{'PBTMP'}/$bn 2>&1 > /dev/null","Adding urpmi repository");
         } else {
@@ -525 +530 @@
         }
     } elsif ($dtype eq "deb") {
-        if ($bn =~ /\.sources.list$/) {
+        if (($bn =~ /\.sources.list$/) && (not -f "/etc/apt/sources.list.d/$bn")) {
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
             pb_system("sudo apt-get update","Updating apt repository");

devel/pb/bin/pb

@@ -745 +745 @@
         }
 
+        # Do we have additional script to run to prepare the environement for the project ? 
+        # Then include it in the pbconf delivery
+        foreach my $pbvf ("pbvebuild.pre","pbvmbuild.pre","pbvebuild.post","pbvmbuild.post") {
+            if (-x "$ENV{'PBROOTDIR'}/$pbvf") {
+                pb_filter_file("$ENV{'PBROOTDIR'}/$pbvf",$ptr,"$ENV{'PBDESTDIR'}/$pbvf",\%pb);
+                chmod 0755,"$ENV{'PBDESTDIR'}/$pbvf";
+            }
+        }
+
         # Archive dest dir
         chdir "$ENV{'PBDESTDIR'}" || die "Unable to change dir to $ENV{'PBDESTDIR'}";
@@ -872 +881 @@
             chmod 0755,"debian/rules";
 
+            my $darch = pb_get_arch();
+            pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
             pb_distro_installdeps("debian/control",$dtype,$pbupd);
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
@@ -1515 +1526 @@
             # Architecture consistency
             if ($arch ne $darch) {
-                die "Unable to launch a VE of architecture $darch on a $arch platform" if (not (($darch eq "x86_64") && ($arch =~ /i?86/)));
+                die "Unable to launch a VE of architecture $darch on a $arch platform" if (($darch eq "x86_64") && ($arch =~ /i?86/));
             }
 
@@ -1621 +1632 @@
     open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
     print SCRIPT "#!/bin/bash\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++;
+    }
+    # Activate script verbosity if at least 2 for pbdebug
+    print SCRIPT "set -x\n" if ($i gt 1);
+    # Quiet if asked to be so on the original system
+    $verbose = "-q" if ($pbdebug eq -1);
+
     print SCRIPT "echo ... Execution needed\n";
     print SCRIPT "# This is in directory delivery\n";
@@ -1649 +1673 @@
         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);
+    # Use potential local proxy declaration in case we need it to download repo, pkgs, ...
+    if (defined $ENV{'http_proxy'}) {
+        print SCRIPT "export http_proxy=\"$ENV{'http_proxy'}\"\n";
+    }
+
+    if (defined $ENV{'ftp_proxy'}) {
+        print SCRIPT "export ftp_proxy=\"$ENV{'ftp_proxy'}\"\n";
+    }
+
+
+    # We may need to do some other tasks before building. Read a script here to finish setup
+    if (-x "$ENV{'PBDESTDIR'}/pb$vtype"."build.pre") {
+        print SCRIPT "# Special pre-build instructions to be launched\n";
+        print SCRIPT pb_get_content("$ENV{'PBDESTDIR'}/pb$vtype"."build.pre");
+    }
 
     print SCRIPT "# Build\n";
@@ -1666 +1695 @@
         print SCRIPT "sudo umount /proc\n";
     }
+
+    # We may need to do some other tasks after building. Read a script here to exit properly
+    if (-x "$ENV{'PBDESTDIR'}/pb$vtype"."build.post") {
+        print SCRIPT "# Special post-build instructions to be launched\n";
+        print SCRIPT pb_get_content("$ENV{'PBDESTDIR'}/pb$vtype"."build.post");
+    }
+
     close(SCRIPT);
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";
@@ -2122 +2158 @@
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
 
+# We may need a proxy configuration. Get it from the local env
+EOF
+
+if (defined $ENV{'http_proxy'}) {
+    print SCRIPT "\$ENV\{'http_proxy'\}=\"$ENV{'http_proxy'}\";\n";
+}
+
+if (defined $ENV{'ftp_proxy'}) {
+    print SCRIPT "\$ENV\{'ftp_proxy'\}=\"$ENV{'ftp_proxy'}\";\n";
+}
+
+print {$SCRIPT} << 'EOF';
 # Get and install pb
 my $insdm = "rm -rf Date-Manip* ; wget http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz ; tar xvfz Date-Manip-5.54.tar.gz ; cd Date-Manip* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf Date-Manip*";