From 1e257f59cc63ef67d32f2d583b5f85da89cac7f4 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 8 Oct 2018 00:42:40 -0500 Subject: [PATCH] simplify python3.6 selection on gentoo python 3.6 is now stable in gentoo Change-Id: Ide96c039b03817c216ab58930ff5c897556e6c8a --- .../pre-install.d/02-gentoo-04-install-desired-python | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python index a689600c0..5c51f5594 100755 --- a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python +++ b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python @@ -18,16 +18,8 @@ if [[ ! -f /usr/portage/profiles ]]; then emerge-webrsync -q fi -# python-3.6 and python-3.5 are masked and considered unstable for some reason echo "PYTHON_TARGETS=\"${GENTOO_PYTHON_TARGETS}\"" >> /etc/portage/make.conf -if [[ "${GENTOO_PYTHON_TARGETS}" == *"python3_6"* ]]; then - echo -e "-python_targets_python3_6\n-python_single_target_python3_6" >> /etc/portage/profile/use.stable.mask - echo 'dev-lang/python:3.6 ~amd64' >> /etc/portage/package.keywords/python - echo '~dev-python/setuptools-36.0.1 ~amd64' >> /etc/portage/package.keywords/python - echo '~dev-python/pyxattr-0.6.0 ~amd64' >> /etc/portage/package.keywords/python - echo '~sys-apps/kmod-24 ~amd64' >> /etc/portage/package.keywords/python - [[ ! -e /usr/lib64/libpython3.6m.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot dev-lang/python:3.6 -fi +[[ "${GENTOO_PYTHON_TARGETS}" == *"python3_6"* ]] && [[ ! -e /usr/lib64/libpython3.6m.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot dev-lang/python:3.6 [[ "${GENTOO_PYTHON_TARGETS}" == *"python3_5"* ]] && [[ ! -e /usr/lib64/libpython3.5m.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot dev-lang/python:3.5 [[ "${GENTOO_PYTHON_TARGETS}" == *"python3_4"* ]] && [[ ! -e /usr/lib64/libpython3.4m.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot dev-lang/python:3.4 [[ "${GENTOO_PYTHON_TARGETS}" == *"python2_7"* ]] && [[ ! -e /usr/lib64/libpython2.7.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot dev-lang/python:2.7