Use buildroot from ologn

This commit is contained in:
Huy Duong 2024-09-02 09:56:57 +07:00
parent e79fd21975
commit af1ad8a889
6 changed files with 21 additions and 17 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "ubuntu"]
path = sysdrv/tools/board/ubuntu
url = https://github.com/luckfox-eng33/pico_ubuntu.git
[submodule "sysdrv/source/buildroot/buildroot-2023.02.6"]
path = sysdrv/source/buildroot/buildroot-2023.02.6
url = git@github.com:ologn-tech/luckfox_pico_buildroot.git

View File

@ -2204,11 +2204,11 @@ function build_allsave() {
function buildroot_config() {
if [ "${LF_TARGET_ROOTFS}" == "buildroot" ]; then
if [ -d "$BUILDROOT_PATH" ]; then
msg_info "Buildroot has been created"
else
make buildroot_create -C ${SDK_SYSDRV_DIR}
fi
# if [ -d "$BUILDROOT_PATH" ]; then
# msg_info "Buildroot has been created"
# else
# make buildroot_create -C ${SDK_SYSDRV_DIR}
# fi
if [ -f $BUILDROOT_CONFIG_FILE ]; then
BUILDROOT_CONFIG_FILE_MD5=$(md5sum "$BUILDROOT_CONFIG_FILE")

2
sysdrv/.gitignore vendored
View File

@ -6,7 +6,7 @@ kmod-29
out
# source
source/busybox
source/buildroot
# source/buildroot
# source/kernel
# source/uboot
tools/board/android-tools/android-tools/

View File

@ -566,17 +566,17 @@ buildroot_create:
buildroot: prepare
@echo -e "$(C_GREEN) ==sysdrv== build buildroot $(C_NORMAL)"
test -d $(BUILDROOT_DIR)/$(BUILDROOT_VER) || (\
mkdir -p $(BUILDROOT_DIR) ;\
tar xzf $(SYSDRV_DIR)/tools/board/buildroot/$(BUILDROOT_VER).tar.gz -C $(BUILDROOT_DIR) ;\
cp $(SYSDRV_DIR)/tools/board/buildroot/luckfox_pico_defconfig $(BUILDROOT_DIR)/$(BUILDROOT_VER)/configs/ ;\
cp $(SYSDRV_DIR)/tools/board/buildroot/luckfox_pico_w_defconfig $(BUILDROOT_DIR)/$(BUILDROOT_VER)/configs/ ;\
cp $(SYSDRV_DIR)/tools/board/buildroot/busybox.config $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/busybox/ ;\
cp ${HCITOOL_TOOL_PATH}/0001-Fixed-header-file-errors.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/bluez5_utils/ ;\
cp ${HCITOOL_TOOL_PATH}/0002-Fix-build-errors.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/bluez5_utils/ ;\
cp ${HCITOOL_TOOL_PATH}/0003-fix-compat-wordexp.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/bluez5_utils/ ;\
cp ${MPV_PATCH_PATH}/0002-change-j1.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/mpv/ ;\
);
# test -d $(BUILDROOT_DIR)/$(BUILDROOT_VER) || (\
# mkdir -p $(BUILDROOT_DIR) ;\
# tar xzf $(SYSDRV_DIR)/tools/board/buildroot/$(BUILDROOT_VER).tar.gz -C $(BUILDROOT_DIR) ;\
# cp $(SYSDRV_DIR)/tools/board/buildroot/luckfox_pico_defconfig $(BUILDROOT_DIR)/$(BUILDROOT_VER)/configs/ ;\
# cp $(SYSDRV_DIR)/tools/board/buildroot/luckfox_pico_w_defconfig $(BUILDROOT_DIR)/$(BUILDROOT_VER)/configs/ ;\
# cp $(SYSDRV_DIR)/tools/board/buildroot/busybox.config $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/busybox/ ;\
# cp ${HCITOOL_TOOL_PATH}/0001-Fixed-header-file-errors.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/bluez5_utils/ ;\
# cp ${HCITOOL_TOOL_PATH}/0002-Fix-build-errors.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/bluez5_utils/ ;\
# cp ${HCITOOL_TOOL_PATH}/0003-fix-compat-wordexp.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/bluez5_utils/ ;\
# cp ${MPV_PATCH_PATH}/0002-change-j1.patch $(BUILDROOT_DIR)/$(BUILDROOT_VER)/package/mpv/ ;\
# );
$(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) $(BUILDROOT_DEFCONFIG) -C $(BUILDROOT_DIR)/$(BUILDROOT_VER)
$(SYSDRV_DIR)/tools/board/mirror_select/buildroot_mirror_select.sh $(BUILDROOT_DIR)/$(BUILDROOT_VER)/.config

@ -0,0 +1 @@
Subproject commit 19a3fe94b10cde26b44c6375fa55d316ff775832