diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index f7cf9f68..348f801f 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -209,6 +209,14 @@ jobs: release: fpv - platform: gk7205v300 release: fpv + - platform: hi3516ev200 + release: lte + - platform: hi3516ev300 + release: lte + - platform: gk7205v200 + release: lte + - platform: gk7205v300 + release: lte # Original SDK test - platform: gk7205v200 @@ -478,7 +486,7 @@ jobs: esac case ${{ matrix.release }} in - lite|fpv) + lite|fpv|lte) check_exceeded uImage ${MAX_KERNEL_SIZE} check_exceeded rootfs.squashfs ${MAX_ROOTFS_SIZE} ;; diff --git a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig index c3900ecc..7154797a 100644 --- a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig @@ -91,7 +91,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y # BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set BR2_PACKAGE_RTL8812AU_OPENIPC=y # WIREGUARD diff --git a/br-ext-chip-goke/configs/gk7205v200_lte_defconfig b/br-ext-chip-goke/configs/gk7205v200_lte_defconfig new file mode 100644 index 00000000..de2f648e --- /dev/null +++ b/br-ext-chip-goke/configs/gk7205v200_lte_defconfig @@ -0,0 +1,118 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABI=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="4.9.37" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_8_X=y +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.37" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_GOKE_PATH)/board/gk7205v200/kernel/gk7205v200.generic-fpv.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y +BR2_LINUX_KERNEL_EXT_GOKE_PATCHER=y +BR2_LINUX_KERNEL_EXT_GOKE_PATCHER_LIST="$(BR2_EXTERNAL_GOKE_PATH)/board/gk7205v200/kernel/patches/ $(BR2_EXTERNAL_GOKE_PATH)/board/gk7205v200/kernel/overlay" + +# Filesystem +# BR2_TARGET_TZ_INFO is not set +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y +BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-gk7205v200" +BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_FWPRINTENV_OPENIPC=y +BR2_PACKAGE_GOKE_OSDRV_GK7205V200=y +BR2_PACKAGE_HISILICON_OPENSDK=y +# BR2_PACKAGE_HASERL is not set +# BR2_PACKAGE_HISI_GPIO is not set +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +# BR2_PACKAGE_JSONFILTER is not set +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBYAML=y +# BR2_PACKAGE_MAJESTIC_FONTS is not set +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +# BR2_PACKAGE_MICROBE_WEB is not set +# BR2_PACKAGE_MINI_SNMPD is not set +# BR2_PACKAGE_MOTORS is not set +# BR2_PACKAGE_SSHPASS is not set +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +# BR2_PACKAGE_QUIRC_OPENIPC is not set + +# WiFi +BR2_PACKAGE_WIRELESS_TOOLS=y +# BR2_PACKAGE_WIRELESS_REGDB is not set +# BR2_PACKAGE_WPA_SUPPLICANT is not set +# BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set +# BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set +# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set +# BR2_PACKAGE_RTL8188EU is not set +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set +# BR2_PACKAGE_RTL8812AU_OPENIPC is not set + +# WIREGUARD +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set + +# FPV +BR2_PACKAGE_DATALINK=y +BR2_PACKAGE_MAVLINK_ROUTER=y +BR2_PACKAGE_MAVFWD=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE=y + +# DEBUG +BR2_PACKAGE_HOST_GDB=y +BR2_PACKAGE_GDB=y + +# Compression and decompression +BR2_PACKAGE_LIBZIP=y + +# USB +# BR2_PACKAGE_USB_MODESWITCH is not set +# BR2_PACKAGE_USB_MODESWITCH_DATA is not set diff --git a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig index 320c142a..c6a0da45 100644 --- a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig @@ -91,7 +91,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y # BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set BR2_PACKAGE_RTL8812AU_OPENIPC=y # WIREGUARD @@ -104,9 +104,6 @@ BR2_PACKAGE_WIFIBROADCAST=y BR2_PACKAGE_MAVLINK_ROUTER=y BR2_PACKAGE_MAVFWD=y -# ZEROTIER -# BR2_PACKAGE_ZEROTIER_ONE is not set - # DEBUG BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_GDB=y diff --git a/br-ext-chip-goke/configs/gk7205v300_lte_defconfig b/br-ext-chip-goke/configs/gk7205v300_lte_defconfig new file mode 100644 index 00000000..27bf9bfe --- /dev/null +++ b/br-ext-chip-goke/configs/gk7205v300_lte_defconfig @@ -0,0 +1,118 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABI=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="4.9.37" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_8_X=y +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.37" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_GOKE_PATH)/board/gk7205v200/kernel/gk7205v300.generic-fpv.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y +BR2_LINUX_KERNEL_EXT_GOKE_PATCHER=y +BR2_LINUX_KERNEL_EXT_GOKE_PATCHER_LIST="$(BR2_EXTERNAL_GOKE_PATH)/board/gk7205v200/kernel/patches/ $(BR2_EXTERNAL_GOKE_PATH)/board/gk7205v200/kernel/overlay" + +# Filesystem +# BR2_TARGET_TZ_INFO is not set +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y +BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-gk7205v300" +BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_FWPRINTENV_OPENIPC=y +BR2_PACKAGE_GOKE_OSDRV_GK7205V200=y +BR2_PACKAGE_HISILICON_OPENSDK=y +# BR2_PACKAGE_HASERL is not set +# BR2_PACKAGE_HISI_GPIO is not set +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +# BR2_PACKAGE_JSONFILTER is not set +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBYAML=y +# BR2_PACKAGE_MAJESTIC_FONTS is not set +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +# BR2_PACKAGE_MICROBE_WEB is not set +# BR2_PACKAGE_MINI_SNMPD is not set +# BR2_PACKAGE_MOTORS is not set +# BR2_PACKAGE_SSHPASS is not set +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +# BR2_PACKAGE_QUIRC_OPENIPC is not set + +# WiFi +BR2_PACKAGE_WIRELESS_TOOLS=y +# BR2_PACKAGE_WIRELESS_REGDB is not set +# BR2_PACKAGE_WPA_SUPPLICANT is not set +# BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set +# BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set +# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set +# BR2_PACKAGE_RTL8188EU is not set +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set +# BR2_PACKAGE_RTL8812AU_OPENIPC is not set + +# WIREGUARD +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set + +# FPV +BR2_PACKAGE_DATALINK=y +BR2_PACKAGE_MAVLINK_ROUTER=y +BR2_PACKAGE_MAVFWD=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE=y + +# DEBUG +BR2_PACKAGE_HOST_GDB=y +BR2_PACKAGE_GDB=y + +# Compression and decompression +BR2_PACKAGE_LIBZIP=y + +# USB +# BR2_PACKAGE_USB_MODESWITCH is not set +# BR2_PACKAGE_USB_MODESWITCH_DATA is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig index 20353d57..7a3589be 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig @@ -91,7 +91,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y # BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set BR2_PACKAGE_RTL8812AU_OPENIPC=y # WIREGUARD diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig new file mode 100644 index 00000000..92640935 --- /dev/null +++ b/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig @@ -0,0 +1,118 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABI=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="4.9.37" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_8_X=y +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.37" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/hi3516ev200.generic-fpv.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y +BR2_LINUX_KERNEL_EXT_HISI_PATCHER=y +BR2_LINUX_KERNEL_EXT_HISI_PATCHER_LIST="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/patches/ $(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/overlay" + +# Filesystem +# BR2_TARGET_TZ_INFO is not set +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y +BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-hi3516ev200" +BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_FWPRINTENV_OPENIPC=y +BR2_PACKAGE_HISILICON_OSDRV_HI3516EV200=y +BR2_PACKAGE_HISILICON_OPENSDK=y +# BR2_PACKAGE_HASERL is not set +# BR2_PACKAGE_HISI_GPIO is not set +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +# BR2_PACKAGE_JSONFILTER is not set +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBYAML=y +# BR2_PACKAGE_MAJESTIC_FONTS is not set +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +# BR2_PACKAGE_MICROBE_WEB is not set +# BR2_PACKAGE_MINI_SNMPD is not set +# BR2_PACKAGE_MOTORS is not set +# BR2_PACKAGE_SSHPASS is not set +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +# BR2_PACKAGE_QUIRC_OPENIPC is not set + +# WiFi +BR2_PACKAGE_WIRELESS_TOOLS=y +# BR2_PACKAGE_WIRELESS_REGDB is not set +# BR2_PACKAGE_WPA_SUPPLICANT is not set +# BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set +# BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set +# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set +# BR2_PACKAGE_RTL8188EU is not set +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set +# BR2_PACKAGE_RTL8812AU_OPENIPC is not set + +# WIREGUARD +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set + +# FPV +BR2_PACKAGE_DATALINK=y +BR2_PACKAGE_MAVLINK_ROUTER=y +BR2_PACKAGE_MAVFWD=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE=y + +# DEBUG +BR2_PACKAGE_HOST_GDB=y +BR2_PACKAGE_GDB=y + +# Compression and decompression +BR2_PACKAGE_LIBZIP=y + +# USB +# BR2_PACKAGE_USB_MODESWITCH is not set +# BR2_PACKAGE_USB_MODESWITCH_DATA is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig index efebb5a6..818f8d99 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig @@ -91,7 +91,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y # BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set BR2_PACKAGE_RTL8812AU_OPENIPC=y # WIREGUARD @@ -104,9 +104,6 @@ BR2_PACKAGE_WIFIBROADCAST=y BR2_PACKAGE_MAVLINK_ROUTER=y BR2_PACKAGE_MAVFWD=y -# ZEROTIER -# BR2_PACKAGE_ZEROTIER_ONE is not set - # DEBUG BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_GDB=y diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig new file mode 100644 index 00000000..9652e2bd --- /dev/null +++ b/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig @@ -0,0 +1,118 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABI=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="4.9.37" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_8_X=y +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.37" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/hi3516ev300.generic-fpv.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y +BR2_LINUX_KERNEL_EXT_HISI_PATCHER=y +BR2_LINUX_KERNEL_EXT_HISI_PATCHER_LIST="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/patches/ $(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/overlay" + +# Filesystem +# BR2_TARGET_TZ_INFO is not set +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y +BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-hi3516ev300" +BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_FWPRINTENV_OPENIPC=y +BR2_PACKAGE_HISILICON_OSDRV_HI3516EV200=y +BR2_PACKAGE_HISILICON_OPENSDK=y +# BR2_PACKAGE_HASERL is not set +# BR2_PACKAGE_HISI_GPIO is not set +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +# BR2_PACKAGE_JSONFILTER is not set +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBYAML=y +# BR2_PACKAGE_MAJESTIC_FONTS is not set +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +# BR2_PACKAGE_MICROBE_WEB is not set +# BR2_PACKAGE_MINI_SNMPD is not set +# BR2_PACKAGE_MOTORS is not set +# BR2_PACKAGE_SSHPASS is not set +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +# BR2_PACKAGE_QUIRC_OPENIPC is not set + +# WiFi +BR2_PACKAGE_WIRELESS_TOOLS=y +# BR2_PACKAGE_WIRELESS_REGDB is not set +# BR2_PACKAGE_WPA_SUPPLICANT is not set +# BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set +# BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set +# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set +# BR2_PACKAGE_RTL8188EU is not set +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set +# BR2_PACKAGE_RTL8812AU_OPENIPC is not set + +# WIREGUARD +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set + +# FPV +BR2_PACKAGE_DATALINK=y +BR2_PACKAGE_MAVLINK_ROUTER=y +BR2_PACKAGE_MAVFWD=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE=y + +# DEBUG +BR2_PACKAGE_HOST_GDB=y +BR2_PACKAGE_GDB=y + +# Compression and decompression +BR2_PACKAGE_LIBZIP=y + +# USB +# BR2_PACKAGE_USB_MODESWITCH is not set +# BR2_PACKAGE_USB_MODESWITCH_DATA is not set diff --git a/building.sh b/building.sh index a2a9af49..ccafcc3d 100755 --- a/building.sh +++ b/building.sh @@ -159,7 +159,7 @@ should_fit() { } rename() { - if grep -q ultimate_defconfig ./output/.config || grep -q fpv_defconfig ./output/.config || grep -q sdcard_defconfig ./output/.config; then + if grep -q ultimate_defconfig ./output/.config || grep -q fpv_defconfig ./output/.config || grep -q lte_defconfig ./output/.config || grep -q sdcard_defconfig ./output/.config; then should_fit uImage $MAX_KERNEL_SIZE_ULTIMATE should_fit rootfs.squashfs $MAX_ROOTFS_SIZE_ULTIMATE else diff --git a/general/overlay/etc/profile b/general/overlay/etc/profile index ef5bba22..3d9dc974 100644 --- a/general/overlay/etc/profile +++ b/general/overlay/etc/profile @@ -3,7 +3,6 @@ export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6) export HOME=${HOME:-/root} export TZ=$(cat /etc/TZ) export SENSOR=$(fw_printenv -n sensor) -export ARCH=$(uname -m) echo_c() { echo -ne "\e[1;$1m$2\e[0m"; } @@ -20,21 +19,12 @@ if [ "$PS1" ]; then fi fi -if echo $ARCH | grep -q mips; then - export ARC='-mips32' -else - export ARC='' -fi - export EDITOR='/bin/vi' [ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; } differ() { diff -rN "/rom$1" "$1"; } -[ -x /tmp/ipctool ] || ipctool() { [ -x /tmp/ipctool ] && /tmp/ipctool $@ || (curl -s -L -o /tmp/ipctool https://github.com/OpenIPC/ipctool/releases/download/latest/ipctool$ARC && \ - chmod +x /tmp/ipctool && echo_c 35 "The ipctool installed as remote GitHub plugin\n\n" && /tmp/ipctool $@); } - majestic_changes() { diff -L "Majestic changes" -U 3 /rom/etc/majestic.yaml /etc/majestic.yaml; } show_modules() { echo; cat /proc/modules | cut -f 1 -d " " | while read module; do echo "Module: $module"; \ diff --git a/general/overlay/usr/sbin/extutils b/general/overlay/usr/sbin/extutils index a7dcd5b1..d09f0a0f 100755 --- a/general/overlay/usr/sbin/extutils +++ b/general/overlay/usr/sbin/extutils @@ -1,10 +1,26 @@ #!/bin/sh -cmd=`echo $0 | cut -d / -f 4` +CMD=$(echo $0 | cut -d / -f 4) +ARCH=$(uname -m) -case "${cmd}" in +if echo $ARCH | grep -q mips; then + ARC='-mips32' +else + ARC='' +fi + +case "${CMD}" in cli) - yaml-cli -i /etc/majestic.yaml $@; + yaml-cli -i /etc/majestic.yaml $@ + ;; + ipctool) + IPCTOOL=/tmp/ipctool + if [ ! -x $IPCTOOL ]; then + curl -s -L -o $IPCTOOL https://github.com/OpenIPC/ipctool/releases/download/latest/ipctool$ARC + chmod +x $IPCTOOL + echo "The ipctool installed as remote GitHub plugin" + fi + $IPCTOOL $@ ;; *) ;; diff --git a/general/overlay/usr/sbin/ipctool b/general/overlay/usr/sbin/ipctool new file mode 120000 index 00000000..756c71c5 --- /dev/null +++ b/general/overlay/usr/sbin/ipctool @@ -0,0 +1 @@ +extutils \ No newline at end of file diff --git a/general/package/datalink/files/S98datalink b/general/package/datalink/files/S98datalink index 75d287f0..ed0ae9df 100755 --- a/general/package/datalink/files/S98datalink +++ b/general/package/datalink/files/S98datalink @@ -6,7 +6,7 @@ . /etc/datalink.conf chip=$(ipcinfo -c) -cli="yaml-cli -i /etc/majestic.yaml" +fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) case "$1" in start) @@ -17,10 +17,10 @@ case "$1" in echo "Starting FPV datalink..." - if [ ${transport} = "lte" ]; then + if [ ${fw} = "lte" ]; then if [ ${usb_modem} = "true" ]; then echo "Starting lte modem configuration..." - echo "Running usb_modswitch or other shit here..." + echo "ToDo: Running usb_modeswitch or other shit here..." fi # for the future #cli -s .outgoing.url1 udp://${gs_ipaddr}:${gs_port} diff --git a/general/package/datalink/files/datalink.conf b/general/package/datalink/files/datalink.conf index b687e213..be787bd4 100644 --- a/general/package/datalink/files/datalink.conf +++ b/general/package/datalink/files/datalink.conf @@ -1,11 +1,10 @@ daemon=1 -transport=wfb telemetry=true usb_modem=false gs_ipaddr=127.0.0.1 gs_port=5600 -# firmware for 8Mb flash do not contain zerotier +# zerotier package contain only in the lte or ultimate builds use_zt=false zt_netid= diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry index 75019e92..528a3cc6 100755 --- a/general/package/datalink/files/telemetry +++ b/general/package/datalink/files/telemetry @@ -8,6 +8,8 @@ keydir="/etc" +fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) + start_telemetry() { if [ ! -f /usr/bin/telemetry_rx -a ! -f /usr/bin/telemetry_tx ]; then ln -s /usr/bin/wfb_rx /usr/bin/telemetry_rx ; chmod +x /usr/bin/telemetry_rx @@ -24,12 +26,12 @@ case "$1" in start) echo "Loading MAVLink telemetry service..." - if [ ${router} -eq 1 ] || [ ${transport} = "lte" ]; then + if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then /usr/bin/mavlink-routerd & else mavfwd --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} & fi - if [ ${transport} = "wfb" ]; then + if [ ${fw} = "fpv" ]; then start_telemetry fi echo "Done." diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index 19cc641c..7262d551 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -6,8 +6,6 @@ vendor=$(ipcinfo -v) sensor=$(ipcinfo -s) prefix=${family} -cli="yaml-cli -i /etc/majestic.yaml" - all_other() { if [ ${vendor} = "hisilicon" ]; then prefix="open" @@ -30,25 +28,25 @@ all_other() { # disable mavlink routerd autostart sed -i "s!/usr/bin/mavlink-routerd &!#/usr/bin/mavlink-routerd &!g" /etc/init.d/S97mavlink # majestic basic settings - ${cli} -s .isp.slowShutter disabled - ${cli} -s .isp.drc 350 + cli -s .isp.slowShutter disabled + cli -s .isp.drc 350 # enable digital image stabilization - # ${cli} -s .isp.dis true - ${cli} -s .image.contrast 50 - ${cli} -s .image.luminance 50 - ${cli} -s .video0.bitrate 4096 - ${cli} -s .video0.codec h264 - ${cli} -s .video0.rcMode cbr - ${cli} -s .video0.gopSize 0.2 - ${cli} -s .hls.enabled false - ${cli} -s .netip.enabled false - ${cli} -s .jpeg.enabled false + # cli -s .isp.dis true + cli -s .image.contrast 50 + cli -s .image.luminance 50 + cli -s .video0.bitrate 4096 + cli -s .video0.codec h264 + cli -s .video0.rcMode cbr + cli -s .video0.gopSize 0.2 + cli -s .hls.enabled false + cli -s .netip.enabled false + cli -s .jpeg.enabled false # lowdelay support only imx307 sensor if [ ${sensor} = "imx307" ]; then - ${cli} -s .video0.size 1280x720 - # ${cli} -s .video0.fps 30 - ${cli} -s .isp.lowDelay true - # ${cli} -s .video0.sliceUnits 4 + cli -s .video0.size 1280x720 + # cli -s .video0.fps 30 + cli -s .isp.lowDelay true + # cli -s .video0.sliceUnits 4 fi # tune socket buffer cat >> /etc/sysctl.conf << EOF @@ -73,7 +71,7 @@ case "$1" in # set custom config if [ ${chip} = "gk7205v200" ] && [ ${sensor} = "imx307" ]; then echo "switch to custom sensor config" - # ${cli} -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini + # cli -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini fi # fix osmem in bootargs @@ -96,7 +94,7 @@ case "$1" in # set sensor config for smtsec board if [ ${chip} = "gk7205v300" ] && [ ${sensor} = "imx307" ]; then - ${cli} -s .isp.sensorConfig /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini + cli -s .isp.sensorConfig /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini fi all_other diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index a7c0268f..085f9335 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -23,6 +23,10 @@ ifeq ($(RELEASE),ultimate) endif endif +ifeq ($(RELEASE),lte) + RELEASE := fpv +endif + MAJESTIC_SOURCE := majestic.$(FAMILY).$(RELEASE).master.tar.bz2 MAJESTIC_DEPENDENCIES = \ diff --git a/general/package/mavfwd/Config.in b/general/package/mavfwd/Config.in index 2bafaed8..4564958e 100644 --- a/general/package/mavfwd/Config.in +++ b/general/package/mavfwd/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_MAVFWD default n select BR2_PACKAGE_LIBEVENT_OPENIPC help - mavfwd - Cool and awesome tool for FPV + mavfwd - Cool and awesome mavlink forwader for FPV - https://github.com/widgetii/mavfwd + https://github.com/OpenIPC/mavfwd diff --git a/general/package/mavfwd/mavfwd.mk b/general/package/mavfwd/mavfwd.mk index 6303b4e4..5a8ec169 100644 --- a/general/package/mavfwd/mavfwd.mk +++ b/general/package/mavfwd/mavfwd.mk @@ -1,11 +1,11 @@ ################################################################################ # -# mavfwd | updated 2022.11.21 +# mavfwd # ################################################################################ -MAVFWD_VERSION = $(shell git ls-remote https://github.com/widgetii/mavfwd/ master | awk '{ print $$1 }') -MAVFWD_SITE = $(call github,widgetii,mavfwd,$(MAVFWD_VERSION)) +MAVFWD_VERSION = $(shell git ls-remote https://github.com/OpenIPC/mavfwd/ master | awk '{ print $$1 }') +MAVFWD_SITE = $(call github,OpenIPC,mavfwd,$(MAVFWD_VERSION)) MAVFWD_LICENSE = MIT MAVFWD_LICENSE_FILES = LICENSE diff --git a/general/package/wifibroadcast/files/htc_9271-1.4.0.fw b/general/package/wifibroadcast/files/htc_9271-1.4.0.fw new file mode 100644 index 00000000..79ae6068 Binary files /dev/null and b/general/package/wifibroadcast/files/htc_9271-1.4.0.fw differ diff --git a/general/package/wifibroadcast/wifibroadcast.mk b/general/package/wifibroadcast/wifibroadcast.mk index 0dd97182..66dc725f 100644 --- a/general/package/wifibroadcast/wifibroadcast.mk +++ b/general/package/wifibroadcast/wifibroadcast.mk @@ -27,6 +27,9 @@ define WIFIBROADCAST_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin cp ../general/package/wifibroadcast/files/wifibroadcast $(TARGET_DIR)/usr/bin + + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware/ath9k_htc + cp ../general/package/wifibroadcast/files/htc_9271-1.4.0.fw $(TARGET_DIR)/lib/firmware/ath9k_htc endef $(eval $(generic-package)) diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh index 7b1b5320..df597ff1 100755 --- a/scripts/executing_commands_for_musl.sh +++ b/scripts/executing_commands_for_musl.sh @@ -8,6 +8,8 @@ echo "OPENIPC_VERSION=${D:0:1}.${D:1}" >>${TARGET_DIR}/usr/lib/os-release date "+GITHUB_VERSION=\"${BRANCH}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release if grep -q fpv_defconfig ${BR2_CONFIG}; then echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release +elif grep -q lte_defconfig ${BR2_CONFIG}; then + echo "BUILD_OPTION=lte" >>${TARGET_DIR}/usr/lib/os-release elif grep -q ultimate_defconfig ${BR2_CONFIG}; then echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release else @@ -22,6 +24,7 @@ ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd if ! grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG} && \ ! grep -q ^BR2_PACKAGE_LIBV4L=y ${BR2_CONFIG} && \ + ! grep -q ^BR2_PACKAGE_MAVLINK_ROUTER=y ${BR2_CONFIG} && \ ! grep -q ^BR2_PACKAGE_INGENIC_OSDRV_T30=y ${BR2_CONFIG} \ ; then rm -f ${TARGET_DIR}/usr/lib/libstdc++* diff --git a/scripts/executing_commands_for_uclibc.sh b/scripts/executing_commands_for_uclibc.sh index 69ae31ee..e044d0a6 100755 --- a/scripts/executing_commands_for_uclibc.sh +++ b/scripts/executing_commands_for_uclibc.sh @@ -8,6 +8,8 @@ echo "OPENIPC_VERSION=${D:0:1}.${D:1}" >>${TARGET_DIR}/usr/lib/os-release date "+GITHUB_VERSION=\"${BRANCH}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release if grep -q fpv_defconfig ${BR2_CONFIG}; then echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release +elif grep -q lte_defconfig ${BR2_CONFIG}; then + echo "BUILD_OPTION=lte" >>${TARGET_DIR}/usr/lib/os-release elif grep -q ultimate_defconfig ${BR2_CONFIG}; then echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release else @@ -17,8 +19,11 @@ fi echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"' # -if ! grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG}; then - rm -f ${TARGET_DIR}/usr/lib/libstdc++* +if ! grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG} && \ + ! grep -q ^BR2_PACKAGE_LIBV4L=y ${BR2_CONFIG} && \ + ! grep -q ^BR2_PACKAGE_MAVLINK_ROUTER=y ${BR2_CONFIG} \ +; then + rm -f ${TARGET_DIR}/usr/lib/libstdc++* fi rm -f ${TARGET_DIR}/usr/bin/gdbserver