diff options
| -rw-r--r-- | config/kernel.in | 2 | ||||
| -rw-r--r-- | scripts/build/libc/musl.sh | 5 | ||||
| -rw-r--r-- | testing/docker/alpine3.8/Dockerfile | 14 | ||||
| -rwxr-xr-x | testing/docker/common-scripts/ctng-build-sample | 3 | ||||
| -rwxr-xr-x | testing/docker/common-scripts/ctng-test-basic | 3 |
5 files changed, 25 insertions, 2 deletions
diff --git a/config/kernel.in b/config/kernel.in index 579cc23..5c8a519 100644 --- a/config/kernel.in +++ b/config/kernel.in @@ -26,6 +26,8 @@ config SHARED_LIBS bool prompt "Build shared libraries" depends on KERNEL_SUPPORTS_SHARED_LIBS + # Building "shared flat" currently fails + depends on ARCH_USE_MMU || EXPERIMENTAL default y help Say 'y' here, unless you don't want shared libraries. diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh index b8ea9b1..63d6804 100644 --- a/scripts/build/libc/musl.sh +++ b/scripts/build/libc/musl.sh @@ -76,6 +76,11 @@ musl_backend_once() { extra_config+=("--enable-warnings") fi + case "${CT_SHARED_LIBS}" in + y) extra_config+=("--enable-shared");; + *) extra_config+=("--disable-shared");; + esac + extra_config+=( "--enable-optimize=${CT_LIBC_MUSL_OPTIMIZE}" ) # Same problem as with uClibc: different variants sometimes have diff --git a/testing/docker/alpine3.8/Dockerfile b/testing/docker/alpine3.8/Dockerfile new file mode 100644 index 0000000..bfef1bd --- /dev/null +++ b/testing/docker/alpine3.8/Dockerfile @@ -0,0 +1,14 @@ +FROM alpine:3.8 +ARG CTNG_UID +ARG CTNG_GID +RUN addgroup -g $CTNG_GID ctng +RUN adduser -D -h /home/ctng -G ctng -u $CTNG_UID -s /bin/bash ctng +# Activate community and testing repositories +RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories +RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories +RUN apk update +RUN apk add alpine-sdk wget xz git bash autoconf automake bison flex texinfo help2man gawk libtool ncurses-dev gettext-dev python-dev +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 +RUN chmod a+x /sbin/dumb-init +RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile +ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/common-scripts/ctng-build-sample b/testing/docker/common-scripts/ctng-build-sample index ef823ee..709d331 100755 --- a/testing/docker/common-scripts/ctng-build-sample +++ b/testing/docker/common-scripts/ctng-build-sample @@ -1,4 +1,5 @@ -#!/bin/bash +#!/bin/bash --login +# Use --login to ensure /etc/profile is read set -e cd work diff --git a/testing/docker/common-scripts/ctng-test-basic b/testing/docker/common-scripts/ctng-test-basic index a811ec6..f94f452 100755 --- a/testing/docker/common-scripts/ctng-test-basic +++ b/testing/docker/common-scripts/ctng-test-basic @@ -1,4 +1,5 @@ -#!/bin/bash +#!/bin/bash --login +# Use --login to make sure /etc/profile is sourced set -e cd |