diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-07 10:36:46 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-07 11:58:18 +0300 |
commit | 129852cede1461480c11d6e5db3385d5ea72e1a0 (patch) | |
tree | 8f2b7aa44d498450402b8f06f064bb94b3183912 /solenv/bin | |
parent | 31cd83043eb3bf89be33a9064e04c080883bd14c (diff) |
Don't deliver build.lst to solver and don't look for it there
Diffstat (limited to 'solenv/bin')
-rwxr-xr-x | solenv/bin/build.pl | 26 | ||||
-rwxr-xr-x | solenv/bin/deliver.pl | 7 |
2 files changed, 0 insertions, 33 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index df779db6fdf9..7d629dac5677 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -479,7 +479,6 @@ sub get_build_list_path { }; }; $dead_parents{$module}++; - $build_list_paths{$module} = correct_path(retrieve_build_list($module)) if (!defined $build_list_paths{$module}); return $build_list_paths{$module}; }; @@ -2029,31 +2028,6 @@ sub get_tmp_dir { return $tmp_dir; }; -sub retrieve_build_list { - my $module = shift; - my $old_fh = select(STDOUT); - - # Try to get global depencies from solver's build.lst if such exists - my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{OUTPATH}"; - $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT}); - $solver_inc_dir .= '/inc'; - $solver_inc_dir .= "/$module"; - $solver_inc_dir = correct_path($solver_inc_dir); - $dead_parents{$module}++; - print "Fetching dependencies for module $module from solver..."; - - my $build_list_candidate = "$solver_inc_dir/build.lst"; - if (-e $build_list_candidate) - { - print " ok\n"; - select($old_fh); - return $build_list_candidate; - }; - print(" failed\n"); - print_error("incomplete dependencies!\n"); - return undef; -}; - sub prepare_build_from_with_branches { my ($full_deps_hash, $reversed_full_deps_hash) = @_; foreach my $prerequisite (keys %$full_deps_hash) { diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index aba400453c0e..20337271070e 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -1003,13 +1003,6 @@ sub push_default_actions push(@action_data, ['mkdir', "%_DEST%/res/img"]); } - # deliver build.lst to $dest/inc/$module - push(@action_data, ['copy', "build.lst %_DEST%/inc/$module/build.lst"]); - if ( $common_build ) { - # ... and to $common_dest/inc/$module - push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc/$module/build.lst"]); - } - # need to copy libstaticmxp.dylib for Mac OS X if ( $^O eq 'darwin' ) { |