diff --git a/repo/packages/b/busybox/port/1.35.0/inittab b/repo/packages/b/busybox/port/1.35.0/inittab new file mode 100644 index 0000000..15d6f65 --- /dev/null +++ b/repo/packages/b/busybox/port/1.35.0/inittab @@ -0,0 +1,9 @@ +# Copyright (c) 2006-2024, RT-Thread Development Team +# +# SPDX-License-Identifier: Apache-2.0 + +# Run getty & login +# console::respawn:/sbin/getty 115200 /dev/console + +# or without login, a direct access to shell +console::respawn:-/bin/ash \ No newline at end of file diff --git a/repo/packages/b/busybox/scripts/deploy.lua b/repo/packages/b/busybox/scripts/deploy.lua index 74a91ed..c4f1588 100644 --- a/repo/packages/b/busybox/scripts/deploy.lua +++ b/repo/packages/b/busybox/scripts/deploy.lua @@ -22,7 +22,7 @@ -- import("rt.rt_utils") -function main(rootfs, installdir) +function main(rootfs, installdir, version) for _, filepath in ipairs(os.files(path.join(installdir, "bin") .. "/*")) do local filename = path.filename(filepath) rt_utils.cp_with_symlink(filepath, path.join(rootfs, "bin", filename)) @@ -42,4 +42,11 @@ function main(rootfs, installdir) local filename = path.filename(filepath) rt_utils.cp_with_symlink(filepath, path.join(rootfs, "sbin", filename)) end + + for _, filepath in ipairs(os.files(path.join(os.scriptdir():match(".*/"), "port", version) .. "/*")) do + if not filepath:match("%.config$") then + local filename = path.filename(filepath) + rt_utils.cp_with_symlink(filepath, path.join(rootfs, "etc", filename)) + end + end end diff --git a/tools/scripts/tasks/smart-rootfs/on_run.lua b/tools/scripts/tasks/smart-rootfs/on_run.lua index 06f4419..45305f3 100644 --- a/tools/scripts/tasks/smart-rootfs/on_run.lua +++ b/tools/scripts/tasks/smart-rootfs/on_run.lua @@ -19,7 +19,8 @@ -- Date Author Notes -- ------------ ---------- ----------------------------------------------- -- 2023-05-09 xqyjlj initial version --- +-- 2024-11-11 rcitach add version get + import("core.project.config") import("core.project.project") import("core.base.option") @@ -69,6 +70,7 @@ function deploy_package(rootfs) local repo = instance:repo() local packagename = requireinfo.originstr local installdir = instance:installdir() + local version = instance:version_str() local repodir = repo:url() local reponame = repo:name() if string.find(packagename, "%s") then @@ -78,7 +80,7 @@ function deploy_package(rootfs) path.join(repodir, "packages", packagename:sub(1, 1), packagename, "scripts", "deploy.lua") if os.isfile(deploy_script) then vprint("run script => '%s'", deploy_script) - import("deploy", {rootdir = path.directory(deploy_script)}).main(rootfs, installdir) + import("deploy", {rootdir = path.directory(deploy_script)}).main(rootfs, installdir, version) end local package_rootfs = path.join(repodir, "packages", packagename:sub(1, 1), packagename, "rootfs") if os.isdir(package_rootfs) then