Skip to content

Commit 874153c

Browse files
authored
Merge pull request #60 from rcitach/lib
Fix the situation where busybox cannot start normally
2 parents 9dcc7a2 + bba55dc commit 874153c

17 files changed

Lines changed: 25 additions & 7 deletions

File tree

repo/packages/a/aarch64-smart-musleabi/xmake.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ do
3636
if (version and sha256) then
3737
add_versions(version, sha256)
3838
else
39-
add_versions("203958-15706d647d", "49571ae1228a50b1836e5580448e5fe597af6a3346bd6d7b3d21459c29f4c0b8")
39+
add_versions("236309-e8ed057a81", "5052119f31187202be7b5f377ef779671052e6d0f6db3009d51f46cbba1ada9a")
4040
end
4141
elseif is_host("linux") then
4242
add_urls(
@@ -45,7 +45,7 @@ do
4545
if (version and sha256) then
4646
add_versions(version, sha256)
4747
else
48-
add_versions("203958-15706d647d", "f76ea0fabe245b20585f3bf86003a76183a2cad6d07c939877f211439c94dc9f")
48+
add_versions("236309-e8ed057a81", "3ac533662fbe412102d99546ac53776b117247cb54717c5bbdbb403b54fe1326")
4949
end
5050
end
5151

repo/packages/a/arm-smart-musleabi/xmake.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ do
3636
if (version and sha256) then
3737
add_versions(version, sha256)
3838
else
39-
add_versions("203958-15706d647d", "79b0e2afef8475b689ba7477d25fb67eda123d4aa135aa2d50dbac4744bc1d05")
39+
add_versions("236309-e8ed057a81", "9547fd4df1f7da5d24a42798154a743adf6305b77cb8c113f48b2d4134db3fc7")
4040
end
4141
elseif is_host("linux") then
4242
add_urls(
@@ -45,7 +45,7 @@ do
4545
if (version and sha256) then
4646
add_versions(version, sha256)
4747
else
48-
add_versions("203958-15706d647d", "69d0b888297ac8236c59d90c3affcd71f831f8dc9ac058dcdfb024006f955ce3")
48+
add_versions("236309-e8ed057a81", "08822163eecf4bd8cd0ae8c2d19bc9546ca749d7a862f5a7c881c4f5e1c17262")
4949
end
5050
end
5151

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright (c) 2006-2024, RT-Thread Development Team
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
# Run getty & login
6+
# console::respawn:/sbin/getty 115200 /dev/console
7+
8+
# or without login, a direct access to shell
9+
console::respawn:-/bin/ash

repo/packages/b/busybox/scripts/deploy.lua

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
--
2323
import("rt.rt_utils")
2424

25-
function main(rootfs, installdir)
25+
function main(rootfs, installdir, version)
2626
for _, filepath in ipairs(os.files(path.join(installdir, "bin") .. "/*")) do
2727
local filename = path.filename(filepath)
2828
rt_utils.cp_with_symlink(filepath, path.join(rootfs, "bin", filename))
@@ -42,4 +42,11 @@ function main(rootfs, installdir)
4242
local filename = path.filename(filepath)
4343
rt_utils.cp_with_symlink(filepath, path.join(rootfs, "sbin", filename))
4444
end
45+
46+
for _, filepath in ipairs(os.files(path.join(os.scriptdir():match(".*/"), "port", version) .. "/*")) do
47+
if not filepath:match("%.config$") then
48+
local filename = path.filename(filepath)
49+
rt_utils.cp_with_symlink(filepath, path.join(rootfs, "etc", filename))
50+
end
51+
end
4552
end

sdk/lib/aarch64/cortex-a/libcxx.a

-7.91 KB
Binary file not shown.

sdk/lib/aarch64/cortex-a/libcxx.so

54.5 KB
Binary file not shown.

sdk/lib/arm/cortex-a/libcxx.a

-5.89 KB
Binary file not shown.

sdk/lib/arm/cortex-a/libcxx.so

54.9 KB
Binary file not shown.

sdk/lib/risc-v/rv64gc/libcxx.a

-17 KB
Binary file not shown.

sdk/lib/risc-v/rv64gc/libcxx.so

-6.23 KB
Binary file not shown.

0 commit comments

Comments
 (0)