Commit fc76e9bc authored by Ed Reel's avatar Ed Reel Committed by GitHub

Execute preflight only for build, install and reinstall (#5528)

parent fbf9eb34
...@@ -757,7 +757,6 @@ end ...@@ -757,7 +757,6 @@ end
def resolve_dependencies def resolve_dependencies
abort "Package #{@pkg.name} is not compatible with your device architecture (#{ARCH}) :/".lightred unless @pkg.compatibility.include?('all') or @pkg.compatibility.include?(ARCH) abort "Package #{@pkg.name} is not compatible with your device architecture (#{ARCH}) :/".lightred unless @pkg.compatibility.include?('all') or @pkg.compatibility.include?(ARCH)
@pkg.preflight
expand_dependencies expand_dependencies
# leave only not installed packages in dependencies # leave only not installed packages in dependencies
...@@ -980,6 +979,7 @@ def build_command (args) ...@@ -980,6 +979,7 @@ def build_command (args)
@pkgName = name @pkgName = name
search @pkgName search @pkgName
print_current_package @opt_verbose print_current_package @opt_verbose
@pkg.preflight
resolve_dependencies_and_build resolve_dependencies_and_build
end end
end end
...@@ -1027,6 +1027,7 @@ def install_command (args) ...@@ -1027,6 +1027,7 @@ def install_command (args)
search @pkgName search @pkgName
print_current_package true print_current_package true
@pkg.build_from_source = true if @opt_src or @opt_recursive @pkg.build_from_source = true if @opt_src or @opt_recursive
@pkg.preflight
resolve_dependencies_and_install resolve_dependencies_and_install
end end
end end
...@@ -1063,6 +1064,7 @@ def reinstall_command (args) ...@@ -1063,6 +1064,7 @@ def reinstall_command (args)
@pkg.build_from_source = true if @opt_src or @opt_recursive @pkg.build_from_source = true if @opt_src or @opt_recursive
if @pkgName if @pkgName
@pkg.in_upgrade = true @pkg.in_upgrade = true
@pkg.preflight
resolve_dependencies_and_install resolve_dependencies_and_install
@pkg.in_upgrade = false @pkg.in_upgrade = false
end end
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.7.18' CREW_VERSION = '1.7.19'
ARCH_ACTUAL = `uname -m`.strip ARCH_ACTUAL = `uname -m`.strip
# This helps with virtualized builds on aarch64 machines # This helps with virtualized builds on aarch64 machines
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment