Changeset 158 in ProjectBuilder

Timestamp:

Sep 28, 2007, 12:59:44 AM (18 years ago)

Author:

Bruno Cornec

Message:

Improves pbsetupqemu with pb build + pkg install

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• contrib/pbsetupqemu (modified) (1 diff)

devel/pb/bin/pb

@@ -428 +428 @@
     my $dir = shift || "sshdir";
     my $port = shift || "sshport";
+    my $cmd = "";
 
     # Get list of packages to build
@@ -453 +454 @@
 
         if (($cmt eq "Sources") || ($cmt eq "VMs")) {
-            $src="$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+            $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+            $cmd = "$cmd ; ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
         }
     }
@@ -504 +506 @@
 
     $port = $sshport->{$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\' | bash\"","Preparing $tdir on $mac");
+    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");
     pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");

devel/pb/contrib/pbsetupqemu

@@ -30 +30 @@
 su - pb -c "mkdir -p .ssh ; chmod 700 .ssh ; cp /tmp/pbkey .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys"
 rm -f /tmp/pbkey
+
+# Get and install pb
+if [ -x /usr/bin/yum ]; then
+    yum clean all
+    yum install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-AppConfig
+elif [-x /usr/sbin/urpmi ]; then
+    urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord perl-AppConfig
+elif [-x /usr/bin/apt-get ]; then
+    apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev
+elif [ -x /usr/sbin/emerge ]; then
+    emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs    
+fi
+
+cat > /tmp/pbpatch << EOF
+--- /usr/lib/perl5/vendor_perl/5.8.8/AppConfig/File.pm.orig     2007-08-09 17:44:26.000000000 +0200
++++ /usr/lib/perl5/vendor_perl/5.8.8/AppConfig/File.pm  2007-08-09 18:04:46.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ require 5.005;
+
+-use AppConfig;
++use AppConfig qw(:argcount);
+ use AppConfig::State;
+ use File::HomeDir;
+
+@@ -227,6 +227,11 @@
+
+                my $nargs = $state->_argcount($variable);
+
++               # Fix a bug if the variable is a hash - 1 has been created as a key
++               if ($nargs eq AppConfig::ARGCOUNT_HASH) {
++                       delete $state->{ VARIABLE }->{ $variable }{1};
++               }
++
+                # variables prefixed '-' are reset to their default values
+                if ($flag eq '-') {
+                    $state->_default($variable);
+EOF
+
+# Patch AppConfig 
+grep -q 'Fix a bug if the variable is a hash' /usr/lib/perl5/vendor_perl/*/AppConfig/File.pm
+if [ $? -ne 0 ]; then
+    cd /usr/lib/perl5/vendor_perl/*/AppConfig
+    patch -s -p1 < /tmp/pbpatch
+    if [ $? -eq 0 ]; then
+        rm -f /tmp/pbpatch
+    fi
+fi
+
+rm -rf project-builder-*
+wget ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz
+tar xvfz project-builder-latest.tar.gz
+cd project-builder-*
+perl Makefile.PL
+make
+make install