From bfee8bf0942c9f5c99f83e47e3e5156ed2d86a0b Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 12 Feb 2018 10:36:03 -0600 Subject: [PATCH] update gentoo vars for new profile and python Change-Id: I810b09f98c479e6ebdbf8de6fae31166a3e87667 --- diskimage_builder/elements/gentoo/README.rst | 4 ++-- .../gentoo/environment.d/00-gentoo-envars.bash | 6 +++--- .../elements/gentoo/root.d/10-gentoo-image | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/diskimage_builder/elements/gentoo/README.rst b/diskimage_builder/elements/gentoo/README.rst index 066257e4..e3536bd1 100644 --- a/diskimage_builder/elements/gentoo/README.rst +++ b/diskimage_builder/elements/gentoo/README.rst @@ -26,8 +26,8 @@ Notes: * Other profiles can be used by exporting GENTOO_PROFILE with a valid profile. A list of valid profiles follows: - default/linux/amd64/13.0 - default/linux/amd64/13.0/no-multilib + default/linux/amd64/17.0 + default/linux/amd64/17.0/no-multilib hardened/linux/amd64 hardened/linux/amd64/no-multilib 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 1fbaf46b..f423394e 100644 --- a/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash +++ b/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash @@ -1,7 +1,7 @@ export DIB_RELEASE=gentoo export DISTRO_NAME=gentoo -export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/13.0'} +export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.0'} export GENTOO_PORTAGE_CLEANUP=${GENTOO_PORTAGE_CLEANUP:-'False'} -export GENTOO_PYTHON_TARGETS=${GENTOO_PYTHON_TARGETS:-'python2_7 python3_4'} -export GENTOO_PYTHON_ACTIVE_VERSION=${GENTOO_PYTHON_ACTIVE_VERSION:-'python3.4'} +export GENTOO_PYTHON_TARGETS=${GENTOO_PYTHON_TARGETS:-'python2_7 python3_5'} +export GENTOO_PYTHON_ACTIVE_VERSION=${GENTOO_PYTHON_ACTIVE_VERSION:-'python3.5'} export GENTOO_OVERLAYS=${GENTOO_OVERLAYS:-''} diff --git a/diskimage_builder/elements/gentoo/root.d/10-gentoo-image b/diskimage_builder/elements/gentoo/root.d/10-gentoo-image index 66c18818..3d7174ad 100755 --- a/diskimage_builder/elements/gentoo/root.d/10-gentoo-image +++ b/diskimage_builder/elements/gentoo/root.d/10-gentoo-image @@ -38,11 +38,11 @@ fi # default/linux/amd64/13.0/no-multilib # hardened/linux/amd64 # hardened/linux/amd64/no-multilib -GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/13.0'} -if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/13.0" ]]; then +GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.0'} +if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0" ]]; then FILENAME_BASE='gentoo-stage4' SIGNED_SOURCE_SUFFIX='minimal' -elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/13.0/no-multilib" ]]; then +elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then FILENAME_BASE='gentoo-stage4-nomultilib' SIGNED_SOURCE_SUFFIX='minimal-nomultilib' elif [[ "${GENTOO_PROFILE}" == "hardened/linux/amd64" ]]; then @@ -53,8 +53,8 @@ elif [[ "${GENTOO_PROFILE}" == "hardened/linux/amd64/no-multilib" ]]; then SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib' else echo 'invalid profile, please select from the following profiles' - echo 'default/linux/amd64/13.0' - echo 'default/linux/amd64/13.0/no-multilib' + echo 'default/linux/amd64/17.0' + echo 'default/linux/amd64/17.0/no-multilib' echo 'hardened/linux/amd64' echo 'hardened/linux/amd64/no-multilib' exit 1