summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-30 16:42:30 +0100
committerMichael Stahl <mstahl@redhat.com>2013-10-31 10:42:22 +0100
commit862b9390b4fbfae37d01e06c954dd72eb9a008e1 (patch)
treeef05314b5d0d5b36a3a79245bcb7d2e08a5d0e0d /solenv
parentded43f722664799c8bcd035289f60d37020f3c5d (diff)
setup_native: find all static files in source/packinfo
... and move the OSX specific files there too so we don't need several include paths. Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/control.pm1
-rw-r--r--solenv/bin/modules/installer/environment.pm3
2 files changed, 4 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 6e81431a82fe..573f731246f6 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -271,6 +271,7 @@ sub check_system_environment
LOCAL_OUT
LOCAL_COMMON_OUT
WORKDIR
+ SRCDIR
);
for my $key ( @environmentvariables )
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index c77712503446..124ed584df01 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -70,6 +70,9 @@ sub create_pathvariables
my $filelistpath = $environment->{'WORKDIR'};
$variables{'filelistpath'} = $filelistpath;
+ my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo";
+ $variables{'packinfopath'} = $packinfopath;
+
return \%variables;
}