Changeset 1322 in ProjectBuilder

Timestamp:

Jun 27, 2011, 2:38:13 AM (13 years ago)

Author:

Bruno Cornec

Message:

• pb now supports distro inhritance for the vmmem parameter (Makes stuff easier for fedora)

Files:

• devel/pb/bin/pb (modified) (2 diffs)
• projects/qemu/.pbrc (modified) (1 diff)

devel/pb/bin/pb

@@ -2089 +2089 @@
         # TODO: vmmonport should be optional
         my ($ptr,$ptr2,$vmpath,$vmport,$vms,$vmmonport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize","vmmonport");
-        my ($vmopt,$vmmem,$vmtmout,$vmsnap,$vmbuildtm) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm");
+        my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm");
         my $vmsize = pb_distro_get_param($pbos,$vms);
 
@@ -2116 +2116 @@
 
         # How much memory to allocate for VMs
-        if (defined $vmmem->{$v}) {
-            $ENV{'PBVMOPT'} .= " -m $vmmem->{$v}";
-        } elsif (defined $vmmem->{$ENV{'PBPROJ'}}) {
-            $ENV{'PBVMOPT'} .= " -m $vmmem->{$ENV{'PBPROJ'}}";
+        my $vmmem = pb_distro_get_param($pbos,$vmmm);
+        if (defined $vmmem) {
+            $ENV{'PBVMOPT'} .= " -m $vmmem";
         }
 

projects/qemu/.pbrc

@@ -42 +42 @@
 vmmem mandriva-2009.0 = 1024
 vmopt fedora-12 = -daemonize 
-vmmem fedora-12 = 1024
+vmmem fedora-5 = 384
+vmmem fedora-6 = 384
+vmmem fedora-7 = 384
+vmmem fedora-8 = 384
+vmmem fedora-9 = 384
+vmmem fedora-10 = 384
+vmmem fedora-11 = 384
+vmmem fedora = 1024
 #-no-kvm
 # The std driver is buggy giving an empty MAC address so use e1000