From 0ed684ca9eea4e3c72c689e6b693c1c7be8ae03e Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Wed, 5 Jul 2023 17:44:15 -0700 Subject: [PATCH] (PA-5621) Point AIX 7.1 & 7.2 to artifactory This is slightly complicated by the fact that AIX sed doesn't support in-place upgrades and we need to make this change after installing yum, but before running yum to install build dependencies. --- configs/platforms/aix-7.1-ppc.rb | 1 + configs/platforms/aix-7.2-ppc.rb | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/configs/platforms/aix-7.1-ppc.rb b/configs/platforms/aix-7.1-ppc.rb index a9a637ef5..465084443 100644 --- a/configs/platforms/aix-7.1-ppc.rb +++ b/configs/platforms/aix-7.1-ppc.rb @@ -41,6 +41,7 @@ tar xvf openssl-1.0.2.1800.tar; cd openssl-1.0.2.1800 && /usr/sbin/installp -acgwXY -d $PWD openssl.base; curl --output yum.sh https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/aix-yum.sh && sh yum.sh; +/opt/freeware/bin/sed -i 's|https://anonymous:anonymous@public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/RPMS|https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS|' /opt/freeware/etc/yum/yum.conf; yum install -y gcc8-c++; ln -sf /opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/8/libgcc_s.a /opt/freeware/lib/libgcc_s.a] diff --git a/configs/platforms/aix-7.2-ppc.rb b/configs/platforms/aix-7.2-ppc.rb index 8218889ff..7445a52c3 100644 --- a/configs/platforms/aix-7.2-ppc.rb +++ b/configs/platforms/aix-7.2-ppc.rb @@ -13,6 +13,12 @@ cd openssl-1.0.2.1800 && /usr/sbin/installp -acgwXY -d $PWD openssl.base; curl --output yum.sh https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/aix-yum.sh && sh yum.sh] + # After installing yum, but before yum installing packages, point yum to artifactory + # AIX sed doesn't support in-place replacement, so download GNU sed and use that + plat.provision_with %[ +rpm -Uvh https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/sed/sed-4.1.1-1.aix5.1.ppc.rpm; +/opt/freeware/bin/sed -i 's|https://anonymous:anonymous@public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/RPMS|https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS|' /opt/freeware/etc/yum/yum.conf] + packages = %w( autoconf cmake