Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 29d0141

Browse files
Fix broken mirror for readline-8.1, add GNU parted 3.4
1 parent b026a08 commit 29d0141

File tree

5 files changed

+58
-2
lines changed

5 files changed

+58
-2
lines changed

‎Dockerfile.e2fsprogs-1.46.5

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
ARG MUSL_TARGET=x86_64-linux-musl
2+
FROM musl-cross-make-$MUSL_TARGET
3+
ARG MUSL_TARGET
4+
5+
WORKDIR /build
6+
RUN download https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/e2fsprogs-1.46.5.tar.gz source.tar.gz 0786fadd77421e04b21f3a79513c5d8d9232f82eb8bea68f3af46f2d98bdd889 && tar xf source.tar.gz
7+
RUN export PATH=/build/cross/bin:$PATH && \
8+
cd e2fsprogs-* && \
9+
mkdir build && \
10+
cd build && \
11+
export CC="$MUSL_TARGET-gcc" && \
12+
export CFLAGS="-static -frandom-seed=pulse" && \
13+
export LDFLAGS=--static && \
14+
../configure \
15+
--host=$($MUSL_TARGET-gcc -dumpmachine) \
16+
--prefix=/output && \
17+
make -j$(nproc) && \
18+
make install
19+
20+
CMD bash

‎Dockerfile.parted-3.4

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
ARG MUSL_TARGET=x86_64-linux-musl
2+
FROM e2fsprogs-1.46.5-${MUSL_TARGET} AS e2fsprogs
3+
FROM readline-8.1-${MUSL_TARGET} AS readline
4+
FROM musl-cross-make-${MUSL_TARGET}
5+
ARG MUSL_TARGET
6+
7+
COPY --from=e2fsprogs /output /output
8+
COPY --from=readline /output /output
9+
10+
WORKDIR /build
11+
RUN download https://mirror.fsmg.org.nz/gnu/parted/parted-3.4.tar.xz source.tar.xz e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 && tar xf source.tar.xz
12+
RUN export PATH=/build/cross/bin:$PATH:/output/bin && \
13+
cd parted-* && \
14+
export CC="$MUSL_TARGET-gcc" && \
15+
export CFLAGS="-static -I/output/include -frandom-seed=pulse" && \
16+
export LDFLAGS="--static -L/output/lib" && \
17+
./configure \
18+
--enable-shared=no \
19+
--disable-device-mapper \
20+
--enable-static=yes \
21+
--prefix=/output \
22+
--host=$($MUSL_TARGET-gcc -dumpmachine) && \
23+
make -j$(nproc) && \
24+
make install && \
25+
${MUSL_TARGET}-strip /output/sbin/parted
26+
27+
CMD bash

‎Dockerfile.readline-8.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG MUSL_TARGET
66
COPY --from=ncurses /output /output
77

88
WORKDIR /build
9-
RUN download ftp://ftp.cwru.edu/pub/bash/readline-8.1.tar.gz source.tar.gz f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 && tar xf source.tar.gz
9+
RUN download https://mirror.fsmg.org.nz/gnu/readline/readline-8.1.tar.gz source.tar.gz f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 && tar xf source.tar.gz
1010
RUN export PATH=/build/cross/bin:$PATH && \
1111
cd readline-* && \
1212
CC="$MUSL_TARGET-gcc" \

‎Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ all: busybox-1.33.1 curl-7.79.1 dropbear-2020.81 loggedfs-0.9 nmap-7.90 openssl-
88

99
check:
1010
@echo "These binaries are not built properly:"
11-
@echo "$(shell file output/*/* | grep -E -v "\.tar\.gz|statically linked, stripped$$")"
11+
@echo "$(shell file output/*/* | grep -E -v "\.tar\.gz|statically linked")"
1212

1313
## Dependencies
1414

@@ -37,6 +37,9 @@ protobuf-3.19.1: musl-cross-make
3737
expat-2.4.1: musl-cross-make
3838
$(DOCKER_BUILD)
3939

40+
e2fsprogs-1.46.5: musl-cross-make
41+
$(DOCKER_BUILD)
42+
4043
# Produces both libcurl and the curl binary.
4144
curl-7.79.1: openssl-1.1.1k
4245
$(DOCKER_BUILD)
@@ -100,6 +103,10 @@ nsjail-3.0: libnl-3.2.25 protobuf-3.19.1
100103
$(DOCKER_BUILD)
101104
$(GRABBY_HANDS) /build/nsjail-3.0/nsjail /grabby/$@
102105

106+
parted-3.4: e2fsprogs-1.46.5 readline-8.1
107+
$(DOCKER_BUILD)
108+
$(GRABBY_HANDS) /output/sbin/parted /grabby/$@
109+
103110
# By default just build the basic 'git' binary. If you want "everything" then set GIT_FULL as an environment variable. The 'git-versionnumber' binary will need to be renamed to just 'git' to work.
104111
git-2.33.0: expat-2.4.1 openssl-1.1.1k curl-7.79.1 zlib-1.2.11
105112
$(DOCKER_BUILD)

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ These are the tools that build cleanly without too many caveats and are generall
3030
* `nmap-7.90` (some extra functionality is missing as it requires additional data files)
3131
* `openssl-0.9.8zh` (insecure, not for general use)
3232
* `openssl-1.1.1k`
33+
* `parted-3.4`
3334
* `socat-1.7.4.1`
3435
* `tcpdump-4.99.1`
3536

@@ -54,6 +55,7 @@ These libraries are built automatically as required by the above tools.
5455
* `libpcap-1.10.1`
5556
* `libssl-0.9.8zh` (as part of `openssl-0.9.8zh`, don't use this, just here for compatibility)
5657
* `libssl-1.1.1k` (as part of `openssl-1.1.1k`)
58+
* `libuuid-1.46.5` (as part of `e2fsprogs-1.46.5`)
5759
* `libxml2-2.9.12`
5860
* `ncurses-6.2`
5961
* `pcre-8.45`

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /