@@ -70,20 +70,20 @@ RUN set -eux; \
70
70
apk del --no-network .gpg-deps; \
71
71
{{ ) end -}}
72
72
\
73
- mkdir -p /usr/src/bash; \
73
+ mkdir -p /usr/local/ src/bash; \
74
74
tar \
75
75
--extract \
76
76
--file=bash.tar.gz \
77
77
--strip-components=1 \
78
- --directory=/usr/src/bash \
78
+ --directory=/usr/local/ src/bash \
79
79
; \
80
80
rm bash.tar.gz; \
81
81
\
82
82
if [ -d bash-patches ]; then \
83
83
apk add --no-cache --virtual .patch-deps patch; \
84
84
for p in bash-patches/*; do \
85
85
patch \
86
- --directory=/usr/src/bash \
86
+ --directory=/usr/local/ src/bash \
87
87
--input="$(readlink -f "$p")" \
88
88
--strip=0 \
89
89
; \
@@ -95,11 +95,11 @@ RUN set -eux; \
95
95
{{ if env.version == "devel" then ( -}}
96
96
\
97
97
# 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; \
100
100
{{ ) else "" end -}}
101
101
\
102
- cd /usr/src/bash; \
102
+ cd /usr/local/ src/bash; \
103
103
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
104
104
{{ if env.version == "devel" or (env.version | split(".") | .[0] | tonumber) >= 5 then "" else ( -}}
105
105
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
@@ -130,7 +130,7 @@ RUN set -eux; \
130
130
make -j "$(nproc)"; \
131
131
make install; \
132
132
cd /; \
133
- rm -r /usr/src/bash; \
133
+ rm -r /usr/local/ src/bash; \
134
134
\
135
135
# delete a few installed bits for smaller image size
136
136
rm -rf \
0 commit comments