diff options
| author |   Michael Everitt <michael@2e0cer.net> | 2020-07-28 09:30:17 +0100 |
|---|---|---|
| committer |   Alexys Jacob <ultrabug@gentoo.org> | 2020-08-20 11:28:18 +0200 |
| commit | 4db589571a25fcaec79479dcb8d902b40dd3f995 (patch) | |
| tree | a8314ef7ef6a7de8edbf83f14b1433cd6a1ffe7c | |
| parent | Fix stage3 generation (diff) | |
| download | docker-images-4db589571a25fcaec79479dcb8d902b40dd3f995.tar.gz docker-images-4db589571a25fcaec79479dcb8d902b40dd3f995.tar.bz2 docker-images-4db589571a25fcaec79479dcb8d902b40dd3f995.zip | |
Add support for musl stage3s on amd64/x86
Signed-off-by: Michael Everitt <gentoo@veremit.xyz>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/84
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | build.sh | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b606fef..4d8417d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,12 @@ env: - TARGET=stage3-amd64-hardened-nomultilib - TARGET=stage3-amd64-nomultilib - TARGET=stage3-amd64-systemd + - TARGET=stage3-amd64-musl-vanilla + - TARGET=stage3-amd64-musl-hardened - TARGET=stage3-x86 - TARGET=stage3-x86-hardened - TARGET=stage3-armv7a + - TARGET=stage3-x86-musl-vanilla - TARGET=stage3-ppc - TARGET=stage3-ppc64 - TARGET=stage3-ppc64le @@ -14,7 +14,10 @@ IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}" DOCKER_ARCH="${ARCH}" # Ensure upstream directories for stage3-amd64-hardened+nomultilib work -SUFFIX=${SUFFIX/-/+} +# unless we're building for musl targets (vanilla/hardened) +if [[ "${SUFFIX}" != *musl* ]]; then + SUFFIX=${SUFFIX/-/+} +fi VERSION=${VERSION:-$(date -u +%Y%m%d)} |