From 36b23fdd9419619bacd07311b10c34640836c044 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 12 Mar 2018 20:41:03 +0100
Subject: solenv: LAST_MINOR is effectively dead

Change-Id: I07d90c68934712295952e6e6725e0206c16a5b7e
---
 solenv/bin/modules/installer/environment.pm |  2 --
 solenv/bin/modules/installer/globals.pm     |  1 -
 solenv/bin/modules/installer/scriptitems.pm |  1 -
 solenv/bin/modules/installer/ziplist.pm     | 10 ++--------
 solenv/bin/ooinstall                        |  1 -
 5 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'solenv/bin')

diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 38448a8ba9fb..05dfdbfb6787 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -108,8 +108,6 @@ sub set_global_environment_variables
     $installer::globals::cpuname = $environment->{'CPUNAME'};
     $installer::globals::platformid = $environment->{'PLATFORMID'};
 
-    if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
-
     if ( $ENV{'ENABLE_DBGUTIL'} ) {} else { $installer::globals::pro = 1; }
 
     if ( $ENV{'VERBOSE'} && ( (lc $ENV{'VERBOSE'}) eq "false" ) ) { $installer::globals::quiet = 1; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 2cd0cc21062c..c681b05a6d0b 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -38,7 +38,6 @@ BEGIN
     @languageproducts = ();
     $build = "";
     $minor = "";
-    $lastminor = "";
     $os = "";
     $cpuname = "";
     $com = "";
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index bd4437d315de..267ae20cdcfa 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -640,7 +640,6 @@ sub replace_setup_variables
 
     my $localminor = "flat";
     if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
-    else { $localminor = $installer::globals::lastminor; }
 
     my $localbuild = $installer::globals::build;
 
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 638d6716dd95..2d80061dd419 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -768,17 +768,12 @@ sub replace_variables_in_ziplist_variables
 {
     my ($blockref) = @_;
 
-    my $milestonevariable = $installer::globals::lastminor;
-    $milestonevariable =~ s/m//;
-    $milestonevariable =~ s/s/\./;
-
-    my $localminor = $installer::globals::lastminor;
+    my $localminor = "";
     if ( $installer::globals::minor ) { $localminor = $installer::globals::minor; }
 
     for ( my $i = 0; $i <= $#{$blockref}; $i++ )
     {
-        if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; }
-        else { ${$blockref}[$i] =~ s/\{milestone\}//; }
+        ${$blockref}[$i] =~ s/\{milestone\}//;
         if ( $localminor ) { ${$blockref}[$i] =~ s/\{minor\}/$localminor/; }
         else { ${$blockref}[$i] =~ s/\{minor\}//; }
         if ( $installer::globals::buildid ) { ${$blockref}[$i] =~ s/\{buildid\}/$installer::globals::buildid/; }
@@ -833,7 +828,6 @@ sub add_variables_to_allvariableshashref
 
     my $localminor = "";
     if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
-    else { $localminor = $installer::globals::lastminor; }
     if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
     $variableshashref->{'PRODUCTMINOR'} = $localminor;
 
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 83507a7bf647..aca6b01ae11d 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -56,7 +56,6 @@ if ($help) {
 }
 
 my $BUILD=$ENV{LIBO_VERSION_PATCH};
-$ENV{LAST_MINOR} = 'm0';
 $ENV{OUT} = "../FIXME";
 $ENV{LOCAL_OUT} = $ENV{OUT};
 $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
-- 
cgit v1.2.3