Commit Graph

55 Commits

Author SHA1 Message Date
Caoruihong df35eb513d chore(make): optimize build scripts
Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: Ibb4223ef2d032a03950263b766414ca1c021e69a
2021-08-30 17:18:21 +08:00
Caoruihong 682ae82158 chore: enable make of mksh and toybox
Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: Ie152b0ad21af5dc8e8c31c71f236500e5726e1c4
2021-08-25 01:46:41 +08:00
Caoruihong 0e260949c9 feat(make): optimize makefiles and remove some unused files
Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: Ie2dfa7334417ccd55bd56a19a7882a982ce49cab
2021-08-22 04:23:40 +08:00
Caoruihong e1b9a6b185 chore(make): update Makefile
remove some unused Makefile code and optimize some code

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I1c31d07481bb6aee47b0c51d63d6b68316c38c88
2021-08-17 21:34:01 +08:00
openharmony_ci fb5df47b6c !541 feat: 自研shell命令回补
Merge pull request !541 from Kiita/shell_cmd_0812
2021-08-13 07:44:49 +00:00
Kiita 7bc68f454f feat: 自研shell命令回补
【背景】liteos_a需要支持toybox缺失的自研shell命令

【修改方案】
新增自研shell命令的入口判断场景,使得mksh可以执行自研shell的命令

re #I44U0H

Signed-off-by: yansira <yansira@hotmail.com>
Change-Id: Idf08cb6df456bd6c89fe8fe505317f1c0ca61eda
2021-08-12 21:34:50 +08:00
Guangyao Ma 77dcef4bc0 fix: clang相关编译选项隔离
liteos_a在apps/mksh和apps/toybox编译中,clang相关编译选项未进行隔离。之后支持
其他类似gcc编译时,可能存在编译问题。
其中 --target=$(LLVM_TARGET) $(LLVM_SYSROOT) 是clang编译特有的编译选项,需要被
隔离。

close #I444AV

Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
Change-Id: Ib11453aa0b3ee6bcdf3104d13d166c65f2202527
2021-08-09 10:32:14 +08:00
openharmony_ci 343b92661d !488 保留未strip的mksh和toybox用于调试
Merge pull request !488 from Caoruihong/unstripped_mksh_toybox
2021-08-03 03:07:32 +00:00
openharmony_ci 79982895ec !479 fix: 去掉冗余的strip操作
Merge pull request !479 from MGY917/toybox_strip_twice
2021-08-03 03:01:04 +00:00
Caoruihong 8de96bba65 chore: also copy unstripped version of mksh and toybox
stripped version used to pack rootfs image, unstripped
used for debug.

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I07673238772d6995426ec8b1cff43f1abfea7049
2021-08-03 00:10:37 +08:00
Guangyao Ma 7819d15b36 fix: 去掉冗余的strip操作
toybox源码编译时,默认会进行strip操作,如下步骤:

//third_party/toybox/scripts/make.sh:340:
! do_loudly ${CROSS_COMPILE}${STRIP} "$UNSTRIPPED" -o "$OUTNAME"

因此在打包的Makefile中再进行STRIP操作是冗余的。

close #I43767

Change-Id: I10a9861b682eb8e556b7af7519c9109eef0b3a94
Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
2021-07-30 16:58:53 +08:00
Caoruihong c54bfa16e3 feat: enable gn build for toybox and mksh
toybox and mksh are built by gn now, and make build
for toybox and mksh are disabled now.

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I46810ab418344d9841ec55cb9f1ad2dc2d15b008
2021-07-30 10:11:02 +08:00
Kiita 76f45b3fb2 fix: toybox命令升级
【背景】liteos_a toybox 命令升级升级

【修改方案】
1、help命令列表不支持命令删除。
2、cp命令和mv命令拷贝文件失败和文件损坏等问题修复。
3、修复du命令统计nfs文件大小为0问题修复。
4、修复ls命令nfs文件时间打印信息有误问题。
5、更新命令不支持入参列表。

re #I41N2A

Signed-off-by: yansira <yansira@hotmail.com>
Change-Id: I5f5b82e33ba9193ae06e9547182d5b7bac0a3b44
2021-07-22 23:40:40 +08:00
openharmony_ci fa056ce246 !445 toybox支持reboot命令
Merge pull request !445 from Kiita/toybox_cmd_reboot
2021-07-22 08:44:53 +00:00
openharmony_ci 8755dc9d35 !443 从Make编译切换到GN编译
Merge pull request !443 from Caoruihong/build_gn
2021-07-22 01:50:19 +00:00
Caoruihong a8805a65aa feat: add support for gn build system
add BUILD.gn for all kernel modules

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I018446427bf64615f2596d47862b219659b58b34
2021-07-21 15:52:40 +08:00
Guangyao Ma 51a50c95b4 feat: support .mkshrc
close #I3Y5KE

Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
Change-Id: Iea3cfe4da572b1a4e250f90cea24efa2c27ceddb
2021-07-20 14:37:30 +08:00
Guangyao Ma cacb4f0103 feat: active mksh & toybox
Close #I3VEOG

Change-Id: Ibc73aacf68c65e64b88084edfd3549b3137dde07
Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
2021-07-09 17:07:06 +08:00
openharmony_ci b29d9d88ab !412 fix: mksh compile bug fix
Merge pull request !412 from MGY917/fix_waitpid
2021-07-08 03:25:08 +00:00
Guangyao Ma d8263b1e91 fix: mksh compile bug fix
编译框架整改,需要所有交叉编译指定sysroot以及arch相关的编译选项,用来在编译链
接过程中在指定的sysroot路径下,寻找符合arch要求的依赖库。往往,sysroot选项和
arch选项需要同时出现在编译链接选项中。

close #I3ZMR7

Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
Change-Id: If2249721e0e35615b95f5525e57241aae910c212
2021-07-08 10:48:39 +08:00
Caoruihong ac8c2c6d5b fix: minimal compile
fix compile errors in minimal compilation

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I48f4f7b27c684e2c747c1949776c5c4f9e383dec
2021-07-07 00:26:33 +08:00
Kiita e567a10d02 feat: 新增toybox reboot命令
【背景】liteos_a测试套需要reboot命令

【修改方案】
在third_party/toybox/porting新增reboot.c文件,并作自定义修改。
新增reboot命令的支持说明。

re #I3YQ7S

Signed-off-by: yansira <yansira@hotmail.com>
Change-Id: I686a535adbad78935eee04fc283a837a4a7f13f6
2021-07-01 21:12:31 +08:00
Caoruihong d7672d47f2 chore: make liteos_a can be built alone
in the liteos_a directory, we used to use `make clean all` command
to build liteos_a kernel for test.

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I5ca689c1c44052f7de937d7faa9e4d3534d97380
2021-06-30 18:44:46 +08:00
Caoruihong 9e45086d19 chore: pass sysroot and arch related cflags by BUILD.gn
sysroot and arch related cflags are pass by BUILD.gn now.

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: Ia6000dd7ed8a8a37e935ace49d8460a919a16566
2021-06-28 16:31:02 +08:00
Guangyao Ma eca711bb64 fix: avoid compile warning ignored
Close #I3VOAO

Change-Id: I42103e0e7061e50f8d63df98ea9f5cecd49fe6f4
Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
2021-06-15 19:56:21 +08:00
Guangyao Ma 561831928b feat: support toybox in qemu
Close #I3V17D

Change-Id: Idfe47eedd4b7c84cc2d15b5f3365d90a5b79232e
Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
2021-06-09 16:11:21 +08:00
openharmony_ci 1f8e5424f3 !306 refactor(mksh): reduce the mksh size by Oz
Merge pull request !306 from MGY917/mksh_size_reduce
2021-06-09 13:43:38 +08:00
Guangyao Ma 565b2e85cd refactor(mksh): reduce the mksh size by Oz
clang不支持“-flto,-Oz”作为链接选项,但是可以作为编译选项,且作为编译选项时,有更好的size减少效果。这里为了使用这种
编译选项组合,且为了不影响链接过程(Build.sh链接时也会使用CFLAGS),在链接选项生效的-O选项中,重置其为O2。
最终size可以从300+k,缩减为不到180k。

Close #I3UVEV

Change-Id: If29ac4a058bcd40c4c36deb484c9468c93bcd1ec
Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>
2021-06-08 21:57:27 +08:00
openharmony_ci 1a3f3f54e7 !302 fix: Codex告警清零
Merge pull request !302 from Far/master
2021-06-08 08:48:48 +08:00
Kiita 09756fe55b refactor: 对toybox侵入式修改进行分离
【背景】当前liteos_a支持的toybox命令与linux存在差别,需要特别实现,为
避免侵入式修改,采用porting的方式将修改分离。

【修改方案】
在third_party/toybox下新增porting目录,以达到分离修改的目的。本次修改
基于porting目录且只涉及liteos目前支持的命令文件。

re #I3UQCK

Signed-off-by: yansira <yansira@hotmail.com>
Change-Id: I15d5835e25d5b5de6e0a6f888c87264c2f886cdf
2021-06-07 21:54:12 +08:00
Far b5370af822 fix: codex clean
1. 修复可能对NULL指针解引用的场景
2. 将不修改内容的指针入参修改为const
3. 对getpgrp的返回值进行校验后再使用
4. 修复了局部变量未初始化的问题

Close #I3UOFN

Signed-off-by: Far <yesiyuan2@huawei.com>
2021-06-07 17:08:02 +08:00
openharmony_ci 9b364500ad !252 删除冗余宏定义OFFSET_OF_FIELD
Merge pull request !252 from JerryH/list
2021-05-21 09:54:18 +08:00
YOUR_NAME 9b4129c949 Remove redundant macro definition(OFFSET_OF_FIELD)
Close #I3QMN1

Change-Id: I0ddd0c4474f5f6b5a2b1dd6608d642167b5548e6
2021-05-19 11:20:09 +08:00
openharmony_ci a5de5e0cff !251 fix: clang10 lld could not recognized Oz
Merge pull request !251 from MGY917/master
2021-05-19 11:14:19 +08:00
Guangyao Ma 87a0006d5e fix: clang10 lld could not recognized Oz
Change-Id: I73055c0d9b9ceb27adb687089be4d332ec323b9c
2021-05-19 09:37:38 +08:00
SimonLi e38f9a98c9 fix: mkdir -p is more robust 2021-05-13 19:20:26 +08:00
SimonLi bef4ab9835 fix: rebuild mksh depends on rebuild.sh script 2021-05-13 19:03:43 +08:00
Guangyao Ma 044f2c7c17 fix: do not build toybox temporarily
Change-Id: I5fc289f6f657fe8dfad0131df51571892749d172
2021-05-11 20:42:37 +08:00
Guangyao Ma 41c7689dfa feat: introduce mksh toybox to rootfs
Change-Id: I0a6e6f2962ca6904c858898eb93a5b2f93e85b69
2021-05-06 19:20:35 +08:00
Caoruihong 7e73c929a2 remove __cplusplus guards in .c files
Change-Id: I052d930d54e63179b17b77f02c107a015f3cfc3f
2021-04-19 18:28:25 +08:00
openharmony_ci 7d8d337b52 !64 【轻量级 PR】:update apps/shell/builtin/cd.c.
Merge pull request !64 from 冷钦街/N/A
2021-03-25 11:22:55 +08:00
openharmony_ci 8472f4d774 !66 【轻量级 PR】:update apps/shell/src/shcmd.c.
Merge pull request !66 from 冷钦街/N/A
2021-03-25 11:19:15 +08:00
openharmony_ci 61531ce9e0 !65 【轻量级 PR】:update apps/shell/src/shcmd.c.
Merge pull request !65 from 冷钦街/N/A
2021-03-25 11:19:13 +08:00
openharmony_ci a50adf047a !67 【轻量级 PR】:update apps/shell/src/shcmd.c.
Merge pull request !67 from 冷钦街/N/A
2021-03-24 17:31:47 +08:00
openharmony_ci 996047a7e2 !82 轻内核VFS层重构,添加路径缓存
Merge pull request !82 from 野生毛霉君/noEmployeeNum_ChangeID_13306388_wangchenyang
2021-03-23 14:45:14 +08:00
openharmony_ci f890dc8473 !68 【轻量级 PR】:update apps/shell/src/shmsg.c.
Merge pull request !68 from 冷钦街/N/A
2021-03-19 19:06:26 +08:00
wangchenyang d970750808 Description:vfs refactoring
Feature or Bugfix:Feature
Binary Source:Huawei
PrivateCode(Yes/No):Yes

Change-Id: I175d2648bc6f9078c34de2c0a5c93fda10b86c47
ChangeID:13306388
2021-03-19 13:22:46 +08:00
mamingshuai 73a7b66116 update openharmony 1.0.1 2021-03-11 18:43:57 +08:00
冷钦街 b527fded62 update apps/shell/src/shmsg.c. 2021-02-05 15:04:36 +08:00
冷钦街 5c1c24137f update apps/shell/src/shcmd.c. 2021-02-05 12:24:45 +08:00