Changeset 203 in ProjectBuilder

Timestamp:

Oct 14, 2007, 7:41:38 PM (17 years ago)

Author:

Bruno Cornec

Message:

use make and not the macro not portable
document Ubuntu 6.06 distribution detection hack
fix some VMs handling pb

Location:

devel

Files:

• pb/bin/pb (modified) (3 diffs)
• pb/contrib/pbsetupqemu (modified) (4 diffs)
• pb/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pbconf/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/bin/pb

@@ -455 +455 @@
     my $dir = shift || "sshdir";
     my $port = shift || "sshport";
-    my $tmout = shift || "120";
+    my $tmout = shift || "vmtmout";
     my $cmd = "";
 
@@ -516 +516 @@
 
     print $LOG "Sources handled ($cmt): $src\n" if ($debug >= 0);
-    my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
+    my ($sshhost,$sshlogin,$sshdir,$sshport,$vmtmout) = pb_conf_get($host,$login,$dir,$port,$tmout);
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
     # Overwrite account value if passed as parameter
@@ -539 +539 @@
 
     $port = $sshport->{$ENV{'PBPROJ'}};
-    my $tm = $tmout->{$ENV{'PBPROJ'}};
+    my $tm = $vmtmout->{$ENV{'PBPROJ'}};
     pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $mac");
     pb_system("cd $ENV{'PBBUILDDIR'} ; scp -p -P $port $src $mac:$tdir 2> /dev/null","$cmt delivery in $tdir on $mac");

devel/pb/contrib/pbsetupqemu

@@ -37 +37 @@
 }
 
+# For root
+mkdir ".ssh",0700;
+system 'cp /tmp/pbkey .ssh/authorized_keys';
+chmod 0600,".ssh/authorized_keys";
+
+# For pb
 chdir "/home/pb";
 mkdir ".ssh",0700;
@@ -57 +63 @@
 chmod 0640,$file;
 
-# Adapt sudoers
-$file="/etc/sudoers";
-$found = 0;
-open(PBFILE,$file) || die "Unable to open $file";
-open(PBOUT,"> $file.new") || die "Unable to open $file.new";
-while (<PBFILE>) {
-    $found = 1 if (/^pb   /);
-    s/Defaults[ \t]+requiretty//;
-    print PBOUT $_;
-}
-close(PBFILE);
-print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
-close(PBOUT);
-rename("$file.new",$file);
-chmod 0440,$file;
-
 unlink "/tmp/pbkey";
 
 my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init(); 
-# Suse wants sudoers as 640
-if (($ddir eq "sles") || ($ddir eq "suse")) {
-    chmod 0640,$file;
-}
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
 
@@ -109 +95 @@
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
-    system "export TERM=linux ; liste=\"\" ; for i in neon newt-devel slang-devel autoconf automake libtool gcc wget gcc-c++ docbook-utils ImageMagick man patch mkisofs sudo perl-DateManip perl-AppConfig perl-File-HomeDir xntp; 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";
+    system "export TERM=linux ; liste=\"\" ; for i in neon newt-devel slang-devel autoconf automake libtool make gcc wget gcc-c++ docbook-utils ImageMagick man patch mkisofs sudo perl-DateManip perl-AppConfig perl-File-HomeDir xntp; 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";
 } elsif ( $dfam eq "md" ) {
     if (( $dver eq "2006.0" ) || ( $dver eq "10.2" )) {
@@ -118 +104 @@
     }
 } elsif ( $dfam eq "du" ) {
-    system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
+    if (( $dver eq "3.1" ) && ($ddir eq "debian")) {
+        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man ssh dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
+    } else {
+        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
+    }
 } elsif ( $dfam eq "gen" ) {
     system "emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs ntp-client";
 } else {
     print "No pkg to install\n";
+}
+
+# Adapt sudoers
+$file="/etc/sudoers";
+$found = 0;
+open(PBFILE,$file) || die "Unable to open $file";
+open(PBOUT,"> $file.new") || die "Unable to open $file.new";
+while (<PBFILE>) {
+    $found = 1 if (/^pb   /);
+    s/Defaults[ \t]+requiretty//;
+    print PBOUT $_;
+}
+close(PBFILE);
+print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
+close(PBOUT);
+rename("$file.new",$file);
+chmod 0440,$file;
+
+# Suse wants sudoers as 640
+if (($ddir eq "sles") || ($ddir eq "suse")) {
+    chmod 0640,$file;
 }
 

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -174 +174 @@
     'opensuse'              => 'openSUSE (\d.+) \(',
     'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
+# Ubuntu 6.06 includes a /etc/debian_version file that needs to be 
+# renamed to /etc/debian_version.sav as there is no way to distinguish
+# Ubuntu 6.06 from debian testing otherwise
     'ubuntu'                => '.*Ubuntu.*\nDISTRIB_RELEASE=(.+)',
 # Not tested

devel/pbconf/project-builder/rpm/project-builder.spec

@@ -35 +35 @@
 %build
 %{__perl} Makefile.PL
-%make
+make
 
 %install
-%{__rm} -rf %{buildroot}
-%makeinstall_std
+make install
 
 %clean