diff --git a/br-ext-chip-sigmastar/board/infinity6e/kernel/patches/01_infinity6e_kernel_4.9.84_sdk-python3_support.patch b/br-ext-chip-sigmastar/board/infinity6e/kernel/patches/01_infinity6e_kernel_4.9.84_sdk-python3_support.patch new file mode 100644 index 00000000..9c1be9c8 --- /dev/null +++ b/br-ext-chip-sigmastar/board/infinity6e/kernel/patches/01_infinity6e_kernel_4.9.84_sdk-python3_support.patch @@ -0,0 +1,43 @@ +diff --git a/scripts/ms_bin_option_update_int.py b/scripts/ms_bin_option_update_int.py +index a515e5e872af..a538d1903802 100755 +--- a/scripts/ms_bin_option_update_int.py ++++ b/scripts/ms_bin_option_update_int.py +@@ -6,13 +6,13 @@ if __name__ == '__main__': + + name=sys.argv[2] + if sys.argv[3].upper().startswith( '0X' ): +- value=long(sys.argv[3],16) ++ value=int(sys.argv[3],16) + else: +- value=long(sys.argv[3]) ++ value=int(sys.argv[3]) + + fmap=mmap.mmap(os.open(sys.argv[1],os.O_RDWR),0) + +- offset=fmap.find(name) ++ offset=fmap.find(name.encode()) + # print ('%s:%d\n' % (name,offset)) + if offset < 0: + print ('error finding ms_bin_option:%s in %s\n' % (name,sys.argv[1])) +diff --git a/scripts/ms_builtin_dtb_update.py b/scripts/ms_builtin_dtb_update.py +index 787ab98e4747..9214d9a79ad0 100755 +--- a/scripts/ms_builtin_dtb_update.py ++++ b/scripts/ms_builtin_dtb_update.py +@@ -6,7 +6,7 @@ if __name__ == '__main__': + + name='#MS_DTB#' + +- dtb_file=open(sys.argv[2]) ++ dtb_file=open(sys.argv[2], 'rb') + dtb_file.seek(0,os.SEEK_END) + size=dtb_file.tell() + dtb_file.seek(0,os.SEEK_SET) +@@ -19,7 +19,7 @@ if __name__ == '__main__': + + fmap=mmap.mmap(os.open(sys.argv[1],os.O_RDWR),0) + +- offset=fmap.find(name) ++ offset=fmap.find(name.encode()) + if offset >=0: + print ('offset:0x%08X' % offset) + print (' size:0x%08X' % size ) diff --git a/br-ext-chip-sigmastar/configs/ssc338q_sdcard_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_sdcard_defconfig index 3858bee5..4bfec41f 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_sdcard_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_sdcard_defconfig @@ -76,7 +76,6 @@ BR2_PACKAGE_OPUS_OPENIPC=y BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y BR2_PACKAGE_SIGMASTAR_OSDRV_SENSOR="imx415" -BR2_PACKAGE_SIGMASTAR_SENSOR_OPENIPC=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y # BR2_PACKAGE_SSHPASS is not set diff --git a/br-ext-chip-sigmastar/linux/linux-ext-sigmastar_initramfs.mk b/br-ext-chip-sigmastar/linux/linux-ext-sigmastar_initramfs.mk index 2d26bebd..1431962c 100644 --- a/br-ext-chip-sigmastar/linux/linux-ext-sigmastar_initramfs.mk +++ b/br-ext-chip-sigmastar/linux/linux-ext-sigmastar_initramfs.mk @@ -14,29 +14,31 @@ SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION = 4.2 SIGMASTAR_INITRAMFS_DOSFSTOOLS_SOURCE = dosfstools-$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION).tar.gz SIGMASTAR_INITRAMFS_DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION) +SIGMASTAR_INITRAMFS_TOOLCHAIN_SOURCE = cortex_a7_thumb2_hf-gcc8.4.0-musl-4_9-1e913a17.tgz +SIGMASTAR_INITRAMFS_TOOLCHAIN_SITE = https://github.com/openipc/firmware/releases/download/latest + SIGMASTAR_INITRAMFS_BUSYBOX_PATH = $(HOST_DIR)/source/busybox-$(SIGMASTAR_INITRAMFS_BUSYBOX_VERSION) SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH = $(HOST_DIR)/source/dosfstools-$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION) -SIGMASTAR_INITRAMFS_TOOLCHAIN = $(PER_PACKAGE_DIR)/toolchain/host/bin/$(GNU_TARGET_NAME)-gcc +SIGMASTAR_INITRAMFS_TOOLCHAIN_PATH = $(HOST_DIR)/source/arm-openipc-linux-musleabihf_sdk-buildroot/bin define SIGMASTAR_INITRAMFS_PREPARE_KERNEL mkdir -p $(LINUX_DIR)/initramfs cp -f $(SIGMASTAR_INITRAMFS_PKGDIR)/files/* $(LINUX_DIR)/initramfs - wget $(SIGMASTAR_INITRAMFS_BUSYBOX_SITE)/$(SIGMASTAR_INITRAMFS_BUSYBOX_SOURCE) \ - -P $(HOST_DIR)/source -c + wget $(SIGMASTAR_INITRAMFS_BUSYBOX_SITE)/$(SIGMASTAR_INITRAMFS_BUSYBOX_SOURCE) -P $(HOST_DIR)/source -c tar -xf $(HOST_DIR)/source/$(SIGMASTAR_INITRAMFS_BUSYBOX_SOURCE) -C $(HOST_DIR)/source - wget $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SITE)/$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SOURCE) \ - -P $(HOST_DIR)/source -c + wget $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SITE)/$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SOURCE) -P $(HOST_DIR)/source -c tar -xf $(HOST_DIR)/source/$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SOURCE) -C $(HOST_DIR)/source - cp -f $(SIGMASTAR_INITRAMFS_PKGDIR)/files/initramfs_defconfig \ - $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH)/.config - $(MAKE) CC=$(SIGMASTAR_INITRAMFS_TOOLCHAIN) -C $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH) + wget $(SIGMASTAR_INITRAMFS_TOOLCHAIN_SITE)/$(SIGMASTAR_INITRAMFS_TOOLCHAIN_SOURCE) -P $(HOST_DIR)/source -c + tar -xf $(HOST_DIR)/source/$(SIGMASTAR_INITRAMFS_TOOLCHAIN_SOURCE) -C $(HOST_DIR)/source + + cp -f $(SIGMASTAR_INITRAMFS_PKGDIR)/files/initramfs_defconfig $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH)/.config + $(MAKE) CROSS_COMPILE=$(SIGMASTAR_INITRAMFS_TOOLCHAIN_PATH)/arm-linux- -C $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH) cp -f $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH)/busybox $(LINUX_DIR)/initramfs cd $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH) && ./autogen.sh && ./configure - $(MAKE) CC=$(SIGMASTAR_INITRAMFS_TOOLCHAIN) CFLAGS="-static -s" \ - -C $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH) + $(MAKE) CC=$(SIGMASTAR_INITRAMFS_TOOLCHAIN_PATH)/arm-linux-gcc CFLAGS="-static -s" -C $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH) cp -f $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH)/src/fsck.fat $(LINUX_DIR)/initramfs endef