Skip to content

Commit

Permalink
(PA-6002) Add sles11-x86_64 platform definition to pxp-agent-vanagon-7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
amitkarsale committed Feb 13, 2024
1 parent 8c973cd commit f1d6770
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 7 deletions.
2 changes: 1 addition & 1 deletion configs/components/cpp-hocon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

cmake = 'C:/ProgramData/chocolatey/bin/cmake.exe -G "MinGW Makefiles"'
toolchain = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/ ||
elsif platform.name =~ /el-[67]|redhatfips-7|sles-1[12]|ubuntu-18.04-amd64/ ||
platform.is_aix?
toolchain = '-DCMAKE_TOOLCHAIN_FILE=/opt/pl-build-tools/pl-build-toolchain.cmake'
cmake = '/opt/pl-build-tools/bin/cmake'
Expand Down
2 changes: 1 addition & 1 deletion configs/components/cpp-pcp-client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

cmake = 'C:/ProgramData/chocolatey/bin/cmake.exe -G "MinGW Makefiles"'
toolchain = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
elsif platform.name =~ /el-[67]|redhatfips-7|sles-1[12]|ubuntu-18.04-amd64/
# use default that is pl-build-tools
else
# These platforms use the default OS toolchain, rather than pl-build-tools
Expand Down
4 changes: 2 additions & 2 deletions configs/components/leatherman.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
elsif platform.is_windows?
pkg.build_requires 'cmake'
pkg.build_requires "pl-gettext-#{platform.architecture}"
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
elsif platform.name =~ /el-[67]|redhatfips-7|sles-1[12]|ubuntu-18.04-amd64/
pkg.build_requires 'pl-cmake'
pkg.build_requires 'pl-gettext'
pkg.build_requires 'runtime'
Expand Down Expand Up @@ -77,7 +77,7 @@

# Use environment variable set in environment.bat to find locale files
leatherman_locale_var = "-DLEATHERMAN_LOCALE_VAR='PUPPET_DIR' -DLEATHERMAN_LOCALE_INSTALL='share/locale'"
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/ ||
elsif platform.name =~ /el-[67]|redhatfips-7|sles-1[12]|ubuntu-18.04-amd64/ ||
platform.is_aix?
toolchain = '-DCMAKE_TOOLCHAIN_FILE=/opt/pl-build-tools/pl-build-toolchain.cmake'
cmake = '/opt/pl-build-tools/bin/cmake'
Expand Down
2 changes: 1 addition & 1 deletion configs/components/pxp-agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
toolchain = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
special_flags += ' -DDYNAMICBASE=OFF' if platform.name =~ /windowsfips-2012r2/

elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
elsif platform.name =~ /el-[67]|redhatfips-7|sles-1[12]|ubuntu-18.04-amd64/
# use default that is pl-build-tools
else
# These platforms use the default OS toolchain, rather than pl-build-tools
Expand Down
2 changes: 1 addition & 1 deletion configs/components/runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
pkg.build_requires "pl-iconv-#{platform.architecture}"
pkg.build_requires "pl-libffi-#{platform.architecture}"
pkg.build_requires "pl-pdcurses-#{platform.architecture}"
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
elsif platform.name =~ /el-[67]|redhatfips-7|sles-1[12]|ubuntu-18.04-amd64/
pkg.build_requires 'pl-gcc'
end
end
15 changes: 15 additions & 0 deletions configs/platforms/sles-11-x86_64.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
platform "sles-11-x86_64" do |plat|
plat.servicedir "/etc/init.d"
plat.defaultdir "/etc/sysconfig"
plat.servicetype "sysv"
plat.add_build_repository "http://osmirror.delivery.puppetlabs.net/sles-11-deps-x86_64/sles-11-deps-x86_64.repo"
plat.add_build_repository "http://pl-build-tools.delivery.puppetlabs.net/yum/sles/11/x86_64/pl-build-tools-sles-11-x86_64.repo"
packages = %w[
aaa_base autoconf automake libbz2-devel make pkgconfig pl-cmake readline-devel rsync zlib-devel
]
plat.provision_with("zypper -n --no-gpg-checks install -y #{packages.join(' ')}")
plat.provision_with "zypper install -y --oldpackage pl-gcc=4.8.2-1"
plat.provision_with "zypper install -y --oldpackage pl-cmake-3.2.3-13.sles11.x86_64"
plat.install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
plat.vmpooler_template "sles-11-x86_64"
end
2 changes: 1 addition & 1 deletion configs/projects/pxp-agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
proj.setting(:service_conf, File.join(proj.install_root, 'service_conf'))

proj.component 'puppet-runtime'
proj.component 'runtime' if platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/ || !platform.is_linux?
proj.component 'runtime' if platform.name =~ /el-[67]|redhatfips-7|sles-1[12]|ubuntu-18.04-amd64/ || !platform.is_linux?

proj.component 'leatherman'
proj.component 'cpp-hocon'
Expand Down

0 comments on commit f1d6770

Please sign in to comment.