sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "update gentoo vars for new profile and python"

Browse Source
This commit is contained in:
Zuul 2018-02-20 05:26:20 +00:00 committed by Gerrit Code Review
commit e8eb291f57
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/elements/gentoo/README.rst
View File

@ -26,8 +26,8 @@ Notes:
* Other profiles can be used by exporting GENTOO_PROFILE with a valid profile. * Other profiles can be used by exporting GENTOO_PROFILE with a valid profile.
A list of valid profiles follows: A list of valid profiles follows:
default/linux/amd64/13.0 default/linux/amd64/17.0
default/linux/amd64/13.0/no-multilib default/linux/amd64/17.0/no-multilib
hardened/linux/amd64 hardened/linux/amd64
hardened/linux/amd64/no-multilib hardened/linux/amd64/no-multilib

6
diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
View File

@ -1,7 +1,7 @@
export DIB_RELEASE=gentoo export DIB_RELEASE=gentoo
export DISTRO_NAME=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_PORTAGE_CLEANUP=${GENTOO_PORTAGE_CLEANUP:-'False'}
export GENTOO_PYTHON_TARGETS=${GENTOO_PYTHON_TARGETS:-'python2_7 python3_4'} export GENTOO_PYTHON_TARGETS=${GENTOO_PYTHON_TARGETS:-'python2_7 python3_5'}
export GENTOO_PYTHON_ACTIVE_VERSION=${GENTOO_PYTHON_ACTIVE_VERSION:-'python3.4'} export GENTOO_PYTHON_ACTIVE_VERSION=${GENTOO_PYTHON_ACTIVE_VERSION:-'python3.5'}
export GENTOO_OVERLAYS=${GENTOO_OVERLAYS:-''} export GENTOO_OVERLAYS=${GENTOO_OVERLAYS:-''}

10
diskimage_builder/elements/gentoo/root.d/10-gentoo-image
View File

@ -38,11 +38,11 @@ fi
# default/linux/amd64/13.0/no-multilib # default/linux/amd64/13.0/no-multilib
# hardened/linux/amd64 # hardened/linux/amd64
# hardened/linux/amd64/no-multilib # hardened/linux/amd64/no-multilib
GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/13.0'} GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.0'}
if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/13.0" ]]; then if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0" ]]; then
FILENAME_BASE='gentoo-stage4' FILENAME_BASE='gentoo-stage4'
SIGNED_SOURCE_SUFFIX='minimal' 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' FILENAME_BASE='gentoo-stage4-nomultilib'
SIGNED_SOURCE_SUFFIX='minimal-nomultilib' SIGNED_SOURCE_SUFFIX='minimal-nomultilib'
elif [[ "${GENTOO_PROFILE}" == "hardened/linux/amd64" ]]; then 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' SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib'
else else
echo 'invalid profile, please select from the following profiles' echo 'invalid profile, please select from the following profiles'
echo 'default/linux/amd64/13.0' echo 'default/linux/amd64/17.0'
echo 'default/linux/amd64/13.0/no-multilib' echo 'default/linux/amd64/17.0/no-multilib'
echo 'hardened/linux/amd64' echo 'hardened/linux/amd64'
echo 'hardened/linux/amd64/no-multilib' echo 'hardened/linux/amd64/no-multilib'
exit 1 exit 1