diff --git a/Dockerfile b/Dockerfile index cd16e3c..fd626b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM arm32v7/ubuntu:16.04 MAINTAINER Sasha Gerrand ENV PREFIX_DIR /usr/glibc-compat -ENV GLIBC_VERSION 2.25 +ENV GLIBC_VERSION 2.27 RUN apt-get -q update \ - && apt-get -qy install build-essential wget openssl gawk + && apt-get -qy install bison build-essential wget openssl gawk COPY configparams /glibc-build/configparams COPY builder /builder ENTRYPOINT ["/builder"] diff --git a/README.md b/README.md index 13716bc..ad7ab45 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,16 @@ A glibc binary package builder in Docker. Produces a glibc binary package that c ## Usage -Build a glibc package based on version 2.24 with a prefix of `/usr/glibc-compat`: +Build a glibc package based on version 2.27 with a prefix of `/usr/glibc-compat`: ``` -docker run --rm -e STDOUT=1 sgerrand/glibc-builder 2.24 /usr/glibc-compat > glibc-bin.tar.gz +docker run --rm -e STDOUT=1 sgerrand/glibc-builder 2.27 /usr/glibc-compat > glibc-bin.tar.gz ``` You can also keep the container around and copy out the resulting file: ``` -docker run --name glibc-binary sgerrand/glibc-builder 2.24 /usr/glibc-compat -docker cp glibc-binary:/glibc-bin-2.24.tar.gz ./ +docker run --name glibc-binary sgerrand/glibc-builder 2.27 /usr/glibc-compat +docker cp glibc-binary:/glibc-bin-2.27.tar.gz ./ docker rm glibc-binary ``` diff --git a/builder b/builder index 37c355e..6a65c6e 100755 --- a/builder +++ b/builder @@ -15,14 +15,8 @@ main() { --prefix="$prefix" \ --libdir="$prefix/lib" \ --libexecdir="$prefix/lib" \ - --with-headers="$prefix/include" \ - --disable-multi-arch \ - --disable-werror \ - --host=armv7l-unknown-linux-gnueabihf \ - --build=armv7l-unknown-linux-gnueabihf - install -dm755 "$prefix"/etc - touch "$prefix"/etc/ld.so.conf - make -j "$(getconf _NPROCESSORS_ONLN)" && make install + --enable-multi-arch + make -j$(nproc) && make install tar --hard-dereference -zcf "/glibc-bin-$version.tar.gz" "$prefix" } >&2 diff --git a/circle.yml b/circle.yml index 9dafa9e..71fe516 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ general: - "artifacts" machine: environment: - GLIBC_VERSION: 2.24 + GLIBC_VERSION: 2.27 pre: - sudo mv /usr/local/go /usr/local/go-1.6.2 - wget -q -O /tmp/go1.7.3.tgz https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz @@ -20,10 +20,10 @@ test: pre: - mkdir -p artifacts override: - - "docker run --rm -e STDOUT=1 sgerrand/glibc-builder $GLIBC_VERSION /usr/glibc-compat > artifacts/glibc-bin-$GLIBC_VERSION-$(uname -m).tar.gz" + - "docker run --rm -e STDOUT=1 sgerrand/glibc-builder $GLIBC_VERSION /usr/glibc-compat > artifacts/glibc-bin-$GLIBC_VERSION-0-$(uname -m).tar.gz" deployment: release: - tag: /[0-9]+(\.[0-9]+){1,2}(\-r\d+)?$/ + tag: /[0-9]+(\.[0-9]+){1,2}(\-\d+)?$/ owner: sgerrand commands: - ghr -u sgerrand $CIRCLE_TAG artifacts/ @@ -32,4 +32,3 @@ deployment: owner: sgerrand commands: - ghr -u sgerrand --prerelease --delete unreleased artifacts - - ghr -u sgerrand --prerelease unreleased artifacts