Skip to content

Commit 2a96f54

Browse files
committed
✨ feat(repo/packages/b/busybox): update
1 parent eeb4fe7 commit 2a96f54

3 files changed

Lines changed: 21 additions & 4 deletions

File tree

repo/packages/b/busybox/patches/1.35.0/01_adapt_smart.diff

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,23 @@ index a48782832..fb8860ca6 100644
102102

103103
#define bb_path_passwd_file _PATH_PASSWD
104104
#define bb_path_group_file _PATH_GROUP
105+
diff --git a/init/halt.c b/init/halt.c
106+
index fe3cb9e75..a039708ae 100644
107+
--- a/init/halt.c
108+
+++ b/init/halt.c
109+
@@ -222,9 +222,12 @@ int halt_main(int argc UNUSED_PARAM, char **argv)
110+
/* talk to init */
111+
if (!ENABLE_FEATURE_CALL_TELINIT) {
112+
/* bbox init assumed */
113+
+ #if 0
114+
rc = kill(1, signals[which]);
115+
if (init_was_not_there())
116+
rc = kill(1, signals[which]);
117+
+ #endif
118+
+ rc = reboot(magic[which]);
119+
} else {
120+
/* SysV style init assumed */
121+
/* runlevels:
105122
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
106123
index 7f9d92ea9..e88c62e5a 100644
107124
--- a/libbb/copyfd.c

repo/packages/b/busybox/port/1.35.0/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
33
# Busybox version: 1.35.0
4-
# Mon May 15 23:21:14 2023
4+
# Wed Jun 7 23:22:30 2023
55
#
66
CONFIG_HAVE_DOT_CONFIG=y
77

@@ -495,8 +495,8 @@ CONFIG_HALT=y
495495
CONFIG_POWEROFF=y
496496
CONFIG_REBOOT=y
497497
CONFIG_FEATURE_WAIT_FOR_INIT=y
498-
CONFIG_FEATURE_CALL_TELINIT=y
499-
CONFIG_TELINIT_PATH="/sbin/telinit"
498+
# CONFIG_FEATURE_CALL_TELINIT is not set
499+
CONFIG_TELINIT_PATH=""
500500
# CONFIG_INIT is not set
501501
# CONFIG_LINUXRC is not set
502502
# CONFIG_FEATURE_USE_INITTAB is not set

repo/packages/b/busybox/xmake.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ do
3030
add_versions("1.35.0", "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694")
3131

3232
add_patches("1.35.0", path.join(os.scriptdir(), "patches", "1.35.0", "01_adapt_smart.diff"),
33-
"003dee517c3756fc8cf14e81030d6b6f11145264b1eb0e16e0b3df8b3eba4b09")
33+
"1bbfbe1c98f8693e10978fc4e7b350af444f59e5b5655bcc2ef753059ea77e54")
3434

3535
on_install("cross@linux", function(package)
3636
import("rt.private.build.rtflags")

0 commit comments

Comments
 (0)