Skip to content

Commit 11c8495

Browse files
committed
Upgrade to busybox-w32 FRP-5398-g89ae34445
Two patches have been effectively upstreamed. https://frippery.org/busybox/release-notes/FRP-5467.html
1 parent 62e236c commit 11c8495

File tree

4 files changed

+5
-36
lines changed

4 files changed

+5
-36
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG VERSION=2.0.0
44
ARG PREFIX=/w64devkit
55
ARG Z7_VERSION=2301
66
ARG BINUTILS_VERSION=2.42
7-
ARG BUSYBOX_VERSION=FRP-5398-g89ae34445
7+
ARG BUSYBOX_VERSION=FRP-5467-g9376eebd8
88
ARG CTAGS_VERSION=6.0.0
99
ARG EXPAT_VERSION=2.6.2
1010
ARG GCC_VERSION=14.2.0

src/SHA256SUMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74 7z2301-src.tar.xz
22
f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800 binutils-2.42.tar.xz
3-
e366f887a56bf6f64adff15b7b08ba487fea14c121045078437abe7217cf060d busybox-w32-FRP-5398-g89ae34445.tgz
3+
4b3a8ad7a1a6a95b1e8437d2b6ac7d18c9443a9c3d984ef64154d2a4a6558cb0 busybox-w32-FRP-5467-g9376eebd8.tgz
44
71229a73f25529c9e3dabb2cb7310c55405d31caee8e8a9ab5c71b2406d4005a ctags-6.0.0.tar.gz
55
ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz
66
a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9 gcc-14.2.0.tar.xz

src/busybox-003-fix-libtool.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
--- a/shell/ash.c
22
+++ b/shell/ash.c
3-
@@ -16282,7 +16282,14 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
3+
@@ -16349,3 +16349,3 @@
44

5-
state = 1;
6-
#if ENABLE_PLATFORM_MINGW32
7-
- hp = xasprintf("%s/etc/profile", get_system_drive() ?: "");
8-
+ const char *syspath = bb_busybox_exec_path;
9-
+ int syspathlen = 0;
10-
+ for (int i = 0; syspath[i]; i++) {
11-
+ if (syspath[i] == '/') {
12-
+ syspathlen = i;
13-
+ }
14-
+ }
15-
+ hp = xasprintf("%.*s/../src/profile", syspathlen, syspath);
5+
- hp = exe_relative_path("/etc/profile");
6+
+ hp = exe_relative_path("../src/profile");
167
read_profile(hp);
17-
free((void *)hp);
18-
#else

0 commit comments

Comments
 (0)