From 51eab90de5e0275dfc37f50fdde77ea539b30fb3 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 23 Apr 2019 02:42:08 +0000 Subject: [PATCH 1/2] profiles: Use Python 3 for glib-utils It doesn't support Python 2. --- .../coreos-overlay/profiles/coreos/base/package.use | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 54781a8dda..9e2be89bce 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -25,6 +25,9 @@ dev-python/pyblake2 -python_targets_python3_6 dev-python/uritemplate -python_targets_python3_6 sys-apps/portage -python_targets_python3_6 +# python3 only +dev-util/glib-utils python_single_target_python3_6 + sys-apps/gptfdisk -icu # for profile migration From 53db88549bb1f7fee9cedc09fe8a9e542514796c Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 23 Apr 2019 13:43:14 +0000 Subject: [PATCH 2/2] profiles: Avoid installing a new Python package in images --- .../profiles/coreos/targets/generic/package.provided | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided index eebf292ec4..6a8f74f666 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided @@ -22,3 +22,6 @@ app-arch/xz-utils-0 # doesn't cross-compile, but required for glog, gflags, etc. dev-util/cmake-3.9.6 + +# pulled in by dev-libs/glib +dev-util/glib-utils-9999