Changeset 37800

Timestamp:

2023-07-03T16:38:58+12:00 (11 months ago)

Author:

anupama

Message:

Running gen-release.sh on the 32 bit VM failed because it wrongly worked out that the OS was 64 bit and wrote 64 bit as true into the rk3-build.properties file for a release (for some reason uname -m returned i86_64 on the 32 bit VM also). I've added in an additional test that is dependent on pre-existing Environment variable settings that get set in snapshot/environment.pl when bitness value is 32. For 32 bit VMs, environment.pl is required to set the bitness value to 32 explicitly and then exports env vars based on that. One such env var is tested now in lib.pl to ensure the linux OS is indeed 32 bit.

File:

• other-projects/nightly-tasks/snapshot/trunk/lib.pl (modified) (1 diff)

other-projects/nightly-tasks/snapshot/trunk/lib.pl

@@ -100 +100 @@
         }
     } elsif ( $^O eq "linux" ) {
-        if(`uname -m` =~ m/64$/) {
-            print "Setting linux architecture to 64 bit";
-            `echo x64:true>> $rk-build.properties`;
-        }       
+        # Running "uname -m" on new 32 bit VM returns "i86_64" too
+        # So to properly test for 32 bit, ensure that environment.pl
+        # didn't set $ENV{'GS_OPENSSL_HOST'} to "linux-generic32"
+        if(`uname -m` =~ m/64$/) {
+        if(! exists $ENV{'GS_OPENSSL_HOST'} || $ENV{'GS_OPENSSL_HOST'} ne "linux-generic32") {
+            print "Setting linux architecture to 64 bit";
+            `echo x64:true>> $rk-build.properties`;
+        }
+        }
     }