diff --git a/Dockerfile b/Dockerfile index c5f3736..75b90d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -781,6 +781,7 @@ COPY --from=build-cmake /out$PREFIX/ $PREFIX/ COPY --from=build-7z /dl/7z/7z.sfx /7z/ COPY src $PREFIX/src +COPY etc $PREFIX/etc WORKDIR / RUN rm -rf $PREFIX/share/man/ $PREFIX/share/info/ $PREFIX/share/gcc-* @@ -814,7 +815,7 @@ RUN printf "id ICON \"$PREFIX/src/w64devkit.ico\"" >w64devkit.rc \ && $ARCH-gcc -DEXE=pkg-config.exe -DCMD=pkg-config \ -Oz -fno-asynchronous-unwind-tables -Wl,--gc-sections -s -nostdlib \ -o $PREFIX/bin/$ARCH-pkg-config.exe $PREFIX/src/alias.c -lkernel32 \ - && sed -i s/'\'/$ARCH/g $PREFIX/src/profile \ + && sed -i s/'\'/$ARCH/g $PREFIX/etc/profile \ && mkdir -p $PREFIX/lib/pkgconfig \ && cp /dl/mingw/COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt \ $PREFIX/ \ diff --git a/src/profile b/etc/profile similarity index 100% rename from src/profile rename to etc/profile diff --git a/src/busybox-004-system-profile.patch b/src/busybox-004-system-profile.patch index 0b930f9..94cabdc 100644 --- a/src/busybox-004-system-profile.patch +++ b/src/busybox-004-system-profile.patch @@ -3,5 +3,5 @@ @@ -16349,3 +16349,3 @@ - hp = exe_relative_path("/etc/profile"); -+ hp = exe_relative_path("../src/profile"); ++ hp = exe_relative_path("../etc/profile"); read_profile(hp);