Skip to content

Commit

Permalink
Update STAGE3_BASE defaults (#230)
Browse files Browse the repository at this point in the history
- Glibc stage3 base name changed a fair while ago with openrc/systemd
  split. The values are overridden by the build.conf in builders, e.g.
  edannenberg/kubler-images.
- Also snuck in a fixed a stray tab
  • Loading branch information
berney authored May 1, 2023
1 parent c477877 commit 8f2f087
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ BOB_HOST_UID=$(id -u)
BOB_HOST_GID=$(id -g)

# stage3 defaults, override via build container .conf
STAGE3_BASE="stage3-amd64-hardened+nomultilib"
STAGE3_BASE="stage3-amd64-hardened-nomultilib-openrc"

_kubler_trap_functions=()
_kubler_internal_abort=
Expand Down Expand Up @@ -387,7 +387,7 @@ function fetch_stage3_archive_name() {
is_newer_stage3_date "${remote_date}" "${BASH_REMATCH[$((max_cap-3))]}${BASH_REMATCH[$((max_cap-2))]}" \
&& { remote_date="${BASH_REMATCH[$((max_cap-3))]}${BASH_REMATCH[$((max_cap-2))]}";
remote_file_type="${BASH_REMATCH[$((max_cap-1))]}"; }
break
break
fi
done
[[ "${remote_date//[!0-9]/}" -eq 0 ]] && return 3
Expand Down
2 changes: 1 addition & 1 deletion template/docker/builder/build.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BUILDER="${_tmpl_builder}"

# ..or bootstrap from a fresh stage3, overrides BUILDER if STAGE3_BASE is defined
STAGE3_BASE='stage3-amd64-hardened+nomultilib'
STAGE3_BASE='stage3-amd64-hardened-nomultilib-openrc'
STAGE3_DATE='20170101'
#ARCH='amd64'
#ARCH_URL="${MIRROR}releases/${ARCH}/autobuilds/current-${STAGE3_BASE}/"
Expand Down

0 comments on commit 8f2f087

Please sign in to comment.