Skip to content

Commit

Permalink
update to 2.27
Browse files Browse the repository at this point in the history
  • Loading branch information
yangxuan8282 committed Apr 9, 2018
1 parent 8c6c060 commit e17764a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM arm32v7/ubuntu:16.04
MAINTAINER Sasha Gerrand <[email protected]>
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"]
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
10 changes: 2 additions & 8 deletions builder
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
Expand All @@ -32,4 +32,3 @@ deployment:
owner: sgerrand
commands:
- ghr -u sgerrand --prerelease --delete unreleased artifacts
- ghr -u sgerrand --prerelease unreleased artifacts

0 comments on commit e17764a

Please sign in to comment.