From df468fe27705ce35270b62d60e145e73f4699dc9 Mon Sep 17 00:00:00 2001
From: sun_fan <sun_fan1@hoperun.com>
Date: Tue, 3 Aug 2021 23:56:44 +0800
Subject: [PATCH 1/3] toybox: add lib to updater image

Signed-off-by: sun_fan <sun_fan1@hoperun.com>
---
 BUILD.gn | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index 2a697b0..cbb29ae 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -686,6 +686,130 @@ if (defined(ohos_lite)) {
       "-lm",
       "-lcrypt",
     ]
+    symlink_target_name = [
+      "base64",
+      "basename",
+      "blockdev",
+      "cal",
+      "cat",
+      "chgrp",
+      "chmod",
+      "chown",
+      "chroot",
+      "clear",
+      "comm",
+      "cp",
+      "cpio",
+      "cut",
+      "date",
+      "dd",
+      "devmem",
+      "df",
+      "diff",
+      "dirname",
+      "dmesg",
+      "du",
+      "echo",
+      "env",
+      "expr",
+      "false",
+      "file",
+      "find",
+      "free",
+      "fsync",
+      "getconf",
+      "groups",
+      "gunzip",
+      "gzip",
+      "head",
+      "hostname",
+      "id",
+      "ifconfig",
+      "insmod",
+      "install",
+      "ionice",
+      "kill",
+      "killall",
+      "ln",
+      "logname",
+      "losetup",
+      "ls",
+      "lsmod",
+      "lsusb",
+      "md5sum",
+      "mkdir",
+      "mknod",
+      "mount",
+      "mountpoint",
+      "mv",
+      "nl",
+      "nohup",
+      "nproc",
+      "nsenter",
+      "patch",
+      "pgrep",
+      "pidof",
+      "pkill",
+      "pmap",
+      "printenv",
+      "printf",
+      "ps",
+      "pwd",
+      "readlink",
+      "realpath",
+      "restorecon",
+      "rm",
+      "rmdir",
+      "rmmod",
+      "runcon",
+      "sed",
+      "sendevent",
+      "seq",
+      "setsid",
+      "sha1sum",
+      "sha224sum",
+      "sha256sum",
+      "sha384sum",
+      "sha512sum",
+      "sleep",
+      "sort",
+      "split",
+      "stat",
+      "strings",
+      "swapoff",
+      "swapon",
+      "sync",
+      "sysctl",
+      "tac",
+      "tail",
+      "taskset",
+      "tee",
+      "time",
+      "timeout",
+      "top",
+      "touch",
+      "tr",
+      "true",
+      "truncate",
+      "tty",
+      "ulimit",
+      "umount",
+      "uname",
+      "uniq",
+      "unlink",
+      "uptime",
+      "usleep",
+      "vmstat",
+      "watch",
+      "wc",
+      "which",
+      "xargs",
+      "yes",
+      "zcat",
+    ]
+    part_name = "init"
+    module_install_dir = "bin"
+    install_images = [ "system", "updater" ]
     install_enable = true
   }
 }
-- 
Gitee


From 9c0601b2df407a2a37ffbb29ddd5f71f14968fba Mon Sep 17 00:00:00 2001
From: sun_fan <sun_fan1@hoperun.com>
Date: Wed, 4 Aug 2021 17:33:50 +0800
Subject: [PATCH 2/3] toybox: remove module_install_dir

Signed-off-by: sun_fan <sun_fan1@hoperun.com>
---
 BUILD.gn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BUILD.gn b/BUILD.gn
index cbb29ae..36af4f9 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -808,7 +808,6 @@ if (defined(ohos_lite)) {
       "zcat",
     ]
     part_name = "init"
-    module_install_dir = "bin"
     install_images = [ "system", "updater" ]
     install_enable = true
   }
-- 
Gitee


From cbde00e3c87a11b0f62683de79530451b39147e4 Mon Sep 17 00:00:00 2001
From: sun_fan <sun_fan1@hoperun.com>
Date: Wed, 4 Aug 2021 22:00:11 +0800
Subject: [PATCH 3/3] toybox: gn format

Signed-off-by: sun_fan <sun_fan1@hoperun.com>
---
 BUILD.gn | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 36af4f9..cdd6adb 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -135,7 +135,10 @@ if (defined(ohos_lite)) {
       "toys/pending/bootchartd.c",
       "toys/pending/diff.c",
       "toys/pending/getty.c",
+      "toys/pending/mdev.c",
       "toys/pending/more.c",
+      "toys/pending/route.c",
+      "toys/pending/telnetd.c",
       "toys/posix/basename.c",
       "toys/posix/cal.c",
       "toys/posix/cat.c",
@@ -203,9 +206,6 @@ if (defined(ohos_lite)) {
       "toys/posix/wc.c",
       "toys/posix/who.c",
       "toys/posix/xargs.c",
-      "toys/pending/mdev.c",
-      "toys/pending/telnetd.c",
-      "toys/pending/route.c"
     ]
 
     include_dirs = [ "./" ]
@@ -440,7 +440,7 @@ if (defined(ohos_lite)) {
     "bin/zcat",
     "bin/mdev",
     "bin/telnetd",
-    "bin/route"
+    "bin/route",
   ]
 
   foreach(path, cmd_long_path) {
@@ -577,7 +577,10 @@ if (defined(ohos_lite)) {
       "toys/pending/bootchartd.c",
       "toys/pending/diff.c",
       "toys/pending/getty.c",
+      "toys/pending/mdev.c",
       "toys/pending/more.c",
+      "toys/pending/route.c",
+      "toys/pending/telnetd.c",
       "toys/posix/basename.c",
       "toys/posix/cal.c",
       "toys/posix/cat.c",
@@ -645,9 +648,6 @@ if (defined(ohos_lite)) {
       "toys/posix/wc.c",
       "toys/posix/who.c",
       "toys/posix/xargs.c",
-      "toys/pending/mdev.c",
-      "toys/pending/telnetd.c",
-      "toys/pending/route.c"
     ]
 
     include_dirs = [ "./" ]
@@ -808,7 +808,10 @@ if (defined(ohos_lite)) {
       "zcat",
     ]
     part_name = "init"
-    install_images = [ "system", "updater" ]
+    install_images = [
+      "system",
+      "updater",
+    ]
     install_enable = true
   }
 }
-- 
Gitee