Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

profile bump to 17.0 #22

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions 01-get-stage3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ export MIRROR=${MIRROR:-"http://gentoo.osuosl.org"}
export OUTDIR=${OUTDIR:-"/var/tmp/catalyst/builds"}
export PORTAGE_DIR=${PORTAGE_DIR:-"/var/tmp/catalyst/snapshots"}
# profiles supported are as 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
# hardened/linux/amd64/selinux (eventually)
# hardened/linux/amd64/no-multilib/selinux (eventually)
export PROFILE=${PROFILE:-"default/linux/amd64/13.0"}
export PROFILE=${PROFILE:-"default/linux/amd64/17.0"}

mkdir -p "${OUTDIR}"

if [[ "${PROFILE}" == "default/linux/amd64/13.0" ]]; then
if [[ "${PROFILE}" == "default/linux/amd64/17.0" ]]; then
STAGE3_NAME="stage3-amd64-current.tar.bz2"
STAGE3_REAL_PATH=$(curl -s "${MIRROR}/releases/amd64/autobuilds/latest-stage3-amd64.txt" | awk '/stage3/ { print $1 }')
STAGE3_REAL_NAME=$(echo -n "${STAGE3_REAL_PATH}" | awk -F/ '{ print $2}')
STAGE3_URL="${MIRROR}/releases/amd64/autobuilds/current-stage3-amd64/${STAGE3_REAL_NAME}"
elif [[ "${PROFILE}" == "default/linux/amd64/13.0/no-multilib" ]]; then
elif [[ "${PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then
STAGE3_NAME="stage3-amd64-nomultilib-current.tar.bz2"
STAGE3_REAL_PATH=$(curl -s "${MIRROR}/releases/amd64/autobuilds/latest-stage3-amd64-nomultilib.txt" | awk '/stage3/ { print $1 }')
STAGE3_REAL_NAME=$(echo -n "${STAGE3_REAL_PATH}" | awk -F/ '{ print $2}')
Expand Down
10 changes: 5 additions & 5 deletions 02-catalyst-that-shit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ export DATE=${DATE:-"$(date +%Y%m%d)"}
export OUTDIR=${OUTDIR:-"/root/tmp/catalyst/gentoo"}
export GIT_BASE_DIR=${GIT_BASE_DIR:-$( cd "$( dirname ${BASH_SOURCE[0]} )" && pwd )}
# profiles supported are as 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
# hardened/linux/amd64/selinux (eventually)
# hardened/linux/amd64/no-multilib/selinux (eventually)
export PROFILE=${PROFILE:-"default/linux/amd64/13.0"}
export PROFILE=${PROFILE:-"default/linux/amd64/17.0"}


if [[ "${PROFILE}" == "default/linux/amd64/13.0" ]]; then
if [[ "${PROFILE}" == "default/linux/amd64/17.0" ]]; then
PROFILE_SHORTNAME="amd64-default"
SOURCE_SUBPATH="stage3-amd64-current"
KERNEL_SOURCES="gentoo-sources"
elif [[ "${PROFILE}" == "default/linux/amd64/13.0/no-multilib" ]]; then
elif [[ "${PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then
PROFILE_SHORTNAME="amd64-default-nomultilib"
SOURCE_SUBPATH="stage3-amd64-nomultilib-current"
KERNEL_SOURCES="gentoo-sources"
Expand Down
10 changes: 5 additions & 5 deletions 03-prep-that-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ export MOUNT_DIR=${MOUNT_DIR:-'/mnt'}
export DATE=${DATE:-"$(date +%Y%m%d)"}
export PORTAGE_DIR=${PORTAGE_DIR:-"/var/tmp/catalyst/snapshots"}
# profiles supported are as 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
# hardened/linux/amd64/selinux (eventually)
# hardened/linux/amd64/no-multilib/selinux (eventually)
export PROFILE=${PROFILE:-"default/linux/amd64/13.0"}
if [[ "${PROFILE}" == "default/linux/amd64/13.0" ]]; then
export PROFILE=${PROFILE:-"default/linux/amd64/17.0"}
if [[ "${PROFILE}" == "default/linux/amd64/17.0" ]]; then
PROFILE_SHORTNAME="amd64-default"
elif [[ "${PROFILE}" == "default/linux/amd64/13.0/no-multilib" ]]; then
elif [[ "${PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then
PROFILE_SHORTNAME="amd64-default-nomultilib"
elif [[ "${PROFILE}" == "hardened/linux/amd64" ]]; then
PROFILE_SHORTNAME="amd64-hardened"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ Run the scripts in order, and you'll have a shiny new set of files, depending on

set the profile you want, valid ones are as 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

`export PROFILE="default/linux/amd64/13.0"`
`export PROFILE="default/linux/amd64/17.0"`

Of note to hardened users is that this uses catalyst, which uses chroots, so you need to allow grsec things for chroots

Expand Down