separate br_overlay for different arch targets

Signed-off-by: carbon <carbon@milkv.io>
2024-06-17 17:12:31 +08:00
parent d59ecff63d
commit 14ceaecf46
10 changed files with 4 additions and 6 deletions
--- a/build/Makefile
+++ b/build/Makefile
@ -556,7 +556,10 @@ br-rootfs-prepare:
 	${Q}cp -arf ${SYSTEM_OUT_DIR}/* $(BR_ROOTFS_DIR)/mnt/system/

 	# copy milkv overlay files
-	${Q}cp -arf $(TOP_DIR)/device/common/br_overlay/* $(BR_ROOTFS_DIR)/
+	${Q}cp -arf $(TOP_DIR)/device/common/br_overlay/common/* $(BR_ROOTFS_DIR)/
+ifneq ($(wildcard $(TOP_DIR)/device/common/br_overlay/$(SDK_VER)),)
+	${Q}cp -arf $(TOP_DIR)/device/common/br_overlay/$(SDK_VER)/* $(BR_ROOTFS_DIR)/
+endif

 	# clean this directory for multiple targets
 	${Q}rm -rf $(BR_OVERLAY_DIR)
--- a/device/common/br_overlay/.gitignore
+++ b/device/common/br_overlay/.gitignore
@ -1,5 +0,0 @@
-mnt/system/
-mnt/cfg/
-mnt/data/
-usr/bin
-usr/share
--- a/device/common/br_overlay/common/etc/init.d/S99user
+++ b/device/common/br_overlay/common/etc/init.d/S99user
--- a/device/common/br_overlay/common/etc/inittab
+++ b/device/common/br_overlay/common/etc/inittab
--- a/device/common/br_overlay/common/etc/profile
+++ b/device/common/br_overlay/common/etc/profile
--- a/device/common/br_overlay/common/etc/run_usb.sh
+++ b/device/common/br_overlay/common/etc/run_usb.sh
--- a/device/common/br_overlay/common/etc/uhubon.sh
+++ b/device/common/br_overlay/common/etc/uhubon.sh
--- a/device/common/br_overlay/common/usr/local/bin/autologin
+++ b/device/common/br_overlay/common/usr/local/bin/autologin
--- a/device/common/br_overlay/musl_riscv64/lib/ld-musl-riscv64v0p7_xthead.so.1
+++ b/device/common/br_overlay/musl_riscv64/lib/ld-musl-riscv64v0p7_xthead.so.1
--- a/device/common/br_overlay/musl_riscv64/usr/lib64v0p7_xthead/lp64d/libc.so
+++ b/device/common/br_overlay/musl_riscv64/usr/lib64v0p7_xthead/lp64d/libc.so