Skip to content

Commit

Permalink
(PA-6001) Add sles11 platform to pxp-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
amitkarsale committed Mar 11, 2024
1 parent 58f5de5 commit 14109a8
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configs/components/cpp-hocon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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/
toolchain = '-DCMAKE_TOOLCHAIN_FILE=/opt/pl-build-tools/pl-build-toolchain.cmake'
cmake = '/opt/pl-build-tools/bin/cmake'
elsif platform.is_aix?
Expand Down
3 changes: 3 additions & 0 deletions configs/components/cpp-pcp-client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@

cmake = 'C:/ProgramData/chocolatey/bin/cmake.exe -G "MinGW Makefiles"'
toolchain = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
elsif platform.name == 'sles-11-x86_64'
cmake = 'env LD_LIBRARY_PATH=/opt/pl-build-tools/lib64 /opt/pl-build-tools/bin/cmake'
special_flags = " -DCMAKE_CXX_FLAGS='-Wno-error=implicit-fallthrough -Wno-error=catch-value' "
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
# use default that is pl-build-tools
else
Expand Down
10 changes: 9 additions & 1 deletion configs/components/leatherman.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
elsif platform.is_windows?
pkg.build_requires 'cmake'
pkg.build_requires "pl-gettext-#{platform.architecture}"
elsif platform.name == 'sles-11-x86_64'
pkg.build_requires 'pl-cmake'
pkg.build_requires 'pl-gettext'
pkg.build_requires 'runtime'
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
pkg.build_requires 'pl-cmake'
pkg.build_requires 'pl-gettext'
Expand Down Expand Up @@ -90,6 +94,10 @@

# 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 == 'sles-11-x86_64'
cmake = 'env LD_LIBRARY_PATH=/opt/pl-build-tools/lib64 /opt/pl-build-tools/bin/cmake'
toolchain = '-DCMAKE_TOOLCHAIN_FILE=/opt/pl-build-tools/pl-build-toolchain.cmake'
special_flags += " -DCMAKE_CXX_FLAGS='-Wno-deprecated-declarations -Wno-error=class-memaccess -Wno-error=ignored-qualifiers -Wno-error=catch-value' "
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
toolchain = '-DCMAKE_TOOLCHAIN_FILE=/opt/pl-build-tools/pl-build-toolchain.cmake'
cmake = '/opt/pl-build-tools/bin/cmake'
Expand Down Expand Up @@ -150,7 +158,7 @@

pkg.check do
["LEATHERMAN_RUBY=#{settings[:libdir]}/$(shell #{ruby} -e 'print RbConfig::CONFIG[\"LIBRUBY_SO\"]') \
LD_LIBRARY_PATH=#{settings[:libdir]} LIBPATH=#{settings[:libdir]} #{test_locale} #{make} test ARGS=-V"]
LD_LIBRARY_PATH=/opt/pl-build-tools/lib64 LIBPATH=#{settings[:libdir]} #{test_locale} #{make} test ARGS=-V"]
end
end

Expand Down
2 changes: 2 additions & 0 deletions configs/components/pxp-agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@

elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
# use default that is pl-build-tools
elsif platform.name =~ /sles-11/
special_flags += "-DCMAKE_CXX_FLAGS='#{settings[:cflags]}' -DENABLE_CXX_WERROR=OFF"
else
# These platforms use the default OS toolchain, rather than pl-build-tools
cmake = 'cmake'
Expand Down
2 changes: 2 additions & 0 deletions configs/components/runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
pkg.build_requires "pl-iconv-#{platform.architecture}"
pkg.build_requires "pl-libffi-#{platform.architecture}"
pkg.build_requires "pl-pdcurses-#{platform.architecture}"
elsif platform.name == 'sles-11-x86_64'
pkg.build_requires 'pl-gcc8'
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
pkg.build_requires 'pl-gcc'
end
Expand Down
22 changes: 22 additions & 0 deletions configs/platforms/sles-11-x86_64.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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 = [
"aaa_base",
"libbz2-devel",
"pkgconfig",
"pl-autotools",
"pl-cmake",
"pl-gcc8",
"readline-devel",
"rsync",
"zlib-devel"
]
plat.install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
plat.provision_with("zypper -n --no-gpg-checks install -y #{packages.join(' ')}")
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 @@ -31,7 +31,7 @@

proj.component 'pl-cmake-patch'
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 14109a8

Please sign in to comment.