Skip to content

Commit

Permalink
(PA-5999) Add support for SLES-11 (Intel)
Browse files Browse the repository at this point in the history
 - Removed the java package because its no longer needed, removed gcc(which is version 4.3.4 in the image) because we are using the newer pl-gcc (version 4.8.4) required.
 - Added SLES-11 to without-dtrace platforms to build ruby.
 - Add --with-baseruby=no to configure script to not use base ruby since the image has ruby 1.8.7.
  • Loading branch information
shubhamshinde360 committed Feb 2, 2024
1 parent 0103919 commit 68795b8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
5 changes: 4 additions & 1 deletion configs/components/ruby-2.7.8.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@
special_flags += " --with-openssl-dir=#{settings[:prefix]} "
elsif platform.is_solaris? && platform.architecture == "sparc"
special_flags += " --with-baseruby=#{host_ruby} --enable-close-fds-by-recvmsg-with-peek "
elsif platform.name =~ /el-6/
elsif platform.name =~ /el-6/ || platform.name =~ /sles-11-x86_64/
# Since we're not cross compiling, ignore old ruby versions that happen to be in the PATH
# and force ruby to build miniruby and use that to bootstrap the rest of the build
special_flags += " --with-baseruby=no "
elsif platform.is_windows?
special_flags = " CPPFLAGS='-DFD_SETSIZE=2048' debugflags=-g --prefix=#{ruby_dir} --with-opt-dir=#{settings[:prefix]} "
Expand All @@ -130,6 +132,7 @@
'osx-11-arm64',
'osx-12-arm64',
'redhatfips-7-x86_64',
'sles-11-x86_64',
'sles-12-ppc64le',
'solaris-10-sparc',
'solaris-11-sparc',
Expand Down
12 changes: 10 additions & 2 deletions configs/platforms/sles-11-x86_64.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"aaa_base",
"autoconf",
"automake",
"gcc",
"java-1_7_1-ibm-devel",
"libbz2-devel",
"make",
"pkgconfig",
Expand All @@ -19,6 +17,16 @@
"rsync",
"zlib-devel"
]
plat.provision_with(%q{cat <<END > /etc/zypp/repos.d/localmirror-os.repo
[localmirror-os]
name=localmirror-os
baseurl=http://osmirror.delivery.puppetlabs.net/sles-11-sp4-x86_64/RPMS.os
enabled=1
gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SLES-11
autorefresh=1
type=rpm-md
END})
plat.provision_with("zypper -n --no-gpg-checks install -y #{packages.join(' ')}")
plat.install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
plat.vmpooler_template "sles-11-x86_64"
Expand Down

0 comments on commit 68795b8

Please sign in to comment.