From 4bd58e5f2968a5513b06ab2839f4440718ddff91 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Wed, 3 Apr 2024 20:31:31 -0700 Subject: [PATCH] Whitespace cleanup --- configs/components/dmidecode.rb | 62 +++++++-------- configs/components/rubygem-ffi.rb | 2 +- configs/components/rubygem-gettext.rb | 2 +- configs/components/rubygem-prime.rb | 11 ++- configs/components/rubygem-public_suffix.rb | 2 +- configs/components/rubygem-rgen.rb | 1 - configs/components/runtime-pe-installer.rb | 2 +- configs/components/virt-what.rb | 87 ++++++++++----------- 8 files changed, 82 insertions(+), 87 deletions(-) diff --git a/configs/components/dmidecode.rb b/configs/components/dmidecode.rb index baaf37cbc..e7ba5ee50 100644 --- a/configs/components/dmidecode.rb +++ b/configs/components/dmidecode.rb @@ -1,36 +1,34 @@ component 'dmidecode' do |pkg, settings, platform| - pkg.version '3.3' - pkg.md5sum 'afca949fd71a23dd39c4a3c9cd946dc0' + pkg.version '3.3' + pkg.md5sum 'afca949fd71a23dd39c4a3c9cd946dc0' - pkg.apply_patch 'resources/patches/dmidecode/1117390c.patch' - pkg.apply_patch 'resources/patches/dmidecode/11e134e5.patch' - - pkg.apply_patch 'resources/patches/dmidecode/dmidecode-install-to-bin.patch' - pkg.url "http://download.savannah.gnu.org/releases/dmidecode/dmidecode-#{pkg.get_version}.tar.xz" - pkg.mirror "#{settings[:buildsources_url]}/dmidecode-#{pkg.get_version}.tar.xz" - - pkg.environment "LDFLAGS", settings[:ldflags] - pkg.environment "CFLAGS", settings[:cflags] - - if platform.is_cross_compiled? - # The Makefile doesn't honor environment overrides, so we need to - # edit it directly for cross-compiling - pkg.configure do - ["sed -i \"s|gcc|/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc|g\" Makefile"] - end - end - - pkg.build do - ["#{platform[:make]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"] - end - - pkg.install do - [ - "#{platform[:make]} prefix=#{settings[:prefix]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1) install", - "rm -f #{settings[:bindir]}/vpddecode #{settings[:bindir]}/biosdecode #{settings[:bindir]}/ownership", - "rm -f #{settings[:mandir]}/man8/ownership.8 #{settings[:mandir]}/man8/biosdecode.8 #{settings[:mandir]}/man8/vpddecode.8" - ] + pkg.apply_patch 'resources/patches/dmidecode/1117390c.patch' + pkg.apply_patch 'resources/patches/dmidecode/11e134e5.patch' + + pkg.apply_patch 'resources/patches/dmidecode/dmidecode-install-to-bin.patch' + pkg.url "http://download.savannah.gnu.org/releases/dmidecode/dmidecode-#{pkg.get_version}.tar.xz" + pkg.mirror "#{settings[:buildsources_url]}/dmidecode-#{pkg.get_version}.tar.xz" + + pkg.environment "LDFLAGS", settings[:ldflags] + pkg.environment "CFLAGS", settings[:cflags] + + if platform.is_cross_compiled? + # The Makefile doesn't honor environment overrides, so we need to + # edit it directly for cross-compiling + pkg.configure do + ["sed -i \"s|gcc|/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc|g\" Makefile"] end end - - + + pkg.build do + ["#{platform[:make]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"] + end + + pkg.install do + [ + "#{platform[:make]} prefix=#{settings[:prefix]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1) install", + "rm -f #{settings[:bindir]}/vpddecode #{settings[:bindir]}/biosdecode #{settings[:bindir]}/ownership", + "rm -f #{settings[:mandir]}/man8/ownership.8 #{settings[:mandir]}/man8/biosdecode.8 #{settings[:mandir]}/man8/vpddecode.8" + ] + end +end diff --git a/configs/components/rubygem-ffi.rb b/configs/components/rubygem-ffi.rb index 489ceff11..c3b5f31b3 100644 --- a/configs/components/rubygem-ffi.rb +++ b/configs/components/rubygem-ffi.rb @@ -127,7 +127,7 @@ # move ld back after the gem is installed pkg.install { "mv /usr/bin/ld1 /usr/bin/ld" } - + elsif platform.name =~ /solaris-10-sparc/ sed_exp = 's|CONFIG\["LDFLAGS"\].*|CONFIG["LDFLAGS"] = "-Wl,-rpath-link,/opt/pl-build-tools/sparc-sun-solaris2.10/sysroot/lib:/opt/pl-build-tools/sparc-sun-solaris2.10/sysroot/usr/lib -L. -Wl,-rpath=/opt/puppetlabs/puppet/lib -fstack-protector"|' pkg.configure do diff --git a/configs/components/rubygem-gettext.rb b/configs/components/rubygem-gettext.rb index 8e90177f0..a8cc02753 100644 --- a/configs/components/rubygem-gettext.rb +++ b/configs/components/rubygem-gettext.rb @@ -4,7 +4,7 @@ case version when '3.4.3' - pkg.sha256sum '1b98e1272d0f55a56f519ee86d24e0fcd114b94c9d10b26e72512d65f9174251' + pkg.sha256sum '1b98e1272d0f55a56f519ee86d24e0fcd114b94c9d10b26e72512d65f9174251' when '3.2.2' pkg.sha256sum '9d250bb79273efb4a268977f219d2daca05cdc7473eff40288b8ab8ddd0f51b4' else diff --git a/configs/components/rubygem-prime.rb b/configs/components/rubygem-prime.rb index 6671d6214..12f688b1f 100644 --- a/configs/components/rubygem-prime.rb +++ b/configs/components/rubygem-prime.rb @@ -1,7 +1,6 @@ component 'rubygem-prime' do |pkg, settings, platform| - pkg.version '0.1.2' - pkg.sha256sum 'd4e956cadfaf04de036dc7dc74f95bf6a285a62cc509b28b7a66b245d19fe3a4' - - instance_eval File.read('configs/components/_base-rubygem.rb') - end - \ No newline at end of file + pkg.version '0.1.2' + pkg.sha256sum 'd4e956cadfaf04de036dc7dc74f95bf6a285a62cc509b28b7a66b245d19fe3a4' + + instance_eval File.read('configs/components/_base-rubygem.rb') +end diff --git a/configs/components/rubygem-public_suffix.rb b/configs/components/rubygem-public_suffix.rb index 7ed8dbfbe..e4f838354 100644 --- a/configs/components/rubygem-public_suffix.rb +++ b/configs/components/rubygem-public_suffix.rb @@ -3,4 +3,4 @@ pkg.md5sum '504e45c1f5f7b629e46e4deef7d0f46f' instance_eval File.read('configs/components/_base-rubygem.rb') - end +end diff --git a/configs/components/rubygem-rgen.rb b/configs/components/rubygem-rgen.rb index f60682fd9..9728527a6 100644 --- a/configs/components/rubygem-rgen.rb +++ b/configs/components/rubygem-rgen.rb @@ -4,4 +4,3 @@ instance_eval File.read('configs/components/_base-rubygem.rb') end - diff --git a/configs/components/runtime-pe-installer.rb b/configs/components/runtime-pe-installer.rb index b57cd7f61..a4213029c 100644 --- a/configs/components/runtime-pe-installer.rb +++ b/configs/components/runtime-pe-installer.rb @@ -1,7 +1,7 @@ # This component exists to link in the gcc runtime libraries. component "runtime-pe-installer" do |pkg, settings, platform| pkg.environment "PROJECT_SHORTNAME", "installer" - + if platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/ libbase = platform.architecture =~ /64/ ? 'lib64' : 'lib' libdir = "/opt/pl-build-tools/#{libbase}" diff --git a/configs/components/virt-what.rb b/configs/components/virt-what.rb index 474944f65..8b39c388b 100644 --- a/configs/components/virt-what.rb +++ b/configs/components/virt-what.rb @@ -1,47 +1,46 @@ component "virt-what" do |pkg, settings, platform| - pkg.version "1.22" - pkg.md5sum "0e9923de6a6c6f07bc0ddc3ec8fc1018" - - pkg.url "https://people.redhat.com/~rjones/virt-what/files/virt-what-#{pkg.get_version}.tar.gz" - pkg.mirror "#{settings[:buildsources_url]}/virt-what-#{pkg.get_version}.tar.gz" - - pkg.replaces 'pe-virt-what' - - # Run-time requirements - unless platform.is_deb? - requires "util-linux" - end - - if platform.is_rpm? - pkg.build_requires "util-linux" - end - - if platform.is_linux? - if platform.architecture =~ /ppc64le$/ - host_opt = '--host powerpc64le-unknown-linux-gnu' - elsif platform.architecture =~ /ppc64$/ - host_opt = '--host powerpc64-unknown-linux-gnu' - end - end - - if platform.is_cross_compiled_linux? - host_opt = "--host #{settings[:platform_triple]}" - - pkg.environment "PATH" => "/opt/pl-build-tools/bin:$$PATH:#{settings[:bindir]}" - pkg.environment "CFLAGS" => settings[:cflags] - pkg.environment "LDFLAGS" => settings[:ldflags] - end - - pkg.configure do - ["./configure --prefix=#{settings[:prefix]} --sbindir=#{settings[:prefix]}/bin --libexecdir=#{settings[:prefix]}/lib/virt-what #{host_opt}"] - end - - pkg.build do - ["#{platform[:make]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"] - end - - pkg.install do - ["#{platform[:make]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1) install"] + pkg.version "1.22" + pkg.md5sum "0e9923de6a6c6f07bc0ddc3ec8fc1018" + + pkg.url "https://people.redhat.com/~rjones/virt-what/files/virt-what-#{pkg.get_version}.tar.gz" + pkg.mirror "#{settings[:buildsources_url]}/virt-what-#{pkg.get_version}.tar.gz" + + pkg.replaces 'pe-virt-what' + + # Run-time requirements + unless platform.is_deb? + requires "util-linux" + end + + if platform.is_rpm? + pkg.build_requires "util-linux" + end + + if platform.is_linux? + if platform.architecture =~ /ppc64le$/ + host_opt = '--host powerpc64le-unknown-linux-gnu' + elsif platform.architecture =~ /ppc64$/ + host_opt = '--host powerpc64-unknown-linux-gnu' end end - \ No newline at end of file + + if platform.is_cross_compiled_linux? + host_opt = "--host #{settings[:platform_triple]}" + + pkg.environment "PATH" => "/opt/pl-build-tools/bin:$$PATH:#{settings[:bindir]}" + pkg.environment "CFLAGS" => settings[:cflags] + pkg.environment "LDFLAGS" => settings[:ldflags] + end + + pkg.configure do + ["./configure --prefix=#{settings[:prefix]} --sbindir=#{settings[:prefix]}/bin --libexecdir=#{settings[:prefix]}/lib/virt-what #{host_opt}"] + end + + pkg.build do + ["#{platform[:make]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"] + end + + pkg.install do + ["#{platform[:make]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1) install"] + end +end