From 5a5e01afffda42418827cc18f865595cf00cd3d6 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 8 Apr 2022 14:11:58 +0000 Subject: [PATCH] profiles/.../oem-aci: allow python3 in oem-aci images The oem-aci profile previously removed python3 from the produced oem images by having an entry saying dev-lang/python-3.X is provided and removing all python3 files. This only worked as long as python2 was available and installed instead, but since python2 was removed from the tree these entries in the profile resulted in oem-aci having no python at all. This prevents the oem-gce service from working, since a lot of what it does is python. Remove the INSTALL_MASK and package.provided entries for python3 to allow python3 into oem-aci images. --- .../profiles/coreos/targets/generic/oem-aci/make.defaults | 5 ----- .../profiles/coreos/targets/generic/oem-aci/package.provided | 3 --- 2 files changed, 8 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults index cc8b200305..cc26153410 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults @@ -52,8 +52,3 @@ INSTALL_MASK="${INSTALL_MASK} INSTALL_MASK="${INSTALL_MASK} /boot " - -# Drop Python 3 modules etc. since Python 2 is the default. -INSTALL_MASK="${INSTALL_MASK} - /usr/*/python3* -" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided index 141931e406..92c93c6fea 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided @@ -1,5 +1,2 @@ # Do not install SSSD in the container. sys-auth/sssd-1.13.1 - -# Stick to one version of Python in the ACI. -dev-lang/python-3.9