| 1 |
commit: 4db589571a25fcaec79479dcb8d902b40dd3f995 |
| 2 |
Author: Michael Everitt <michael <AT> 2e0cer <DOT> net> |
| 3 |
AuthorDate: Tue Jul 28 08:30:17 2020 +0000 |
| 4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 20 09:28:18 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=4db58957 |
| 7 |
|
| 8 |
Add support for musl stage3s on amd64/x86 |
| 9 |
|
| 10 |
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> |
| 11 |
Closes: https://github.com/gentoo/gentoo-docker-images/pull/84 |
| 12 |
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> |
| 13 |
|
| 14 |
.travis.yml | 3 +++ |
| 15 |
build.sh | 5 ++++- |
| 16 |
2 files changed, 7 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/.travis.yml b/.travis.yml |
| 19 |
index b606fef..4d8417d 100644 |
| 20 |
--- a/.travis.yml |
| 21 |
+++ b/.travis.yml |
| 22 |
@@ -11,9 +11,12 @@ env: |
| 23 |
- TARGET=stage3-amd64-hardened-nomultilib |
| 24 |
- TARGET=stage3-amd64-nomultilib |
| 25 |
- TARGET=stage3-amd64-systemd |
| 26 |
+ - TARGET=stage3-amd64-musl-vanilla |
| 27 |
+ - TARGET=stage3-amd64-musl-hardened |
| 28 |
- TARGET=stage3-x86 |
| 29 |
- TARGET=stage3-x86-hardened |
| 30 |
- TARGET=stage3-armv7a |
| 31 |
+ - TARGET=stage3-x86-musl-vanilla |
| 32 |
- TARGET=stage3-ppc |
| 33 |
- TARGET=stage3-ppc64 |
| 34 |
- TARGET=stage3-ppc64le |
| 35 |
|
| 36 |
diff --git a/build.sh b/build.sh |
| 37 |
index feacd63..887b597 100755 |
| 38 |
--- a/build.sh |
| 39 |
+++ b/build.sh |
| 40 |
@@ -14,7 +14,10 @@ IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}" |
| 41 |
DOCKER_ARCH="${ARCH}" |
| 42 |
|
| 43 |
# Ensure upstream directories for stage3-amd64-hardened+nomultilib work |
| 44 |
-SUFFIX=${SUFFIX/-/+} |
| 45 |
+# unless we're building for musl targets (vanilla/hardened) |
| 46 |
+if [[ "${SUFFIX}" != *musl* ]]; then |
| 47 |
+ SUFFIX=${SUFFIX/-/+} |
| 48 |
+fi |
| 49 |
|
| 50 |
VERSION=${VERSION:-$(date -u +%Y%m%d)} |
Archives