Skip to content

Commit b544646

Browse files
committed
Switch to /usr/local/src
https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s12.html > Generally, source should not be built within this hierarchy.
1 parent 26d2cd6 commit b544646

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Diff for: Dockerfile.template

+7-7
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,20 @@ RUN set -eux; \
7070
apk del --no-network .gpg-deps; \
7171
{{ ) end -}}
7272
\
73-
mkdir -p /usr/src/bash; \
73+
mkdir -p /usr/local/src/bash; \
7474
tar \
7575
--extract \
7676
--file=bash.tar.gz \
7777
--strip-components=1 \
78-
--directory=/usr/src/bash \
78+
--directory=/usr/local/src/bash \
7979
; \
8080
rm bash.tar.gz; \
8181
\
8282
if [ -d bash-patches ]; then \
8383
apk add --no-cache --virtual .patch-deps patch; \
8484
for p in bash-patches/*; do \
8585
patch \
86-
--directory=/usr/src/bash \
86+
--directory=/usr/local/src/bash \
8787
--input="$(readlink -f "$p")" \
8888
--strip=0 \
8989
; \
@@ -95,11 +95,11 @@ RUN set -eux; \
9595
{{ if env.version == "devel" then ( -}}
9696
\
9797
# https://lists.gnu.org/archive/html/bug-bash/2023-05/msg00011.html
98-
{ echo '#include <unistd.h>'; echo; cat /usr/src/bash/lib/sh/strscpy.c; } > /usr/src/bash/lib/sh/strscpy.c.new; \
99-
mv /usr/src/bash/lib/sh/strscpy.c.new /usr/src/bash/lib/sh/strscpy.c; \
98+
{ echo '#include <unistd.h>'; echo; cat /usr/local/src/bash/lib/sh/strscpy.c; } > /usr/local/src/bash/lib/sh/strscpy.c.new; \
99+
mv /usr/local/src/bash/lib/sh/strscpy.c.new /usr/local/src/bash/lib/sh/strscpy.c; \
100100
{{ ) else "" end -}}
101101
\
102-
cd /usr/src/bash; \
102+
cd /usr/local/src/bash; \
103103
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
104104
{{ if env.version == "devel" or (env.version | split(".") | .[0] | tonumber) >= 5 then "" else ( -}}
105105
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
@@ -130,7 +130,7 @@ RUN set -eux; \
130130
make -j "$(nproc)"; \
131131
make install; \
132132
cd /; \
133-
rm -r /usr/src/bash; \
133+
rm -r /usr/local/src/bash; \
134134
\
135135
# delete a few installed bits for smaller image size
136136
rm -rf \

0 commit comments

Comments
 (0)