Skip to content

[AIX] improve build support #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
truthbk wants to merge 7 commits into
base: datadog-5.5.0
Choose a base branch
from
Open

[AIX] improve build support #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f036e21
[aix] update_config_guess should use a different build dir (not tmp)
truthbk Nov 28, 2018
24e5e19
[bff] add support for extra_package_files
truthbk Feb 1, 2019
97a01b0
[packager] allow overriding the staging dir
truthbk Mar 20, 2019
bd0d6ea
[aix] fix broken healthcheck
truthbk Apr 25, 2019
7e65042
Merge branch 'datadog-5.5.0' into datadog-5.5.0-aix
truthbk Sep 13, 2019
7293cbd
[health] fix AIX shared lib iteration
truthbk Sep 13, 2019
91cf07c
Merge remote-tracking branch 'origin/datadog-5.5.0' into datadog-5.5.…
albertvaka Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/omnibus/builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ def sync(source, destination, options = {})
# Default: [:config_guess, :config_sub]
def update_config_guess(target: ".", install: [:config_guess, :config_sub])
build_commands << BuildCommand.new("update_config_guess `target: #{target} install: #{install.inspect}'") do
config_guess_dir = "/tmp/build/embedded/lib/config_guess"
config_guess_dir = "#{install_dir}/embedded/lib/config_guess"
%w{config.guess config.sub}.each do |c|
unless File.exist?(File.join(config_guess_dir, c))
raise "Can not find #{c}. Make sure you add a dependency on 'config_guess' in your software definition"
Expand Down
3 changes: 2 additions & 1 deletion lib/omnibus/health_check.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,8 @@ def health_check_aix
current_library = nil
bad_libs = {}

yield_shellout_results("find #{project.install_dir}/ -type f | xargs file | grep \"RISC System\" | awk -F: '{print $1}' | xargs -n 1 ldd") do |line|
# Executables, .so, .a and .o
yield_shellout_results("find #{project.install_dir}/ -type f -perm -u=x -o -perm -g=x -o -name \"*.so*\" -o -name \"*.a\" -o -name \"*.o\" | xargs file | grep -E \"RISC System|XCOFF\" | awk -F: '{print $1}' | xargs -n 1 ldd") do |line|
Copy link

@KSerrania KSerrania Sep 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll trust you on this one 😄

case line
when /^(.+) needs:$/
current_library = Regexp.last_match[1]
Expand Down
2 changes: 1 addition & 1 deletion lib/omnibus/packagers/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def package_path
# @return [String]
#
def staging_dir
@staging_dir ||= Dir.mktmpdir(project.package_name)
@staging_dir ||= Dir.mktmpdir(project.package_name, ENV['OMNIBUS_STAGING_DIR'])
Copy link

@KSerrania KSerrania Oct 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious: why is this needed in particular for AIX?

end

#
Expand Down
21 changes: 21 additions & 0 deletions lib/omnibus/packagers/bff.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,27 @@ class Packager::BFF < Packager::Base
destination = File.join(staging_dir, project.install_dir)
FileSyncer.sync(project.install_dir, destination, exclude: exclusions)

# Copy over any user-specified extra package files.
#
# Files retain their relative paths inside the scratch directory, so
# we need to grab the dirname of the file, create that directory, and
# then copy the file into that directory.
#
# extra_package_file '/path/to/foo.txt' #=> /tmp/BUILD/path/to/foo.txt
project.extra_package_files.each do |file|
parent = File.dirname(file)

if File.directory?(file)
destination = File.join("#{staging_dir}", file)
create_directory(destination)
FileSyncer.sync(file, destination)
else
destination = File.join("#{staging_dir}", parent)
create_directory(destination)
copy_file(file, destination)
end
end

# Create the scripts staging directory
create_directory(scripts_staging_dir)
end
Expand Down