Changeset 220 in ProjectBuilder

Timestamp:

Oct 15, 2007, 2:13:20 PM (17 years ago)

Author:

Bruno Cornec

Message:

• date done with sudo in the VM before running pb to avoid time issues
• Really no macro in spec file for other rpm distro than Mandriva

Location:

devel

Files:

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

devel/pb/bin/pb

@@ -124 +124 @@
     pb_build2pkg();
 } elsif ($action =~ /^build2ssh$/) {
+    pb_build2ssh();
+} elsif ($action =~ /^cms2ssh$/) {
+    pb_cms2build();
     pb_build2ssh();
 } elsif ($action =~ /^pkg2ssh$/) {
@@ -658 +661 @@
     # Prepare the script to be executed on the VM
     # in $ENV{'PBDESTDIR'}/pbscript
+    my ($ntp) = pb_conf_get("vmntp");
+    my $vmntp = $ntp->{$ENV{'PBPROJ'}};
     open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
     print SCRIPT "#!/bin/bash\n";
@@ -669 +674 @@
     print SCRIPT "mv .pbrc \$HOME\n";
     print SCRIPT "cd ..\n";
+    my $upddate = strftime("%m%d%H%M%Y", @date);
+    print SCRIPT "echo Setting up date on $vmntp...\n";
+    print SCRIPT "sudo date $upddate\n";
     print SCRIPT "export PBROOT=\`pwd\`\n";
     print SCRIPT "# Build\n";
@@ -850 +858 @@
     print "\tbuild2ssh: Send the tar files to a SSH host               \n";
     print "\n";
+    print "\tcms2ssh:   cms2build + build2ssh\n";
+    print "\n";
     print "\tpkg2ssh:   Send the packages built to a SSH host          \n";
     print "\n";

devel/pb/contrib/pbsetupqemu

@@ -110 +110 @@
     }
 } 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";
+    system "emerge -u system ; emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi ntp";
 } else {
     print "No pkg to install\n";

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

@@ -38 +38 @@
 
 %install
-%makeinstall_std
+export DESTDIR=${RPM_BUILD_ROOT}
+make install
 
 %clean