Changeset 163 in ProjectBuilder

Timestamp:

Sep 30, 2007, 11:57:47 AM (17 years ago)

Author:

Bruno Cornec

Message:

Sets date in the VM to avoid build problem with configure
Improve the example script for VM

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -636 +636 @@
     print SCRIPT "cd ..\n";
     print SCRIPT "export PBROOT=\`pwd\`\n";
+    print SCRIPT "#Sync date\n";
+    my $syncdate = strftime("%m%d%H%M", @date);
+    print SCRIPT "sudo date $syncdate\n";
     print SCRIPT "# Build\n";
     my $p = "";

devel/pb/contrib/pbsetupqemu

@@ -4 +4 @@
 # missing pb account on the QEMU VM, and adds it to sudo
 # 
-# Needs to use rrot account to connect to the VM
+# Needs to use root account to connect to the VM
 
 # You need to specify here your local public SSH key used to access
@@ -19 +19 @@
         mkdir /home
     fi
-    su - -c "useradd pb"
+    useradd pb
 fi
 
@@ -37 +37 @@
 if [ -x /usr/bin/yum ]; then
     yum clean all
-    yum -y 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 perl-DateManip
+    # FC6
+    #yum -y 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 perl-DateManip
+    # FC4
+    yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip
+    rm -rf AppConfig-*
+    wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz
+    tar xvfz AppConfig-1.66.tar.gz
+    cd AppConfig*
+    perl Makefile.PL
+    make
+    make install
+    cd ..
 elif [ -x /usr/sbin/urpmi ]; then
     urpmi --auto-select 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 perl-DateManip
@@ -48 +59 @@
 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;
- 
+cat > /tmp/pbpatch << 'EOF'
+--- File.pm     2007-09-29 14:55:28.000000000 +0100
++++ File.pm.new 2007-09-29 14:55:44.000000000 +0100
+@@ -15,7 +15,7 @@
+ package AppConfig::File;
+ use strict;
+ use warnings;
 -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};
-+       }
+ our $VERSION = '1.65';
+
+@@ -208,6 +208,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);
+                 # 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
+file=`find /usr/lib/perl5 -type f -name File.pm | grep AppConfig/File.pm`
+grep -q 'Fix a bug if the variable is a hash' $file
 if [ $? -ne 0 ]; then
-    (cd /usr/lib/perl5/vendor_perl/*/AppConfig ; patch -s -p0 < /tmp/pbpatch)
+    (cd `dirname $file` ; patch -s -p0 < /tmp/pbpatch)
     if [ $? -eq 0 ]; then
         rm -f /tmp/pbpatch
@@ -91 +103 @@
 make
 make install
+cd ..