Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM builder-base AS builder-static
RUN dnf install -y glibc-static

ARG musl_version=1.2.5
ARG bash_version=5.1.16
ARG bash_version=5.2.15

WORKDIR /opt/build
COPY ./sdk-fetch ./
Expand Down Expand Up @@ -47,8 +47,11 @@ RUN CC=""/usr/local/musl/bin/musl-gcc CFLAGS="-Os -DHAVE_DLOPEN=0" \
--enable-static-link \
--without-bash-malloc \
|| { cat config.log; exit 1; }

# Build bash library first, then remove conflicting strtoimax object to avoid duplicate symbols with musl
RUN make lib/sh/libsh.a && \
cd ./lib/sh && ar d libsh.a strtoimax.o && ranlib libsh.a
ar d lib/sh/libsh.a lib/sh/strtoimax.o && \
ranlib lib/sh/libsh.a
RUN make -j`nproc`
RUN cp bash /opt/bash
RUN mkdir -p /usr/share/licenses/bash && \
Expand Down
4 changes: 2 additions & 2 deletions hashes/bash
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz
SHA512 (bash-5.1.16.tar.gz) = a32a343b6dde9a18eb6217602655f72c4098b0d90f04cf4e686fb21b81fc4ef26ade30f7226929fbb7c207cde34617dbad2c44f6103161d1141122bb31dc6c80
# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz
SHA512 (bash-5.2.15.tar.gz) = 08a67f6da4af7a75ff2b2d5a9eb8fc46d8c6e9ae80ccaf73b51736d6609916861b1f3fced938ce3ea16d014edb324e1a3d8e03f4917f68dc56ffb665316f26c7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, you are missing a newline