Merge pull request #881 from cthorn42/maint/master/use_vanagon-config…

…_for_sparc
puppetlabs · Aug 2, 2024 · e60911b · e60911b
2 parents 668066d + 29b488b
commit e60911b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/configs/platforms/solaris-11-native-sparc.rb b/configs/platforms/solaris-11-native-sparc.rb
@@ -55,6 +55,6 @@
 basedir=default" > /var/tmp/vanagon-noask;
  echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
  pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
- /opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
+ /opt/csw/bin/pkgutil -config=/var/tmp/vanagon-pkgutil.conf -U && /opt/csw/bin/pkgutil -config=/var/tmp/vanagon-pkgutil.conf -y -i bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
  ]
 end
diff --git a/configs/platforms/solaris-11-sparc.rb b/configs/platforms/solaris-11-sparc.rb
@@ -41,7 +41,9 @@
 basedir=default" > /var/tmp/vanagon-noask;
  echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
  pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
- /opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i gcc4g++ bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
+ # See PA-6877 for why gcc4g++ needs to be installed seperately from the other packages
+ /opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i gcc4g++ && \
+ /opt/csw/bin/pkgutil -config=/var/tmp/vanagon-pkgutil.conf -U && /opt/csw/bin/pkgutil -config=/var/tmp/vanagon-pkgutil.conf -y -i bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
 
  ntpdate pool.ntp.org]
 end