summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-08 14:59:25 +0000
committerGerrit Code Review <review@openstack.org>2019-01-08 14:59:25 +0000
commit240f808ce7b324f11564d2b56031c0b2af21482e (patch)
treeb4f67f165282fcc753282acd95b211c1464fa146
parent911dc540357303d6482e1f9258c0e8fe01fd5562 (diff)
parentcf786bb175eec207d3237f6bfd99be5493c5b100 (diff)
Merge "change to python36 for gentoo"
-rw-r--r--diskimage_builder/elements/gentoo/README.rst4
-rw-r--r--diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash4
2 files changed, 4 insertions, 4 deletions
diff --git a/diskimage_builder/elements/gentoo/README.rst b/diskimage_builder/elements/gentoo/README.rst
index 89124a6..6110c4e 100644
--- a/diskimage_builder/elements/gentoo/README.rst
+++ b/diskimage_builder/elements/gentoo/README.rst
@@ -39,12 +39,12 @@ Notes:
39* Gentoo supports many different versions of python, in order to select one 39* Gentoo supports many different versions of python, in order to select one
40 you may use the `GENTOO_PYTHON_TARGETS` environment variable to select 40 you may use the `GENTOO_PYTHON_TARGETS` environment variable to select
41 the versions of python you want on your image. The format of this variable 41 the versions of python you want on your image. The format of this variable
42 is a string as follows `"python2_7 python3_5"`. 42 is a string as follows `"python2_7 python3_6"`.
43 43
44* In addition you can select the primary python version you wish to use (that 44* In addition you can select the primary python version you wish to use (that
45 which will be called by running the `python` command. The 45 which will be called by running the `python` command. The
46 `GENTOO_PYTHON_ACTIVE_VERSION` is used to set that mapping. The variable 46 `GENTOO_PYTHON_ACTIVE_VERSION` is used to set that mapping. The variable
47 contents can be something like `python3.5`. 47 contents can be something like `python3.6`.
48 48
49* You can enable overlays using the `GENTOO_OVERLAYS` variable. In it you 49* You can enable overlays using the `GENTOO_OVERLAYS` variable. In it you
50 should put a space separated list of overlays. The overlays must be in the 50 should put a space separated list of overlays. The overlays must be in the
diff --git a/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash b/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
index 84350f7..6d358ce 100644
--- a/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
+++ b/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
@@ -2,8 +2,8 @@ export DIB_RELEASE=gentoo
2export DISTRO_NAME=gentoo 2export DISTRO_NAME=gentoo
3export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.0'} 3export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.0'}
4export GENTOO_PORTAGE_CLEANUP=${GENTOO_PORTAGE_CLEANUP:-'True'} 4export GENTOO_PORTAGE_CLEANUP=${GENTOO_PORTAGE_CLEANUP:-'True'}
5export GENTOO_PYTHON_TARGETS=${GENTOO_PYTHON_TARGETS:-'python2_7 python3_5'} 5export GENTOO_PYTHON_TARGETS=${GENTOO_PYTHON_TARGETS:-'python2_7 python3_6'}
6export GENTOO_PYTHON_ACTIVE_VERSION=${GENTOO_PYTHON_ACTIVE_VERSION:-'python3.5'} 6export GENTOO_PYTHON_ACTIVE_VERSION=${GENTOO_PYTHON_ACTIVE_VERSION:-'python3.6'}
7export GENTOO_OVERLAYS=${GENTOO_OVERLAYS:-''} 7export GENTOO_OVERLAYS=${GENTOO_OVERLAYS:-''}
8export GENTOO_EMERGE_DEFAULT_OPTS=${GENTOO_EMERGE_DEFAULT_OPTS:-"--binpkg-respect-use --rebuilt-binaries=y --usepkg=y --with-bdeps=y --binpkg-changed-deps=y --quiet --jobs=2"} 8export GENTOO_EMERGE_DEFAULT_OPTS=${GENTOO_EMERGE_DEFAULT_OPTS:-"--binpkg-respect-use --rebuilt-binaries=y --usepkg=y --with-bdeps=y --binpkg-changed-deps=y --quiet --jobs=2"}
9 9