p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: do not override existing libs 

preserve existing newer libs under lib and libs dir

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I5f91554890186f7760a73accb246240683b0558b
This commit is contained in:
Caoruihong 2021-08-05 22:10:03 +08:00
parent 5edd78e756
commit 8118408123
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -180,12 +180,12 @@ $(APPS): $(LITEOS_TARGET) sysroot
prepare: prepare:
$(HIDE)mkdir -p $(OUT)/musl $(HIDE)mkdir -p $(OUT)/musl
ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
$(HIDE)cp -f $$($(CC) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CFLAGS) -print-file-name=libc.so) $(OUT)/musl $(HIDE)cp -fp $$($(CC) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CFLAGS) -print-file-name=libc.so) $(OUT)/musl
$(HIDE)cp -f $$($(GPP) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CXXFLAGS) -print-file-name=libc++.so) $(OUT)/musl $(HIDE)cp -fp $$($(GPP) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CXXFLAGS) -print-file-name=libc++.so) $(OUT)/musl
else else
$(HIDE)cp -f $(LITEOS_COMPILER_PATH)/target/usr/lib/libc.so $(OUT)/musl $(HIDE)cp -fp $(LITEOS_COMPILER_PATH)/target/usr/lib/libc.so $(OUT)/musl
$(HIDE)cp -f $(LITEOS_COMPILER_PATH)/arm-linux-musleabi/lib/libstdc++.so.6 $(OUT)/musl $(HIDE)cp -fp $(LITEOS_COMPILER_PATH)/arm-linux-musleabi/lib/libstdc++.so.6 $(OUT)/musl
$(HIDE)cp -f $(LITEOS_COMPILER_PATH)/arm-linux-musleabi/lib/libgcc_s.so.1 $(OUT)/musl $(HIDE)cp -fp $(LITEOS_COMPILER_PATH)/arm-linux-musleabi/lib/libgcc_s.so.1 $(OUT)/musl
$(STRIP) $(OUT)/musl/* $(STRIP) $(OUT)/musl/*
endif endif

6
tools/scripts/make_rootfs/rootfsdir.sh
View File

@ -46,14 +46,14 @@ if [ -d "${BIN_DIR}" ] && [ "$(ls -A "${BIN_DIR}")" != "" ]; then
for el in ${NEED_COPYTO_OUTDIR[@]} for el in ${NEED_COPYTO_OUTDIR[@]}
do do
if [ -e ${BIN_DIR}/$el ] && [ "${BIN_DIR}/$el" != "${OUT_DIR}/bin/$el" ]; then if [ -e ${BIN_DIR}/$el ] && [ "${BIN_DIR}/$el" != "${OUT_DIR}/bin/$el" ]; then
cp -f ${BIN_DIR}/$el ${OUT_DIR}/bin/$el cp -u ${BIN_DIR}/$el ${OUT_DIR}/bin/$el
fi fi
done done
fi fi
cp -f ${LIB_DIR}/* ${ROOTFS_DIR}/lib cp -f ${LIB_DIR}/* ${ROOTFS_DIR}/lib
cp -f ${LIB_DIR}/* ${OUT_DIR}/libs cp -u ${LIB_DIR}/* ${OUT_DIR}/libs
if [ -e ${ETC_DIR} ]; then if [ -e ${ETC_DIR} ]; then
cp -f ${ETC_DIR}/.mkshrc ${ROOTFS_DIR}/etc cp -f ${ETC_DIR}/.mkshrc ${ROOTFS_DIR}/etc
cp -f ${ETC_DIR}/.mkshrc ${OUT_DIR}/etc cp -u ${ETC_DIR}/.mkshrc ${OUT_DIR}/etc
fi fi