From cf9ae17d5d893a017a1cee611ee67b081b12f05c Mon Sep 17 00:00:00 2001 From: john doe <47976944+johndi3@users.noreply.github.com> Date: Mon, 26 Feb 2024 21:09:42 +0800 Subject: [PATCH 01/16] add sensor gc1054 for gk7205 family (#1326) --- .../files/sensor/config/gc1054_i2c_720p.ini | 151 ++++++++++++++++++ .../files/sensor/libsns_gc1054.so | Bin 0 -> 44076 bytes 2 files changed, 151 insertions(+) create mode 100644 general/package/goke-osdrv-gk7205v200/files/sensor/config/gc1054_i2c_720p.ini create mode 100644 general/package/goke-osdrv-gk7205v200/files/sensor/libsns_gc1054.so diff --git a/general/package/goke-osdrv-gk7205v200/files/sensor/config/gc1054_i2c_720p.ini b/general/package/goke-osdrv-gk7205v200/files/sensor/config/gc1054_i2c_720p.ini new file mode 100644 index 000000000..5617899a7 --- /dev/null +++ b/general/package/goke-osdrv-gk7205v200/files/sensor/config/gc1054_i2c_720p.ini @@ -0,0 +1,151 @@ +[sensor] +Sensor_type =stSnsObj ;sensor name +Mode =0 ;WDR_MODE_NONE = 0 + ;WDR_MODE_BUILT_IN = 1 + ;WDR_MODE_QUDRA = 2 + ;WDR_MODE_2To1_LINE = 3 + ;WDR_MODE_2To1_FRAME = 4 + ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 + ;WDR_MODE_3To1_LINE = 6 + ;WDR_MODE_3To1_FRAME = 7 + ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 + ;WDR_MODE_4To1_LINE = 9 + ;WDR_MODE_4To1_FRAME = 10 + ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 +DllFile = /usr/lib/sensors/libsns_gc1054.so ;sensor lib path + + +[mode] +input_mode =0 ;INPUT_MODE_MIPI = 0 + ;INPUT_MODE_SUBLVDS = 1 + ;INPUT_MODE_LVDS = 2 ...etc + +raw_bitness = 10 +clock=27MHz + +[mipi] +;----------only for mipi_dev--------- +data_type = 1 ;raw data type: 8/10/12/14 bit + ;DATA_TYPE_RAW_8BIT = 0, + ;DATA_TYPE_RAW_10BIT, + ;DATA_TYPE_RAW_12BIT, + ;DATA_TYPE_RAW_14BIT, + ;DATA_TYPE_RAW_16BIT, + ;DATA_TYPE_YUV420_8BIT_NORMAL, + ;DATA_TYPE_YUV420_8BIT_LEGACY, + ;DATA_TYPE_YUV422_8BIT, +lane_id = 0 ;lane_id: -1 - disable + +[isp_image] +Isp_x =0 +Isp_y =0 +Isp_W =1280 +Isp_H =720 +Isp_FrameRate=30 +Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 + +[vi_dev] +Input_mod = 6 + ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ + ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ + ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ + ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ + ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ + ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ + ; VI_MODE_MIPI, /* MIPI RAW mode */ + ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ + ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ + ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ + ; VI_MODE_LVDS, /* LVDS mode */ + ; VI_MODE_HISPI, /* HiSPi mode */ + ; VI_MODE_SLVS, /* SLVS mode */ +Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 + ;VI_WORK_MODE_2Multiplex, + ;VI_WORK_MODE_4Multiplex +Combine_mode =0 ;Y/C composite or separation mode + ;VI_COMBINE_COMPOSITE = 0 /*Composite mode */ + ;VI_COMBINE_SEPARATE, /*Separate mode */ +Comp_mode =0 ;Component mode (single-component or dual-component) + ;VI_COMP_MODE_SINGLE = 0, /*single component mode */ + ;VI_COMP_MODE_DOUBLE = 1, /*double component mode */ +Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge) + ;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */ + ;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */ +Mask_num =2 ;Component mask +Mask_0 =0xFFF00000 +Mask_1 =0x0 +Scan_mode = 1;VI_SCAN_INTERLACED = 0 + ;VI_SCAN_PROGRESSIVE, +Data_seq =2 ;data sequence (ONLY for YUV format) + ;----2th component U/V sequence in bt1120 + ; VI_INPUT_DATA_VUVU = 0, + ; VI_INPUT_DATA_UVUV, + ;----input sequence for yuv + ; VI_INPUT_DATA_UYVY = 0, + ; VI_INPUT_DATA_VYUY, + ; VI_INPUT_DATA_YUYV, + ; VI_INPUT_DATA_YVYU + +Vsync =1 ; vertical synchronization signal + ;VI_VSYNC_FIELD = 0, + ;VI_VSYNC_PULSE, +VsyncNeg=1 ;Polarity of the vertical synchronization signal + ;VI_VSYNC_NEG_HIGH = 0, + ;VI_VSYNC_NEG_LOW /*if VIU_VSYNC_E +Hsync =0 ;Attribute of the horizontal synchronization signal + ;VI_HSYNC_VALID_SINGNAL = 0, + ;VI_HSYNC_PULSE, +HsyncNeg =0 ;Polarity of the horizontal synchronization signal + ;VI_HSYNC_NEG_HIGH = 0, + ;VI_HSYNC_NEG_LOW +VsyncValid =1 ;Attribute of the valid vertical synchronization signal + ;VI_VSYNC_NORM_PULSE = 0, + ;VI_VSYNC_VALID_SINGAL, +VsyncValidNeg =0;Polarity of the valid vertical synchronization signal + ;VI_VSYNC_VALID_NEG_HIGH = 0, + ;VI_VSYNC_VALID_NEG_LOW +Timingblank_HsyncHfb =0 ;Horizontal front blanking width +Timingblank_HsyncAct =1280 ;Horizontal effetive width +Timingblank_HsyncHbb =0 ;Horizontal back blanking width +Timingblank_VsyncVfb =0 ;Vertical front blanking height +Timingblank_VsyncVact =720 ;Vertical effetive width +Timingblank_VsyncVbb=0 ;Vertical back blanking height +Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) +Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) +Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) + +;----- only for bt656 ---------- +FixCode =0 ;BT656_FIXCODE_1 = 0, + ;BT656_FIXCODE_0 +FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 + ;BT656_FIELD_POLAR_NSTD +DataPath =1 ;ISP enable or bypass + ;VI_PATH_BYPASS = 0,/* ISP bypass */ + ;VI_PATH_ISP = 1,/* ISP enable */ + ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ +InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, +DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 +DevRect_x=200 ; +DevRect_y=20 ; +DevRect_w=1280 ; +DevRect_h=720 ; + +[vi_chn] +CapRect_X =0 +CapRect_Y =0 +CapRect_Width=1280 +CapRect_Height=720 +DestSize_Width=1280 +DestSize_Height=720 +CapSel =2 ;Frame/field select. ONLY used in interlaced mode + ;VI_CAPSEL_TOP = 0, /* top field */ + ;VI_CAPSEL_BOTTOM, /* bottom field */ + ;VI_CAPSEL_BOTH, /* top and bottom field */ + +PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc +CompressMode =0 ;COMPRESS_MODE_NONE = 0 + ;COMPRESS_MODE_SEG =1 ...etc + +SrcFrameRate=-1 ;Source frame rate. -1: not controll +FrameRate =-1 ;Target frame rate. -1: not controll + diff --git a/general/package/goke-osdrv-gk7205v200/files/sensor/libsns_gc1054.so b/general/package/goke-osdrv-gk7205v200/files/sensor/libsns_gc1054.so new file mode 100644 index 0000000000000000000000000000000000000000..edc3c8fb19ad96455f0b667bd9154a7999d31338 GIT binary patch literal 44076 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 literal 0 HcmV?d00001 From 56619980a5ee0c119042e87c6269542f6a4d059b Mon Sep 17 00:00:00 2001 From: Petru Soroaga Date: Fri, 1 Mar 2024 10:59:07 +0200 Subject: [PATCH 02/16] RubyFPV Integration - Part 1 (#1331) --- .../configs/gk7205v200_rubyfpv_defconfig | 129 +++++++++++++ .../configs/gk7205v210_rubyfpv_defconfig | 129 +++++++++++++ .../configs/gk7205v300_rubyfpv_defconfig | 129 +++++++++++++ .../configs/ssc30kq_rubyfpv_defconfig | 120 ++++++++++++ .../configs/ssc338q_rubyfpv_defconfig | 126 +++++++++++++ general/package/rubyfpv/Config.in | 11 ++ general/package/rubyfpv/files/S95ruby | 26 +++ general/package/rubyfpv/files/stop_vehicle.sh | 9 + general/package/rubyfpv/files/tweaksys | 178 ++++++++++++++++++ general/package/rubyfpv/rubyfpv.mk | 23 +++ general/package/rubyfpv/src/ruby_start.c | 7 + general/scripts/rootfs_script.sh | 2 +- 12 files changed, 888 insertions(+), 1 deletion(-) create mode 100644 br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig create mode 100644 br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig create mode 100644 br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig create mode 100644 br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig create mode 100644 br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig create mode 100644 general/package/rubyfpv/Config.in create mode 100644 general/package/rubyfpv/files/S95ruby create mode 100644 general/package/rubyfpv/files/stop_vehicle.sh create mode 100644 general/package/rubyfpv/files/tweaksys create mode 100644 general/package/rubyfpv/rubyfpv.mk create mode 100644 general/package/rubyfpv/src/ruby_start.c diff --git a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig new file mode 100644 index 000000000..20349a867 --- /dev/null +++ b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig @@ -0,0 +1,129 @@ +# 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_12_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_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/kernel/gk7205v200.generic-fpv.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y + +# OpenIPC +BR2_OPENIPC_SOC_VENDOR="goke" +BR2_OPENIPC_SOC_MODEL="gk7205v200" +BR2_OPENIPC_SOC_FAMILY="gk7205v200" +BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_FLASH_SIZE="8" + +# 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="$(BR2_EXTERNAL)/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.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="$(BR2_EXTERNAL)/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_UBOOT_TOOLS=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_WEBUI 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_MEDIATEK_MT7601U is not set +# BR2_PACKAGE_RTL8188EU is not set +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set +BR2_PACKAGE_RTL8812AU_OPENIPC=y + +# WIREGUARD +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set + +# FPV +BR2_PACKAGE_RUBYFPV=y + +# DEBUG +# BR2_PACKAGE_HOST_GDB is not set +# BR2_PACKAGE_GDB is not set + +# CCACHE +BR2_CCACHE=y +BR2_CCACHE_DIR="$(HOME)/.ccache" + +# Compression +BR2_PACKAGE_LIBZIP=y + +# External +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-musleabi" +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz" diff --git a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig new file mode 100644 index 000000000..765f18e85 --- /dev/null +++ b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig @@ -0,0 +1,129 @@ +# 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_12_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_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/kernel/gk7205v200.generic-fpv.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y + +# OpenIPC +BR2_OPENIPC_SOC_VENDOR="goke" +BR2_OPENIPC_SOC_MODEL="gk7205v210" +BR2_OPENIPC_SOC_FAMILY="gk7205v200" +BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_FLASH_SIZE="8" + +# 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="$(BR2_EXTERNAL)/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-gk7205v210" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_UBOOT_TOOLS=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_WEBUI 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_MEDIATEK_MT7601U is not set +# BR2_PACKAGE_RTL8188EU is not set +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set +BR2_PACKAGE_RTL8812AU_OPENIPC=y + +# WIREGUARD +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set + +# FPV +BR2_PACKAGE_RUBYFPV=y + +# DEBUG +# BR2_PACKAGE_HOST_GDB is not set +# BR2_PACKAGE_GDB is not set + +# CCACHE +BR2_CCACHE=y +BR2_CCACHE_DIR="$(HOME)/.ccache" + +# Compression +BR2_PACKAGE_LIBZIP=y + +# External +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-musleabi" +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz" diff --git a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig new file mode 100644 index 000000000..8876e63f8 --- /dev/null +++ b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig @@ -0,0 +1,129 @@ +# 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_12_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_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/kernel/gk7205v300.generic-fpv.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y + +# OpenIPC +BR2_OPENIPC_SOC_VENDOR="goke" +BR2_OPENIPC_SOC_MODEL="gk7205v300" +BR2_OPENIPC_SOC_FAMILY="gk7205v200" +BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_FLASH_SIZE="8" + +# 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="$(BR2_EXTERNAL)/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.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="$(BR2_EXTERNAL)/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_UBOOT_TOOLS=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_WEBUI 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_MEDIATEK_MT7601U is not set +# BR2_PACKAGE_RTL8188EU is not set +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271 is not set +BR2_PACKAGE_RTL8812AU_OPENIPC=y + +# WIREGUARD +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set + +# FPV +BR2_PACKAGE_RUBYFPV=y + +# DEBUG +# BR2_PACKAGE_HOST_GDB is not set +# BR2_PACKAGE_GDB is not set + +# CCACHE +BR2_CCACHE=y +BR2_CCACHE_DIR="$(HOME)/.ccache" + +# Compression +BR2_PACKAGE_LIBZIP=y + +# External +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-musleabi" +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz" diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig new file mode 100644 index 000000000..fffa62517 --- /dev/null +++ b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig @@ -0,0 +1,120 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="4.9.84" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_12_X=y +BR2_TOOLCHAIN_USES_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" +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_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/kernel/infinity6e-ssc012b.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y + +# OpenIPC +BR2_OPENIPC_SOC_VENDOR="sigmastar" +BR2_OPENIPC_SOC_MODEL="ssc30kq" +BR2_OPENIPC_SOC_FAMILY="infinity6e" +BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="lite" + +# 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="$(BR2_EXTERNAL)/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc30kq" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_UBOOT_TOOLS=y +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_JSONFILTER=y +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_LIBOGG_OPENIPC=y +BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +BR2_PACKAGE_MAJESTIC_WEBUI=y +# BR2_PACKAGE_MINI_SNMPD is not set +# BR2_PACKAGE_MOTORS is not set +BR2_PACKAGE_OPUS_OPENIPC=y +BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y +BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y +BR2_PACKAGE_EXFAT_OPENIPC=y +BR2_PACKAGE_EXFATPROGS=y +# BR2_PACKAGE_SSHPASS is not set +# BR2_PACKAGE_UACME_OPENIPC is not set +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +BR2_PACKAGE_ZLIB=y + +# Wireless +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_RTL8812AU_OPENIPC=y + +# FPV +BR2_PACKAGE_RUBYFPV=y + +# Debug +# BR2_PACKAGE_HOST_GDB is not set +# BR2_PACKAGE_GDB is not set + +# CCACHE +BR2_CCACHE=y +BR2_CCACHE_DIR="$(HOME)/.ccache" + +# External +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabihf" +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y +# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz" diff --git a/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig new file mode 100644 index 000000000..947196a81 --- /dev/null +++ b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig @@ -0,0 +1,126 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="4.9.84" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_12_X=y +BR2_TOOLCHAIN_USES_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" +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_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/kernel/infinity6e-ssc012b.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y + +# OpenIPC +BR2_OPENIPC_SOC_VENDOR="sigmastar" +BR2_OPENIPC_SOC_MODEL="ssc338q" +BR2_OPENIPC_SOC_FAMILY="infinity6e" +BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="lite" + +# 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_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y +BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/scripts/ubifs/ubinize_sigmastar.cfg" +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc338q" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_UBOOT_TOOLS=y +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_JSONFILTER=y +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_LIBOGG_OPENIPC=y +BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +# BR2_PACKAGE_MAJESTIC_WEBUI is not set +# BR2_PACKAGE_MINI_SNMPD is not set +# BR2_PACKAGE_MOTORS is not set +BR2_PACKAGE_OPUS_OPENIPC=y +BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y +BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y +BR2_PACKAGE_EXFAT_OPENIPC=y +BR2_PACKAGE_EXFATPROGS=y +# BR2_PACKAGE_SSHPASS is not set +# BR2_PACKAGE_UACME_OPENIPC is not set +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +BR2_PACKAGE_ZLIB=y + +# Wireless +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_RTL8733BU_OPENIPC=y +BR2_PACKAGE_RTL8812AU_OPENIPC=y + +# FPV +BR2_PACKAGE_RUBYFPV=y + +# Debug +# BR2_PACKAGE_HOST_GDB is not set +# BR2_PACKAGE_GDB is not set + +# CCACHE +BR2_CCACHE=y +BR2_CCACHE_DIR="$(HOME)/.ccache" + +# External +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabihf" +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y +# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz" diff --git a/general/package/rubyfpv/Config.in b/general/package/rubyfpv/Config.in new file mode 100644 index 000000000..0cbfc9b6c --- /dev/null +++ b/general/package/rubyfpv/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_RUBYFPV + bool "rubyfpv" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBSODIUM + select BR2_PACKAGE_IW + select BR2_PACKAGE_DATALINK + default n + help + Ruby package + + https://rubyfpv.com diff --git a/general/package/rubyfpv/files/S95ruby b/general/package/rubyfpv/files/S95ruby new file mode 100644 index 000000000..f63d70bdb --- /dev/null +++ b/general/package/rubyfpv/files/S95ruby @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Start ruby +# + +chip=$(ipcinfo -c) +fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) + +case "$1" in + start) + if ! [ -f /etc/system.ok ]; then + tweaksys ${chip} + fi + + echo "Starting Ruby..." + + /usr/sbin/ruby_start + ;; + stop) + echo "Stopping Ruby..." + /usr/sbin/stop_vehicle + ;; + *) + echo "Usage: $0 {start|stop}" + exit 1 +esac diff --git a/general/package/rubyfpv/files/stop_vehicle.sh b/general/package/rubyfpv/files/stop_vehicle.sh new file mode 100644 index 000000000..c5a4e5dda --- /dev/null +++ b/general/package/rubyfpv/files/stop_vehicle.sh @@ -0,0 +1,9 @@ +kill -9 `pidof ruby_vehicle` +kill -9 `pidof ruby_rx_commands` +kill -9 `pidof ruby_tx_telemetry` +kill -9 `pidof ruby_rt_vehicle` +kill -9 `pidof ruby_rt_vehicle_light` +kill -9 `pidof ruby_alive` +kill -9 `pidof ruby_start` +kill -9 `pidof ruby_rx_rc` +kill -9 `pidof ruby_logger` diff --git a/general/package/rubyfpv/files/tweaksys b/general/package/rubyfpv/files/tweaksys new file mode 100644 index 000000000..8abcbae36 --- /dev/null +++ b/general/package/rubyfpv/files/tweaksys @@ -0,0 +1,178 @@ +#!/bin/sh + +chip=$(ipcinfo -c) +family=$(ipcinfo -f) +vendor=$(ipcinfo -v) + +if ! [ ${chip} = "hi3536dv100" ]; then + sensor=$(ipcinfo -s) +fi + +basic() { + # set boot delay + fw_setenv bootdelay 0 + # don't load f2fs module (disabled in kernel) + sed -i "s!f2fs!#f2fs!g" /etc/modules + # freely uart for telemetry + sed -i "s!console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!#console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!g" /etc/inittab + + # tune socket buffer + echo "net.core.rmem_default=512000" >> /etc/sysctl.conf +} + +prefix=${family} + +hisi_goke() { + if [ ${vendor} = "hisilicon" ]; then + prefix="open" + fi + # remove unneeded modules + sed -i "s!insmod ${prefix}_rgn.ko!#insmod ${prefix}_rgn.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_jpege.ko!#insmod ${prefix}_jpege.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_ive.ko save_power=0!#insmod ${prefix}_ive.ko save_power=0!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_aio.ko!#insmod ${prefix}_aio.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_ai.ko!#insmod ${prefix}_ai.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_ao.ko!#insmod ${prefix}_ao.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_aenc.ko!#insmod ${prefix}_aenc.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_adec.ko!#insmod ${prefix}_adec.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_acodec.ko!#insmod ${prefix}_acodec.ko!g" /usr/bin/load_${vendor} + # change fps 25 -> 30 + sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/imx307_i2c_2l_1080p.ini + sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini + sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/imx335_i2c_4M.ini +} + +sigmastar() { + sed -i "s!serial=/dev/ttyAMA0!serial=/dev/ttyS0!g" /etc/telemetry.conf + sed -i "s!Device = /dev/ttyAMA0!Device = /dev/ttyS0!g" /etc/mavlink.conf +} + +majestic_generic() { + cli -s .isp.slowShutter disabled + # enable digital image stabilization + # cli -s .isp.dis true + cli -s .image.contrast 50 + cli -s .image.luminance 50 + cli -s .video0.size 1920x1080 + cli -s .video0.fps 30 + cli -s .video0.bitrate 5120 + cli -s .video0.codec h264 + cli -s .video0.rcMode cbr + cli -s .video0.gopSize 1.5 + # lowdelay support only imx307 sensor + if [ ${sensor} = "imx307" ]; then + cli -s .isp.lowDelay true + # cli -s .video0.sliceUnits 4 + fi + if [ ${sensor} = "imx335" ]; then + cli -s .isp.drc 350 + cli -s .isp.sensorConfig /etc/sensors/imx335_i2c_4M.ini + fi + cli -s .hls.enabled false + cli -s .netip.enabled false + cli -s .jpeg.enabled false +} + +majestic_sigmastar() { + cli -s .isp.exposure 10 + cli -s .isp.aGain 8 + cli -s .isp.dGain 8 + cli -s .video0.size 1920x1080 + cli -s .video0.fps 90 + cli -s .video0.rcMode cbr + cli -s .jpeg.enabled false +} + +streamer() { + if [ -f /usr/bin/majestic ]; then + if [ ${vendor} = "sigmastar" ]; then + majestic_sigmastar + else + majestic_generic + fi + # outgoing rtp stream to udp + cli -s .outgoing.enabled true + cli -s .outgoing.server udp://127.0.0.1:5600 + fi + + if [ -f /usr/bin/venc ]; then + if [ ${sensor} = "imx335" ]; then + sed -i "s!version=200_imx307B!version=300_imx335B!g" /etc/venc.conf + sed -i "s!size=720p!size=1292x972!g" /etc/venc.conf + fi + fi +} + +finish() { + # complete tweaks and add marker + touch /etc/system.ok + echo "Preparing system done." + reboot +} + +case "$1" in + gk7205v200 | gk7205v210 | hi3516ev200) + echo "Preparing system tweaks for ${chip}..." + + # 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 + fi + + # fix osmem in bootargs + bootargs=$(fw_printenv -n bootargs) + if echo ${bootargs} | grep -q "32M"; then + newbootargs="mem=\${osmem} "$(echo ${bootargs} | cut -d " " -f2-) + fw_setenv bootargs ${newbootargs} + fw_setenv osmem 40M + fi + + # remove unneeded to reduce some memory + rm -f /etc/init.d/S60crond /etc/init.d/S49ntpd /etc/init.d/S02klogd + + basic + hisi_goke + streamer + finish + ;; + gk7205v300 | hi3516ev300) + echo "Preparing system tweaks for ${chip}..." + + # increase osmem + mem=$(fw_printenv -n osmem) && [ "${mem}" = "32M" ] && fw_setenv osmem 64M && set_allocator cma || echo "Memory allocated for the system:" ${mem} + + # set sensor config for smtsec board + if [ ${chip} = "gk7205v300" ] && [ ${sensor} = "imx307" ]; then + cli -s .isp.sensorConfig /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini + fi + + basic + hisi_goke + streamer + finish + ;; + t31l | t31n | t31x | t31zx) + echo "Preparing system tweaks for ${chip}..." + + basic + streamer + finish + ;; + hi3536dv100) + echo "Preparing system tweaks for ${chip}..." + + finish + ;; + ssc33x) + echo "Preparing system tweaks for ${chip}..." + + basic + sigmastar + streamer + finish + ;; + *) + echo "Usage: $0 {gk7205v200|gk7205v210|gk7205v300|hi3516ev200|hi3516ev300|t31l|t31n|t31x|t31zx|hi3536dv100|ssc33x}" + exit 1 +esac diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk new file mode 100644 index 000000000..739aab787 --- /dev/null +++ b/general/package/rubyfpv/rubyfpv.mk @@ -0,0 +1,23 @@ + +define RUBYFPV_EXTRACT_CMDS + cp -avr $(RUBYFPV_PKGDIR)/src/* $(@D)/ +endef + +define RUBYFPV_BUILD_CMDS + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_start) +endef + +define RUBYFPV_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d + cp $(RUBYFPV_PKGDIR)/files/S95ruby $(TARGET_DIR)/etc/init.d + + install -m 0755 -D $(@D)/ruby_start $(TARGET_DIR)/usr/sbin/ruby_start + + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin + cp $(RUBYFPV_PKGDIR)/files/stop_vehicle.sh $(TARGET_DIR)/usr/sbin + + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + cp $(RUBYFPV_PKGDIR)/files/tweaksys $(TARGET_DIR)/usr/bin +endef + +$(eval $(generic-package)) diff --git a/general/package/rubyfpv/src/ruby_start.c b/general/package/rubyfpv/src/ruby_start.c new file mode 100644 index 000000000..1d7268884 --- /dev/null +++ b/general/package/rubyfpv/src/ruby_start.c @@ -0,0 +1,7 @@ +#include + +int main (void) +{ + puts ("Welcome to RubyFPV"); + return 0; +} diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh index c1d8d64db..c28e67354 100755 --- a/general/scripts/rootfs_script.sh +++ b/general/scripts/rootfs_script.sh @@ -7,7 +7,7 @@ date +GITHUB_VERSION="\"${GIT_BRANCH-local}+${GIT_HASH-build}, %Y-%m-%d"\" >> ${ echo BUILD_OPTION=${OPENIPC_VARIANT} >> ${FILE} date +TIME_STAMP=%s >> ${FILE} -CONF="USES_GLIBC=y|INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|WIFIBROADCAST=y|WEBRTC_AUDIO_PROCESSING=y" +CONF="USES_GLIBC=y|INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|WIFIBROADCAST=y|RUBYFPV=y|WEBRTC_AUDIO_PROCESSING=y" if ! grep -qP ${CONF} ${BR2_CONFIG}; then rm -f ${TARGET_DIR}/usr/lib/libstdc++* fi From 5f03f0343130d8450c904759552791088090d48a Mon Sep 17 00:00:00 2001 From: Petru Soroaga Date: Fri, 1 Mar 2024 15:57:16 +0200 Subject: [PATCH 03/16] RubyFPV integration, part 2 (#1332) --- general/package/Config.in | 1 + general/package/rubyfpv/rubyfpv.mk | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/general/package/Config.in b/general/package/Config.in index 5ef4ab13a..1c1121f6e 100644 --- a/general/package/Config.in +++ b/general/package/Config.in @@ -112,3 +112,4 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm530/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/xmdp/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/yaml-cli/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/zerotier-one/Config.in" +source "$BR2_EXTERNAL_GENERAL_PATH/package/rubyfpv/Config.in" diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index 739aab787..be53614af 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -5,6 +5,14 @@ endef define RUBYFPV_BUILD_CMDS (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_start) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_initradio) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_logger) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_timeinit) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rt_vehicle) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_tx_telementry) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rx_rc) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rx_commands) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_vehicle) endef define RUBYFPV_INSTALL_TARGET_CMDS @@ -12,6 +20,14 @@ define RUBYFPV_INSTALL_TARGET_CMDS cp $(RUBYFPV_PKGDIR)/files/S95ruby $(TARGET_DIR)/etc/init.d install -m 0755 -D $(@D)/ruby_start $(TARGET_DIR)/usr/sbin/ruby_start + install -m 0755 -D $(@D)/ruby_initradio $(TARGET_DIR)/usr/sbin/ruby_initradio + install -m 0755 -D $(@D)/ruby_logger $(TARGET_DIR)/usr/sbin/ruby_logger + install -m 0755 -D $(@D)/ruby_timeinit $(TARGET_DIR)/usr/sbin/ruby_timeinit + install -m 0755 -D $(@D)/ruby_rt_vehicle $(TARGET_DIR)/usr/sbin/ruby_rt_vehicle + install -m 0755 -D $(@D)/ruby_tx_telemetry $(TARGET_DIR)/usr/sbin/ruby_tx_telemetry + install -m 0755 -D $(@D)/ruby_rx_rc $(TARGET_DIR)/usr/sbin/ruby_rx_rc + install -m 0755 -D $(@D)/ruby_rx_commands $(TARGET_DIR)/usr/sbin/ruby_rx_commands + install -m 0755 -D $(@D)/ruby_vehicle $(TARGET_DIR)/usr/sbin/ruby_vehicle $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin cp $(RUBYFPV_PKGDIR)/files/stop_vehicle.sh $(TARGET_DIR)/usr/sbin From cb86babcc8585107bc82f560c1ac57ec7697a1b3 Mon Sep 17 00:00:00 2001 From: cronyx Date: Mon, 4 Mar 2024 20:34:41 +0300 Subject: [PATCH 04/16] Fix rubyfpvbuild (#1334) --- general/package/rubyfpv/files/S95ruby | 0 general/package/rubyfpv/files/stop_vehicle.sh | 0 general/package/rubyfpv/files/tweaksys | 0 general/package/rubyfpv/rubyfpv.mk | 2 +- general/scripts/excludes/gk7205v200_fpv.list | 1 + 5 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 general/package/rubyfpv/files/S95ruby mode change 100644 => 100755 general/package/rubyfpv/files/stop_vehicle.sh mode change 100644 => 100755 general/package/rubyfpv/files/tweaksys diff --git a/general/package/rubyfpv/files/S95ruby b/general/package/rubyfpv/files/S95ruby old mode 100644 new mode 100755 diff --git a/general/package/rubyfpv/files/stop_vehicle.sh b/general/package/rubyfpv/files/stop_vehicle.sh old mode 100644 new mode 100755 diff --git a/general/package/rubyfpv/files/tweaksys b/general/package/rubyfpv/files/tweaksys old mode 100644 new mode 100755 diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index be53614af..6ada231cc 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -9,7 +9,7 @@ define RUBYFPV_BUILD_CMDS (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_logger) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_timeinit) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rt_vehicle) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_tx_telementry) + (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_tx_telemetry) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rx_rc) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rx_commands) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_vehicle) diff --git a/general/scripts/excludes/gk7205v200_fpv.list b/general/scripts/excludes/gk7205v200_fpv.list index cc418e4ee..25559ab4e 100644 --- a/general/scripts/excludes/gk7205v200_fpv.list +++ b/general/scripts/excludes/gk7205v200_fpv.list @@ -1,4 +1,5 @@ /etc/sensors/bt656_720p.ini +/etc/sensors/gc1054_i2c_720p.ini /etc/sensors/gc2053_i2c_1080p.ini /etc/sensors/gc4653_i2c_4M.ini /etc/sensors/jxf23_i2c_1080p.ini From 8dd59213548ca105e0a5664b719a91ac70d9b094 Mon Sep 17 00:00:00 2001 From: dnstkrv <37047430+dnstkrv@users.noreply.github.com> Date: Mon, 4 Mar 2024 20:35:04 +0300 Subject: [PATCH 05/16] Create 0002-ieee80211.patch (#1252) --- .../rtl8188eus-openipc/0002-ieee80211.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 general/package/rtl8188eus-openipc/0002-ieee80211.patch diff --git a/general/package/rtl8188eus-openipc/0002-ieee80211.patch b/general/package/rtl8188eus-openipc/0002-ieee80211.patch new file mode 100644 index 000000000..b1087f4b0 --- /dev/null +++ b/general/package/rtl8188eus-openipc/0002-ieee80211.patch @@ -0,0 +1,24 @@ +--- a/include/ieee80211.h 2024-01-13 12:27:46.986706761 +0300 ++++ b/include/ieee80211.h 2024-01-13 12:28:06.874682036 +0300 +@@ -1529,18 +1529,18 @@ + (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ + (((Addr[5]) & 0xff) == 0xff)) + #else +-extern __inline int is_multicast_mac_addr(const u8 *addr) ++static __inline int is_multicast_mac_addr(const u8 *addr) + { + return (addr[0] != 0xff) && (0x01 & addr[0]); + } + +-extern __inline int is_broadcast_mac_addr(const u8 *addr) ++static __inline int is_broadcast_mac_addr(const u8 *addr) + { + return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ + (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); + } + +-extern __inline int is_zero_mac_addr(const u8 *addr) ++static __inline int is_zero_mac_addr(const u8 *addr) + { + return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ + (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); From b29513315815c7839fedc3452c915cb2ee1259fc Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:09:08 +0100 Subject: [PATCH 06/16] [no ci] General: minor refactoring --- general/overlay/etc/wireless/usb | 28 +++++++++++++-------------- general/package/Config.in | 2 +- general/package/atbm60xx/Config.in | 10 +--------- general/package/atbm6441/Config.in | 5 ----- general/package/ingenic-pwm/Config.in | 1 - 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb index 597b75957..f0e3646dc 100755 --- a/general/overlay/etc/wireless/usb +++ b/general/overlay/etc/wireless/usb @@ -5,12 +5,6 @@ set_gpio() { sleep 1 } -# Generic ATBM603x USB -if [ "$1" = "atbm603x-generic-usb" ]; then - modprobe atbm603x_wifi_usb - exit 0 -fi - # Generic MT7601U if [ "$1" = "mt7601u-generic" ]; then modprobe mt7601u @@ -35,6 +29,12 @@ if [ "$1" = "rtl8733bu-generic" ]; then exit 0 fi +# Generic ATBM603x +if [ "$1" = "atbm603x-generic-usb" ]; then + modprobe atbm603x_wifi_usb + exit 0 +fi + # GK7205V200 CamHi if [ "$1" = "mt7601u-gk7205v200-camhi" ]; then set_gpio 9 0 @@ -113,7 +113,14 @@ if [ "$1" = "rtl8188fu-ssc325de-imou-c22ep-s2" ]; then exit 0 fi -# SSC3333 Meari Speed 6S +# SSC333 Babysense See HD IP206 +if [ "$1" = "rtl8188fu-babysense-see-hd-ip206" ]; then + set_gpio 14 1 + modprobe 8188fu + exit 0 +fi + +# SSC333 Meari Speed 6S if [ "$1" = "rtl8188fu-ssc333-meari-speed-6s" ]; then set_gpio 14 1 modprobe 8188fu @@ -210,11 +217,4 @@ if [ "$1" = "atbm603x-t31-zte-k540" ]; then exit 0 fi -# SSC333 Babysense See HD IP206 -if [ "$1" = "rtl8188fu-babysense-see-hd-ip206" ]; then - set_gpio 14 1 - modprobe 8188fu - exit 0 -fi - exit 1 diff --git a/general/package/Config.in b/general/package/Config.in index 1c1121f6e..64052b0bd 100644 --- a/general/package/Config.in +++ b/general/package/Config.in @@ -89,6 +89,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8192eu-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8733bu-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8812au-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtw-hostapd/Config.in" +source "$BR2_EXTERNAL_GENERAL_PATH/package/rubyfpv/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/sigmastar-motors/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/sigmastar-osdrv-infinity6/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/sigmastar-osdrv-infinity6b0/Config.in" @@ -112,4 +113,3 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm530/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/xmdp/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/yaml-cli/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/zerotier-one/Config.in" -source "$BR2_EXTERNAL_GENERAL_PATH/package/rubyfpv/Config.in" diff --git a/general/package/atbm60xx/Config.in b/general/package/atbm60xx/Config.in index c18c241cf..001821075 100644 --- a/general/package/atbm60xx/Config.in +++ b/general/package/atbm60xx/Config.in @@ -2,12 +2,9 @@ config BR2_PACKAGE_ATBM60XX bool "atbm60xx" depends on BR2_LINUX_KERNEL help - Wireless driver atbm60xx. - - ALTOBEAM atbm60xx WiFi driver + Wireless driver atbm60xx if BR2_PACKAGE_ATBM60XX - choice prompt "ATBM60XX Model" help @@ -28,7 +25,6 @@ config BR2_PACKAGE_ATBM60XX_MODEL_6041 endchoice if BR2_PACKAGE_ATBM60XX_MODEL_601X || BR2_PACKAGE_ATBM60XX_MODEL_602X || BR2_PACKAGE_ATBM60XX_MODEL_603X || BR2_PACKAGE_ATBM60XX_MODEL_6041 - choice prompt "Interface type for selected ATBM60XX model" help @@ -43,8 +39,4 @@ config BR2_PACKAGE_ATBM60XX_INTERFACE_SDIO endchoice endif - endif - -comment "ATBM60XX needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/general/package/atbm6441/Config.in b/general/package/atbm6441/Config.in index 22c30e2ed..086ed2455 100644 --- a/general/package/atbm6441/Config.in +++ b/general/package/atbm6441/Config.in @@ -3,8 +3,3 @@ config BR2_PACKAGE_ATBM6441 depends on BR2_LINUX_KERNEL help Wireless driver atbm6441 - - altobeam hare atbm6441 WiFi driver - -comment "ATBM6441 needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/general/package/ingenic-pwm/Config.in b/general/package/ingenic-pwm/Config.in index c757b6d27..81e365707 100644 --- a/general/package/ingenic-pwm/Config.in +++ b/general/package/ingenic-pwm/Config.in @@ -1,5 +1,4 @@ config BR2_PACKAGE_INGENIC_PWM bool "ingenic-pwm" - select BR2_PACKAGE_INGENIC_LIBIMP_CONTROL if BR2_OPENIPC_SOC_VENDOR="ingenic" help Userspace program for controlling PWM channels on the Ingenic platform From 28b4f3820f48bbf1f9f80c270abd551e208a0b99 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:47:50 +0100 Subject: [PATCH 07/16] Ingenic: enable debug for memory allocation --- br-ext-chip-ingenic/board/t20/kernel/t10.generic.config | 2 +- br-ext-chip-ingenic/board/t20/kernel/t20.generic.config | 2 +- br-ext-chip-ingenic/board/t21/kernel/t21.generic.config | 2 +- br-ext-chip-ingenic/board/t21/kernel/t30.generic.config | 2 +- br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config | 2 +- br-ext-chip-ingenic/board/t31/kernel/t31.generic.config | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/br-ext-chip-ingenic/board/t20/kernel/t10.generic.config b/br-ext-chip-ingenic/board/t20/kernel/t10.generic.config index 21794cc7d..5859a0797 100644 --- a/br-ext-chip-ingenic/board/t20/kernel/t10.generic.config +++ b/br-ext-chip-ingenic/board/t20/kernel/t10.generic.config @@ -1984,7 +1984,7 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_DEBUG_PAGEALLOC=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y diff --git a/br-ext-chip-ingenic/board/t20/kernel/t20.generic.config b/br-ext-chip-ingenic/board/t20/kernel/t20.generic.config index ddab35e8d..85864c95a 100644 --- a/br-ext-chip-ingenic/board/t20/kernel/t20.generic.config +++ b/br-ext-chip-ingenic/board/t20/kernel/t20.generic.config @@ -2010,7 +2010,7 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_DEBUG_PAGEALLOC=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y diff --git a/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config index 5903b929b..5dc864dab 100644 --- a/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config +++ b/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config @@ -1850,7 +1850,7 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_DEBUG_PAGEALLOC=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y diff --git a/br-ext-chip-ingenic/board/t21/kernel/t30.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t30.generic.config index 5a9359cad..dae2cb836 100644 --- a/br-ext-chip-ingenic/board/t21/kernel/t30.generic.config +++ b/br-ext-chip-ingenic/board/t21/kernel/t30.generic.config @@ -1846,7 +1846,7 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_DEBUG_PAGEALLOC=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y diff --git a/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config b/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config index f02ed6014..14e92cdad 100644 --- a/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config +++ b/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config @@ -1838,7 +1838,7 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_DEBUG_PAGEALLOC=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y diff --git a/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config b/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config index ab129a925..6e7dd81d1 100644 --- a/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config +++ b/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config @@ -1874,7 +1874,7 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_DEBUG_PAGEALLOC=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y From a654d7bbe5c9e9c68972054640c024a298ed2882 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:53:04 +0100 Subject: [PATCH 08/16] Ingenic: use majestic-webui by default (#1337) --- br-ext-chip-ingenic/configs/t10_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t20_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t20_ultimate_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t21_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t21_ultimate_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t30_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t31_fpv_defconfig | 3 +-- br-ext-chip-ingenic/configs/t31_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t31_ultimate_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t40_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t40_ultimate_defconfig | 4 ++-- br-ext-chip-sigmastar/configs/msc313e_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc30kd_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc30kd_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc30kq_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc30kq_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc325_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc325de_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc333_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc335_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc335_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc337_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc337_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig | 2 +- br-ext-chip-sigmastar/configs/ssc377_lite_defconfig | 2 +- 36 files changed, 46 insertions(+), 47 deletions(-) diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig index 6c97bce11..75699f516 100644 --- a/br-ext-chip-ingenic/configs/t10_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig @@ -76,12 +76,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig index 3eb9ea3dc..b65442d8c 100644 --- a/br-ext-chip-ingenic/configs/t20_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig @@ -76,12 +76,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig index 4e0d1b8ad..d71f4c2f7 100644 --- a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig @@ -79,12 +79,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig index 9a9c91077..99c5e9592 100644 --- a/br-ext-chip-ingenic/configs/t21_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig @@ -76,12 +76,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig index 36a72d2c5..7cf91ad15 100644 --- a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig @@ -78,12 +78,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig index 488426b98..f37375b8c 100644 --- a/br-ext-chip-ingenic/configs/t30_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig @@ -76,12 +76,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t31_fpv_defconfig b/br-ext-chip-ingenic/configs/t31_fpv_defconfig index 320d7a6bb..c483c0544 100644 --- a/br-ext-chip-ingenic/configs/t31_fpv_defconfig +++ b/br-ext-chip-ingenic/configs/t31_fpv_defconfig @@ -77,12 +77,11 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -# BR2_PACKAGE_MAJESTIC_FONTS is not set BR2_PACKAGE_MAJESTIC=y +# BR2_PACKAGE_MAJESTIC_FONTS is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -# BR2_PACKAGE_WEBUI is not set # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set # BR2_PACKAGE_OPUS_OPENIPC is not set diff --git a/br-ext-chip-ingenic/configs/t31_lite_defconfig b/br-ext-chip-ingenic/configs/t31_lite_defconfig index fa93b2033..208998620 100644 --- a/br-ext-chip-ingenic/configs/t31_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t31_lite_defconfig @@ -76,12 +76,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig index 97b466e14..f951d38e4 100644 --- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig @@ -79,12 +79,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t40_lite_defconfig b/br-ext-chip-ingenic/configs/t40_lite_defconfig index 717a1a2b1..8c98650aa 100644 --- a/br-ext-chip-ingenic/configs/t40_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t40_lite_defconfig @@ -76,12 +76,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig index e96f920db..ffeb350fe 100644 --- a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig @@ -78,12 +78,12 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_MOTORS=y BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig b/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig index 06ba07d9e..f06837b81 100644 --- a/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y # BR2_PACKAGE_MAJESTIC is not set # BR2_PACKAGE_MAJESTIC_FONTS is not set +# BR2_PACKAGE_MAJESTIC_WEBUI is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig b/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig index 439668c5d..167d4d6fb 100644 --- a/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig @@ -78,10 +78,10 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBYAML=y # BR2_PACKAGE_MAJESTIC is not set # BR2_PACKAGE_MAJESTIC_FONTS is not set +# BR2_PACKAGE_MAJESTIC_WEBUI is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set # BR2_PACKAGE_OPUS_OPENIPC is not set diff --git a/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig b/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig index b16d5c489..a548aadd9 100644 --- a/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y # BR2_PACKAGE_MAJESTIC is not set # BR2_PACKAGE_MAJESTIC_FONTS is not set +# BR2_PACKAGE_MAJESTIC_WEBUI is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kd_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc30kd_lite_defconfig index d6f510c34..be1ebedbb 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kd_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kd_lite_defconfig @@ -70,10 +70,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kd_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc30kd_ultimate_defconfig index e26f08f4e..a8ea144d0 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kd_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kd_ultimate_defconfig @@ -71,10 +71,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig index a05b695b9..1adbd0b0a 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig @@ -71,10 +71,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_lite_defconfig index 4fc816e58..97b14a0e1 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kq_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kq_lite_defconfig @@ -70,10 +70,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig index fffa62517..04203fad4 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig @@ -71,10 +71,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_ultimate_defconfig index 458ed985a..c9ced75ec 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kq_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kq_ultimate_defconfig @@ -71,10 +71,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig index c0368ffcc..b8a546112 100644 --- a/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc325de_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc325de_lite_defconfig index 1bb0380a4..388747e3c 100644 --- a/br-ext-chip-sigmastar/configs/ssc325de_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc325de_lite_defconfig @@ -78,10 +78,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig index 6f685f7bc..c6f977165 100644 --- a/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig index bcc178783..29e3cb464 100644 --- a/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig @@ -74,10 +74,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig index 99a48270b..ef65b29ce 100644 --- a/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc335_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc335_ultimate_defconfig index a1c8f8592..3e3a41aae 100644 --- a/br-ext-chip-sigmastar/configs/ssc335_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc335_ultimate_defconfig @@ -74,10 +74,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig index 10d5133c6..3ff4e9065 100644 --- a/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig index 42475ae77..d30550951 100644 --- a/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig @@ -74,10 +74,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig index f1ade4bf6..2475f8329 100644 --- a/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc337_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc337_ultimate_defconfig index 013fecae9..6be31f7b3 100644 --- a/br-ext-chip-sigmastar/configs/ssc337_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc337_ultimate_defconfig @@ -74,10 +74,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig index bd0a8b417..d7e6ed2ea 100644 --- a/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig @@ -73,10 +73,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig index 2503fbebd..5a29e8cc7 100644 --- a/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig @@ -79,10 +79,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig index db337cb67..969506b74 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig @@ -69,10 +69,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig index e01363ab9..105158ed7 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig @@ -70,10 +70,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig index 7d8b61ed9..31cbec5df 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig @@ -76,10 +76,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y diff --git a/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig index 45d8381a5..fa56b2334 100644 --- a/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig @@ -70,10 +70,10 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y # BR2_PACKAGE_MAJESTIC is not set BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MAJESTIC_WEBUI=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set BR2_PACKAGE_OPUS_OPENIPC=y From 3ad99998589eb30af265ade76ad1892cb4705c5a Mon Sep 17 00:00:00 2001 From: Petru Soroaga Date: Thu, 7 Mar 2024 14:18:45 +0200 Subject: [PATCH 09/16] Ruby FPV Integration, part 3 (#1336) --- .../configs/gk7205v200_rubyfpv_defconfig | 9 +- .../configs/gk7205v210_rubyfpv_defconfig | 9 +- .../configs/gk7205v300_rubyfpv_defconfig | 9 +- .../configs/ssc30kq_rubyfpv_defconfig | 2 +- .../configs/ssc338q_rubyfpv_defconfig | 2 +- .../rubyfpv/files/{S95ruby => S99ruby} | 2 +- .../rubyfpv/files/licences/licence.txt | 36 ++ .../rubyfpv/files/licences/licence_fbg.txt | 30 ++ .../rubyfpv/files/licences/licence_fec.txt | 34 ++ .../files/licences/licence_openipc.txt | 21 ++ .../files/licences/licence_qualcomm.txt | 40 +++ .../files/licences/licence_raspberry.txt | 28 ++ .../files/licences/licence_rtl8812.txt | 339 ++++++++++++++++++ .../rubyfpv/files/licences/licence_ruby.txt | 36 ++ .../files/{stop_vehicle.sh => ruby_stop.sh} | 6 +- general/package/rubyfpv/rubyfpv.mk | 15 +- 16 files changed, 594 insertions(+), 24 deletions(-) rename general/package/rubyfpv/files/{S95ruby => S99ruby} (93%) mode change 100755 => 100644 create mode 100644 general/package/rubyfpv/files/licences/licence.txt create mode 100644 general/package/rubyfpv/files/licences/licence_fbg.txt create mode 100644 general/package/rubyfpv/files/licences/licence_fec.txt create mode 100644 general/package/rubyfpv/files/licences/licence_openipc.txt create mode 100644 general/package/rubyfpv/files/licences/licence_qualcomm.txt create mode 100644 general/package/rubyfpv/files/licences/licence_raspberry.txt create mode 100644 general/package/rubyfpv/files/licences/licence_rtl8812.txt create mode 100644 general/package/rubyfpv/files/licences/licence_ruby.txt rename general/package/rubyfpv/files/{stop_vehicle.sh => ruby_stop.sh} (76%) mode change 100755 => 100644 diff --git a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig index 20349a867..3fd7bcea0 100644 --- a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig @@ -34,7 +34,8 @@ BR2_LINUX_KERNEL_XZ=y BR2_OPENIPC_SOC_VENDOR="goke" BR2_OPENIPC_SOC_MODEL="gk7205v200" BR2_OPENIPC_SOC_FAMILY="gk7205v200" -BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_VARIANT="rubyfpv" +BR2_OPENIPC_MAJESTIC="fpv" BR2_OPENIPC_FLASH_SIZE="8" # Filesystem @@ -64,13 +65,13 @@ BR2_PACKAGE_HISILICON_OPENSDK=y 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=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_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBYAML=y diff --git a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig index 765f18e85..ef4e0db3e 100644 --- a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig @@ -34,7 +34,8 @@ BR2_LINUX_KERNEL_XZ=y BR2_OPENIPC_SOC_VENDOR="goke" BR2_OPENIPC_SOC_MODEL="gk7205v210" BR2_OPENIPC_SOC_FAMILY="gk7205v200" -BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_VARIANT="rubyfpv" +BR2_OPENIPC_MAJESTIC="fpv" BR2_OPENIPC_FLASH_SIZE="8" # Filesystem @@ -64,13 +65,13 @@ BR2_PACKAGE_HISILICON_OPENSDK=y 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=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_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBYAML=y diff --git a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig index 8876e63f8..faad90a3c 100644 --- a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig @@ -34,7 +34,8 @@ BR2_LINUX_KERNEL_XZ=y BR2_OPENIPC_SOC_VENDOR="goke" BR2_OPENIPC_SOC_MODEL="gk7205v300" BR2_OPENIPC_SOC_FAMILY="gk7205v200" -BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_VARIANT="rubyfpv" +BR2_OPENIPC_MAJESTIC="fpv" BR2_OPENIPC_FLASH_SIZE="8" # Filesystem @@ -64,13 +65,13 @@ BR2_PACKAGE_HISILICON_OPENSDK=y 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=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_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBYAML=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig index 04203fad4..e46646ae5 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig @@ -31,7 +31,7 @@ BR2_LINUX_KERNEL_XZ=y BR2_OPENIPC_SOC_VENDOR="sigmastar" BR2_OPENIPC_SOC_MODEL="ssc30kq" BR2_OPENIPC_SOC_FAMILY="infinity6e" -BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_VARIANT="rubyfpv" BR2_OPENIPC_FLASH_SIZE="16" BR2_OPENIPC_MAJESTIC="lite" diff --git a/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig index 947196a81..e107de709 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig @@ -31,7 +31,7 @@ BR2_LINUX_KERNEL_XZ=y BR2_OPENIPC_SOC_VENDOR="sigmastar" BR2_OPENIPC_SOC_MODEL="ssc338q" BR2_OPENIPC_SOC_FAMILY="infinity6e" -BR2_OPENIPC_VARIANT="fpv" +BR2_OPENIPC_VARIANT="rubyfpv" BR2_OPENIPC_FLASH_SIZE="16" BR2_OPENIPC_MAJESTIC="lite" diff --git a/general/package/rubyfpv/files/S95ruby b/general/package/rubyfpv/files/S99ruby old mode 100755 new mode 100644 similarity index 93% rename from general/package/rubyfpv/files/S95ruby rename to general/package/rubyfpv/files/S99ruby index f63d70bdb..8a2e30152 --- a/general/package/rubyfpv/files/S95ruby +++ b/general/package/rubyfpv/files/S99ruby @@ -18,7 +18,7 @@ case "$1" in ;; stop) echo "Stopping Ruby..." - /usr/sbin/stop_vehicle + /usr/sbin/ruby_stop.sh ;; *) echo "Usage: $0 {start|stop}" diff --git a/general/package/rubyfpv/files/licences/licence.txt b/general/package/rubyfpv/files/licences/licence.txt new file mode 100644 index 000000000..5acb3ae45 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence.txt @@ -0,0 +1,36 @@ +Ruby written by Petru Soroaga (petrusoroaga@yahoo.com) +Contributors: Tree Orbit, Piotr Kujawski (aka bitkuna) + +More info about Ruby here: +https://rubyfpv.com +https://www.rcgroups.com/forums/showthread.php?3880253-Ruby-Digital-FPV-Video-Link-%28v-2-3%29 + + + MIT Licence + Copyright (c) 2024 Petru Soroaga petrusoroaga@yahoo.com + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the organization nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + * Military use is not permited. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL Julien Verneuil BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +See the res/licences folder for additional details. diff --git a/general/package/rubyfpv/files/licences/licence_fbg.txt b/general/package/rubyfpv/files/licences/licence_fbg.txt new file mode 100644 index 000000000..cb2205b76 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence_fbg.txt @@ -0,0 +1,30 @@ +Uses code derived from FBG library: +BSD 3-Clause License + +Copyright (c) 2018, Julien Verneuil +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/general/package/rubyfpv/files/licences/licence_fec.txt b/general/package/rubyfpv/files/licences/licence_fec.txt new file mode 100644 index 000000000..744f810e4 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence_fec.txt @@ -0,0 +1,34 @@ +/* + * fec.c -- forward error correction based on Vandermonde matrices + * 980624 + * (C) 1997-98 Luigi Rizzo (luigi@iet.unipi.it) + * (C) 2001 Alain Knaff (alain@knaff.lu) + * + * Portions derived from code by Phil Karn (karn@ka9q.ampr.org), + * Robert Morelos-Zaragoza (robert@spectra.eng.hawaii.edu) and Hari + * Thirumoorthy (harit@spectra.eng.hawaii.edu), Aug 1995 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + */ diff --git a/general/package/rubyfpv/files/licences/licence_openipc.txt b/general/package/rubyfpv/files/licences/licence_openipc.txt new file mode 100644 index 000000000..1414dfe92 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence_openipc.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 OpenIPC + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/general/package/rubyfpv/files/licences/licence_qualcomm.txt b/general/package/rubyfpv/files/licences/licence_qualcomm.txt new file mode 100644 index 000000000..f3203b1b6 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence_qualcomm.txt @@ -0,0 +1,40 @@ +Files with a Qualcomm Atheros / Atheros licence fall under the following +licence. + +---- + +Copyright (c) 2013 Qualcomm Atheros, Inc. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted (subject to the limitations in the +disclaimer below) provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + + * Neither the name of Qualcomm Atheros nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE +GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT +HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +---- \ No newline at end of file diff --git a/general/package/rubyfpv/files/licences/licence_raspberry.txt b/general/package/rubyfpv/files/licences/licence_raspberry.txt new file mode 100644 index 000000000..784eb0066 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence_raspberry.txt @@ -0,0 +1,28 @@ +/* +Copyright (c) 2018, Raspberry Pi (Trading) Ltd. +Copyright (c) 2013, Broadcom Europe Ltd. +Copyright (c) 2013, James Hughes +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the copyright holder nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ diff --git a/general/package/rubyfpv/files/licences/licence_rtl8812.txt b/general/package/rubyfpv/files/licences/licence_rtl8812.txt new file mode 100644 index 000000000..ecbc05937 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence_rtl8812.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. \ No newline at end of file diff --git a/general/package/rubyfpv/files/licences/licence_ruby.txt b/general/package/rubyfpv/files/licences/licence_ruby.txt new file mode 100644 index 000000000..5acb3ae45 --- /dev/null +++ b/general/package/rubyfpv/files/licences/licence_ruby.txt @@ -0,0 +1,36 @@ +Ruby written by Petru Soroaga (petrusoroaga@yahoo.com) +Contributors: Tree Orbit, Piotr Kujawski (aka bitkuna) + +More info about Ruby here: +https://rubyfpv.com +https://www.rcgroups.com/forums/showthread.php?3880253-Ruby-Digital-FPV-Video-Link-%28v-2-3%29 + + + MIT Licence + Copyright (c) 2024 Petru Soroaga petrusoroaga@yahoo.com + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the organization nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + * Military use is not permited. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL Julien Verneuil BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +See the res/licences folder for additional details. diff --git a/general/package/rubyfpv/files/stop_vehicle.sh b/general/package/rubyfpv/files/ruby_stop.sh old mode 100755 new mode 100644 similarity index 76% rename from general/package/rubyfpv/files/stop_vehicle.sh rename to general/package/rubyfpv/files/ruby_stop.sh index c5a4e5dda..89dc69a8b --- a/general/package/rubyfpv/files/stop_vehicle.sh +++ b/general/package/rubyfpv/files/ruby_stop.sh @@ -1,9 +1,7 @@ +kill -9 `pidof ruby_start` kill -9 `pidof ruby_vehicle` +kill -9 `pidof ruby_rx_rc` kill -9 `pidof ruby_rx_commands` kill -9 `pidof ruby_tx_telemetry` kill -9 `pidof ruby_rt_vehicle` -kill -9 `pidof ruby_rt_vehicle_light` -kill -9 `pidof ruby_alive` -kill -9 `pidof ruby_start` -kill -9 `pidof ruby_rx_rc` kill -9 `pidof ruby_logger` diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index 6ada231cc..dac42ff3b 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -1,6 +1,7 @@ define RUBYFPV_EXTRACT_CMDS cp -avr $(RUBYFPV_PKGDIR)/src/* $(@D)/ + cp -avr $(RUBYFPV_PKGDIR)/files/* $(@D)/ endef define RUBYFPV_BUILD_CMDS @@ -17,7 +18,12 @@ endef define RUBYFPV_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - cp $(RUBYFPV_PKGDIR)/files/S95ruby $(TARGET_DIR)/etc/init.d + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + $(INSTALL) -m 755 -d $(TARGET_DIR)/root/ruby + + cp $(RUBYFPV_PKGDIR)/files/S99ruby $(TARGET_DIR)/etc/init.d + chmod 755 $(TARGET_DIR)/etc/init.d/S99ruby install -m 0755 -D $(@D)/ruby_start $(TARGET_DIR)/usr/sbin/ruby_start install -m 0755 -D $(@D)/ruby_initradio $(TARGET_DIR)/usr/sbin/ruby_initradio @@ -29,11 +35,10 @@ define RUBYFPV_INSTALL_TARGET_CMDS install -m 0755 -D $(@D)/ruby_rx_commands $(TARGET_DIR)/usr/sbin/ruby_rx_commands install -m 0755 -D $(@D)/ruby_vehicle $(TARGET_DIR)/usr/sbin/ruby_vehicle - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin - cp $(RUBYFPV_PKGDIR)/files/stop_vehicle.sh $(TARGET_DIR)/usr/sbin - - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + cp $(RUBYFPV_PKGDIR)/files/ruby_stop.sh $(TARGET_DIR)/usr/sbin + chmod 755 $(TARGET_DIR)/usr/sbin/ruby_stop.sh cp $(RUBYFPV_PKGDIR)/files/tweaksys $(TARGET_DIR)/usr/bin + cp -r $(RUBYFPV_PKGDIR)/files/licences $(TARGET_DIR)/root/ruby/ endef $(eval $(generic-package)) From 1629d3eef7672a4493a67e94be3bf5d702f6c76f Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Thu, 7 Mar 2024 19:16:09 +0100 Subject: [PATCH 10/16] [no ci] Package: rename master branches to HEAD (#1339) --- general/package/aic8800-openipc/aic8800-openipc.mk | 2 +- general/package/atbm60xx/atbm60xx.mk | 2 +- general/package/atbm6441/atbm6441.mk | 2 +- general/package/aura-httpd/aura-httpd.mk | 2 +- general/package/aws-producer/aws-producer.mk | 2 +- general/package/capjpeg/capjpeg.mk | 2 +- general/package/gdbserver-lite/gdbserver-lite.mk | 2 +- general/package/go2rtc/go2rtc.mk | 2 +- general/package/hisilicon-opensdk/hisilicon-opensdk.mk | 2 +- general/package/ingenic-audiodaemon/ingenic-audiodaemon.mk | 2 +- general/package/ingenic-diag-tools/ingenic-diag-tools.mk | 2 +- general/package/ingenic-opensdk/ingenic-opensdk.mk | 2 +- general/package/ingenic-pwm/ingenic-pwm.mk | 2 +- general/package/ipctool/ipctool.mk | 2 +- general/package/jsonfilter/jsonfilter.mk | 2 +- general/package/libsrtp-openipc/libsrtp-openipc.mk | 2 +- general/package/logcat-openipc/logcat-openipc.mk | 2 +- general/package/majestic-plugins/majestic-plugins.mk | 2 +- general/package/majestic-webui/majestic-webui.mk | 2 +- general/package/microsnander/microsnander.mk | 2 +- general/package/motors/motors.mk | 2 +- general/package/mt7601u-openipc/mt7601u-openipc.mk | 2 +- general/package/quirc-openipc/quirc-openipc.mk | 2 +- general/package/rtl8189es-openipc/rtl8189es-openipc.mk | 2 +- general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk | 2 +- general/package/rtl8812au-openipc/rtl8812au-openipc.mk | 2 +- .../package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk | 2 +- general/package/ssv6x5x-openipc/ssv6x5x-openipc.mk | 2 +- general/package/ssw101b/ssw101b.mk | 2 +- general/package/vdec-openipc/vdec-openipc.mk | 2 +- general/package/venc-openipc/venc-openipc.mk | 2 +- general/package/webui/webui.mk | 2 +- general/package/yaml-cli/yaml-cli.mk | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/general/package/aic8800-openipc/aic8800-openipc.mk b/general/package/aic8800-openipc/aic8800-openipc.mk index 999386d1a..01ae77218 100644 --- a/general/package/aic8800-openipc/aic8800-openipc.mk +++ b/general/package/aic8800-openipc/aic8800-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ AIC8800_OPENIPC_SITE = $(call github,openipc,aic8800,$(AIC8800_OPENIPC_VERSION)) -AIC8800_OPENIPC_VERSION = master +AIC8800_OPENIPC_VERSION = HEAD AIC8800_OPENIPC_LICENSE = GPL-2.0 diff --git a/general/package/atbm60xx/atbm60xx.mk b/general/package/atbm60xx/atbm60xx.mk index c3b4cb165..630cb2135 100644 --- a/general/package/atbm60xx/atbm60xx.mk +++ b/general/package/atbm60xx/atbm60xx.mk @@ -5,7 +5,7 @@ ################################################################################ ATBM60XX_SITE = $(call github,openipc,atbm_60xx,$(ATBM60XX_VERSION)) -ATBM60XX_VERSION = master +ATBM60XX_VERSION = HEAD define ATBM60XX_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/share/atbm60xx_conf diff --git a/general/package/atbm6441/atbm6441.mk b/general/package/atbm6441/atbm6441.mk index c43ae4e59..d077beb64 100644 --- a/general/package/atbm6441/atbm6441.mk +++ b/general/package/atbm6441/atbm6441.mk @@ -5,7 +5,7 @@ ################################################################################ ATBM6441_SITE = $(call github,gtxaspec,atbm6441,$(ATBM6441_VERSION)) -ATBM6441_VERSION = master +ATBM6441_VERSION = HEAD ATBM6441_LICENSE = GPL-2.0 ATBM6441_MODULE_MAKE_OPTS = \ diff --git a/general/package/aura-httpd/aura-httpd.mk b/general/package/aura-httpd/aura-httpd.mk index 70fa81826..d38ae9f13 100644 --- a/general/package/aura-httpd/aura-httpd.mk +++ b/general/package/aura-httpd/aura-httpd.mk @@ -5,7 +5,7 @@ ################################################################################ AURA_HTTPD_SITE = $(call github,nekromant,aura-httpd,$(AURA_HTTPD_VERSION)) -AURA_HTTPD_VERSION = master +AURA_HTTPD_VERSION = HEAD AURA_HTTPD_LICENSE = MIT AURA_HTTPD_LICENSE_FILES = LICENSE diff --git a/general/package/aws-producer/aws-producer.mk b/general/package/aws-producer/aws-producer.mk index dfba2a241..8821ddeae 100644 --- a/general/package/aws-producer/aws-producer.mk +++ b/general/package/aws-producer/aws-producer.mk @@ -5,7 +5,7 @@ ################################################################################ AWS_PRODUCER_SITE = $(call github,awslabs,amazon-kinesis-video-streams-producer-c,$(AWS_PRODUCER_VERSION)) -AWS_PRODUCER_VERSION = master +AWS_PRODUCER_VERSION = HEAD AWS_PRODUCER_INSTALL_STAGING = YES AWS_PRODUCER_LICENSE = Apache-2.0 diff --git a/general/package/capjpeg/capjpeg.mk b/general/package/capjpeg/capjpeg.mk index 6dc9b411b..1afbce87d 100644 --- a/general/package/capjpeg/capjpeg.mk +++ b/general/package/capjpeg/capjpeg.mk @@ -5,7 +5,7 @@ ################################################################################ CAPJPEG_SITE = $(call github,openipc,capjpeg,$(CAPJPEG_VERSION)) -CAPJPEG_VERSION = master +CAPJPEG_VERSION = HEAD CAPJPEG_LICENSE = MIT CAPJPEG_LICENSE_FILES = LICENSE diff --git a/general/package/gdbserver-lite/gdbserver-lite.mk b/general/package/gdbserver-lite/gdbserver-lite.mk index fefba34c8..e9147844c 100644 --- a/general/package/gdbserver-lite/gdbserver-lite.mk +++ b/general/package/gdbserver-lite/gdbserver-lite.mk @@ -5,7 +5,7 @@ ################################################################################ GDBSERVER_LITE_SITE = $(call github,bet4it,gdbserver,$(GDBSERVER_LITE_VERSION)) -GDBSERVER_LITE_VERSION = master +GDBSERVER_LITE_VERSION = HEAD GDBSERVER_LITE_LICENSE = GNU General Public License v3.0 GDBSERVER_LITE_LICENSE_FILES = LICENSE diff --git a/general/package/go2rtc/go2rtc.mk b/general/package/go2rtc/go2rtc.mk index 97b13fce0..d1773985e 100644 --- a/general/package/go2rtc/go2rtc.mk +++ b/general/package/go2rtc/go2rtc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO2RTC_VERSION = master +GO2RTC_VERSION = HEAD GO2RTC_SITE = $(call github,AlexxIT,go2rtc,$(GO2RTC_VERSION)) GO2RTC_LICENSE = MIT GO2RTC_LICENSE_FILES = LICENSE diff --git a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk index a4b21f457..d58294165 100644 --- a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk +++ b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk @@ -5,7 +5,7 @@ ################################################################################ HISILICON_OPENSDK_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK_VERSION)) -HISILICON_OPENSDK_VERSION = master +HISILICON_OPENSDK_VERSION = HEAD HISILICON_OPENSDK_LICENSE = GPL-3.0 HISILICON_OPENSDK_LICENSE_FILES = LICENSE diff --git a/general/package/ingenic-audiodaemon/ingenic-audiodaemon.mk b/general/package/ingenic-audiodaemon/ingenic-audiodaemon.mk index 04b283cc5..a34ba54c2 100644 --- a/general/package/ingenic-audiodaemon/ingenic-audiodaemon.mk +++ b/general/package/ingenic-audiodaemon/ingenic-audiodaemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -INGENIC_AUDIODAEMON_VERSION = master +INGENIC_AUDIODAEMON_VERSION = HEAD INGENIC_AUDIODAEMON_SITE = $(call github,gtxaspec,ingenic_audiodaemon,$(INGENIC_AUDIODAEMON_VERSION)) INGENIC_AUDIODAEMON_LICENSE = GPL-2.0 INGENIC_AUDIODAEMON_LICENSE_FILES = COPYING diff --git a/general/package/ingenic-diag-tools/ingenic-diag-tools.mk b/general/package/ingenic-diag-tools/ingenic-diag-tools.mk index b41cbbd6b..0e9e43f3b 100644 --- a/general/package/ingenic-diag-tools/ingenic-diag-tools.mk +++ b/general/package/ingenic-diag-tools/ingenic-diag-tools.mk @@ -5,7 +5,7 @@ ################################################################################ INGENIC_DIAG_TOOLS_SITE = $(call github,gtxaspec,jz-diag-tools,$(INGENIC_DIAG_TOOLS_VERSION)) -INGENIC_DIAG_TOOLS_VERSION = master +INGENIC_DIAG_TOOLS_VERSION = HEAD define INGENIC_DIAG_TOOLS_BUILD_CMDS $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D) diff --git a/general/package/ingenic-opensdk/ingenic-opensdk.mk b/general/package/ingenic-opensdk/ingenic-opensdk.mk index bee33371b..ee3ef90f5 100644 --- a/general/package/ingenic-opensdk/ingenic-opensdk.mk +++ b/general/package/ingenic-opensdk/ingenic-opensdk.mk @@ -5,7 +5,7 @@ ################################################################################ INGENIC_OPENSDK_SITE = $(call github,openipc,openingenic,$(INGENIC_OPENSDK_VERSION)) -INGENIC_OPENSDK_VERSION = master +INGENIC_OPENSDK_VERSION = HEAD INGENIC_OPENSDK_LICENSE = GPL-3.0 INGENIC_OPENSDK_LICENSE_FILES = LICENSE diff --git a/general/package/ingenic-pwm/ingenic-pwm.mk b/general/package/ingenic-pwm/ingenic-pwm.mk index 3befa54d1..7feb46880 100644 --- a/general/package/ingenic-pwm/ingenic-pwm.mk +++ b/general/package/ingenic-pwm/ingenic-pwm.mk @@ -5,7 +5,7 @@ ################################################################################ INGENIC_PWM_SITE = $(call github,gtxaspec,ingenic-pwm,$(INGENIC_PWM_VERSION)) -INGENIC_PWM_VERSION = master +INGENIC_PWM_VERSION = HEAD define INGENIC_PWM_BUILD_CMDS $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D) diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk index 305ba99cd..f94c912e7 100644 --- a/general/package/ipctool/ipctool.mk +++ b/general/package/ipctool/ipctool.mk @@ -5,7 +5,7 @@ ################################################################################ IPCTOOL_SITE = $(call github,openipc,ipctool,$(IPCTOOL_VERSION)) -IPCTOOL_VERSION = master +IPCTOOL_VERSION = HEAD IPCTOOL_LICENSE = MIT IPCTOOL_LICENSE_FILES = LICENSE diff --git a/general/package/jsonfilter/jsonfilter.mk b/general/package/jsonfilter/jsonfilter.mk index 75aed7fff..c0e3a9aa2 100644 --- a/general/package/jsonfilter/jsonfilter.mk +++ b/general/package/jsonfilter/jsonfilter.mk @@ -5,7 +5,7 @@ ################################################################################ JSONFILTER_SITE = $(call github,openwrt,jsonpath,$(JSONFILTER_VERSION)) -JSONFILTER_VERSION = master +JSONFILTER_VERSION = HEAD JSONFILTER_LICENSE = ISC, BSD-3-Clause JSONFILTER_DEPENDENCIES = json-c libubox diff --git a/general/package/libsrtp-openipc/libsrtp-openipc.mk b/general/package/libsrtp-openipc/libsrtp-openipc.mk index f0d3c2e94..ea3929b89 100644 --- a/general/package/libsrtp-openipc/libsrtp-openipc.mk +++ b/general/package/libsrtp-openipc/libsrtp-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSRTP_OPENIPC_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_OPENIPC_VERSION)) -LIBSRTP_OPENIPC_VERSION = master +LIBSRTP_OPENIPC_VERSION = HEAD LIBSRTP_OPENIPC_INSTALL_STAGING = YES LIBSRTP_OPENIPC_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/general/package/logcat-openipc/logcat-openipc.mk b/general/package/logcat-openipc/logcat-openipc.mk index 2e8675bff..3a34f7e41 100644 --- a/general/package/logcat-openipc/logcat-openipc.mk +++ b/general/package/logcat-openipc/logcat-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ LOGCAT_OPENIPC_SITE = $(call github,gtxaspec,linux_logcat,$(LOGCAT_OPENIPC_VERSION)) -LOGCAT_OPENIPC_VERSION = master +LOGCAT_OPENIPC_VERSION = HEAD LOGCAT_OPENIPC_LICENSE = GPL-2.0 LOGCAT_OPENIPC_LICENSE_FILES = COPYING diff --git a/general/package/majestic-plugins/majestic-plugins.mk b/general/package/majestic-plugins/majestic-plugins.mk index 0af4df69a..a3906664a 100644 --- a/general/package/majestic-plugins/majestic-plugins.mk +++ b/general/package/majestic-plugins/majestic-plugins.mk @@ -5,7 +5,7 @@ ################################################################################ MAJESTIC_PLUGINS_SITE = $(call github,openipc,majestic-plugins,$(MAJESTIC_PLUGINS_VERSION)) -MAJESTIC_PLUGINS_VERSION = master +MAJESTIC_PLUGINS_VERSION = HEAD define MAJESTIC_PLUGINS_BUILD_CMDS $(MAKE) CC=$(TARGET_CC) TARGET=$(OPENIPC_SOC_VENDOR) -C $(@D) -B diff --git a/general/package/majestic-webui/majestic-webui.mk b/general/package/majestic-webui/majestic-webui.mk index 13c89be35..4794feed0 100644 --- a/general/package/majestic-webui/majestic-webui.mk +++ b/general/package/majestic-webui/majestic-webui.mk @@ -5,7 +5,7 @@ ################################################################################ MAJESTIC_WEBUI_SITE = $(call github,openipc,majestic-webui,$(MAJESTIC_WEBUI_VERSION)) -MAJESTIC_WEBUI_VERSION = master +MAJESTIC_WEBUI_VERSION = HEAD MAJESTIC_WEBUI_LICENSE = MIT MAJESTIC_WEBUI_LICENSE_FILES = LICENSE diff --git a/general/package/microsnander/microsnander.mk b/general/package/microsnander/microsnander.mk index 32825221d..7634c69f3 100644 --- a/general/package/microsnander/microsnander.mk +++ b/general/package/microsnander/microsnander.mk @@ -5,7 +5,7 @@ ################################################################################ MICROSNANDER_SITE = $(call github,openipc,microsnander,$(MICROSNANDER_VERSION)) -MICROSNANDER_VERSION = master +MICROSNANDER_VERSION = HEAD MICROSNANDER_LICENSE = MIT MICROSNANDER_LICENSE_FILES = LICENSE diff --git a/general/package/motors/motors.mk b/general/package/motors/motors.mk index f027b1efb..fc14d4e4c 100644 --- a/general/package/motors/motors.mk +++ b/general/package/motors/motors.mk @@ -5,7 +5,7 @@ ################################################################################ MOTORS_SITE = $(call github,openipc,motors,$(MOTORS_VERSION)) -MOTORS_VERSION = master +MOTORS_VERSION = HEAD MOTORS_LICENSE = MIT MOTORS_LICENSE_FILES = LICENSE diff --git a/general/package/mt7601u-openipc/mt7601u-openipc.mk b/general/package/mt7601u-openipc/mt7601u-openipc.mk index c14a82b51..1a7cbefc5 100644 --- a/general/package/mt7601u-openipc/mt7601u-openipc.mk +++ b/general/package/mt7601u-openipc/mt7601u-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ MT7601U_OPENIPC_SITE = $(call github,openipc,mt7601u,$(MT7601U_OPENIPC_VERSION)) -MT7601U_OPENIPC_VERSION = master +MT7601U_OPENIPC_VERSION = HEAD MT7601U_OPENIPC_LICENSE = GPL-2.0 MT7601U_OPENIPC_MODULE_MAKE_OPTS = \ diff --git a/general/package/quirc-openipc/quirc-openipc.mk b/general/package/quirc-openipc/quirc-openipc.mk index f4de55ea9..a6b26f2e2 100644 --- a/general/package/quirc-openipc/quirc-openipc.mk +++ b/general/package/quirc-openipc/quirc-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ QUIRC_OPENIPC_SITE = $(call github,openipc,quirc,$(QUIRC_OPENIPC_VERSION)) -QUIRC_OPENIPC_VERSION = master +QUIRC_OPENIPC_VERSION = HEAD QUIRC_OPENIPC_DEPENDENCIES = libjpeg-openipc QUIRC_OPENIPC_MAKE_OPTS = \ diff --git a/general/package/rtl8189es-openipc/rtl8189es-openipc.mk b/general/package/rtl8189es-openipc/rtl8189es-openipc.mk index 9115e0884..67ac502a8 100644 --- a/general/package/rtl8189es-openipc/rtl8189es-openipc.mk +++ b/general/package/rtl8189es-openipc/rtl8189es-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ RTL8189ES_OPENIPC_SITE = $(call github,jwrdegoede,rtl8189es_linux,$(RTL8189ES_OPENIPC_VERSION)) -RTL8189ES_OPENIPC_VERSION = master +RTL8189ES_OPENIPC_VERSION = HEAD RTL8189ES_OPENIPC_LICENSE = GPL-2.0 RTL8189ES_OPENIPC_LICENSE_FILES = COPYING diff --git a/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk b/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk index 8d773f4e2..726e16241 100644 --- a/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk +++ b/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ RTL8192EU_OPENIPC_SITE = $(call github,mange,rtl8192eu-linux-driver,$(RTL8192EU_OPENIPC_VERSION)) -RTL8192EU_OPENIPC_VERSION = master +RTL8192EU_OPENIPC_VERSION = HEAD RTL8192EU_OPENIPC_LICENSE = GPL-2.0 RTL8192EU_OPENIPC_LICENSE_FILES = COPYING diff --git a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk index 41de6abca..a4dc72ef8 100644 --- a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk +++ b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ RTL8812AU_OPENIPC_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION)) -RTL8812AU_OPENIPC_VERSION = master +RTL8812AU_OPENIPC_VERSION = HEAD RTL8812AU_OPENIPC_LICENSE = GPL-2.0 RTL8812AU_OPENIPC_LICENSE_FILES = COPYING diff --git a/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk b/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk index 4b96bdb27..e2c33165e 100644 --- a/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk +++ b/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk @@ -5,7 +5,7 @@ ################################################################################ SIGMASTAR_OSDRV_SENSORS_SITE = $(call github,openipc,sensors,$(SIGMASTAR_OSDRV_SENSORS_VERSION)) -SIGMASTAR_OSDRV_SENSORS_VERSION = master +SIGMASTAR_OSDRV_SENSORS_VERSION = HEAD SIGMASTAR_OSDRV_SENSORS_LICENSE = MIT SIGMASTAR_OSDRV_SENSORS_LICENSE_FILES = LICENSE diff --git a/general/package/ssv6x5x-openipc/ssv6x5x-openipc.mk b/general/package/ssv6x5x-openipc/ssv6x5x-openipc.mk index 96d0f3a76..116aa325f 100644 --- a/general/package/ssv6x5x-openipc/ssv6x5x-openipc.mk +++ b/general/package/ssv6x5x-openipc/ssv6x5x-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ SSV6X5X_OPENIPC_SITE = $(call github,openipc,ssv6x5x,$(SSV6X5X_OPENIPC_VERSION)) -SSV6X5X_OPENIPC_VERSION = master +SSV6X5X_OPENIPC_VERSION = HEAD SSV6X5X_OPENIPC_LICENSE = GPL-2.0 SSV6X5X_OPENIPC_LICENSE_FILES = COPYING diff --git a/general/package/ssw101b/ssw101b.mk b/general/package/ssw101b/ssw101b.mk index a32fdc35d..ac208fa3e 100644 --- a/general/package/ssw101b/ssw101b.mk +++ b/general/package/ssw101b/ssw101b.mk @@ -5,7 +5,7 @@ ################################################################################ SSW101B_SITE = $(call github,openipc,ssw101b,$(SSW101B_VERSION)) -SSW101B_VERSION = master +SSW101B_VERSION = HEAD SSW101B_LICENSE = GPL-2.0 diff --git a/general/package/vdec-openipc/vdec-openipc.mk b/general/package/vdec-openipc/vdec-openipc.mk index 003538c17..e41fe598e 100644 --- a/general/package/vdec-openipc/vdec-openipc.mk +++ b/general/package/vdec-openipc/vdec-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ VDEC_OPENIPC_SITE = $(call github,openipc,silicon_research,$(VDEC_OPENIPC_VERSION)) -VDEC_OPENIPC_VERSION = master +VDEC_OPENIPC_VERSION = HEAD VDEC_OPENIPC_LICENSE = MIT diff --git a/general/package/venc-openipc/venc-openipc.mk b/general/package/venc-openipc/venc-openipc.mk index 8b22a0dbe..660919f93 100644 --- a/general/package/venc-openipc/venc-openipc.mk +++ b/general/package/venc-openipc/venc-openipc.mk @@ -5,7 +5,7 @@ ################################################################################ VENC_OPENIPC_SITE = $(call github,openipc,silicon_research,$(VENC_OPENIPC_VERSION)) -VENC_OPENIPC_VERSION = master +VENC_OPENIPC_VERSION = HEAD VENC_OPENIPC_LICENSE = MIT diff --git a/general/package/webui/webui.mk b/general/package/webui/webui.mk index 4ac06e045..5e5a3bf6f 100644 --- a/general/package/webui/webui.mk +++ b/general/package/webui/webui.mk @@ -5,7 +5,7 @@ ################################################################################ WEBUI_SITE = $(call github,openipc,webui,$(WEBUI_VERSION)) -WEBUI_VERSION = master +WEBUI_VERSION = HEAD WEBUI_LICENSE = MIT WEBUI_LICENSE_FILES = LICENSE diff --git a/general/package/yaml-cli/yaml-cli.mk b/general/package/yaml-cli/yaml-cli.mk index 8cd39b819..5bd4f4072 100644 --- a/general/package/yaml-cli/yaml-cli.mk +++ b/general/package/yaml-cli/yaml-cli.mk @@ -5,7 +5,7 @@ ################################################################################ YAML_CLI_SITE = $(call github,openipc,yaml-cli,$(YAML_CLI_VERSION)) -YAML_CLI_VERSION = master +YAML_CLI_VERSION = HEAD YAML_CLI_LICENSE = MIT YAML_CLI_LICENSE_FILES = LICENSE From 5a2e3329ae92f48fe0ca63be171f536b22e3ebc1 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Thu, 7 Mar 2024 19:16:35 +0100 Subject: [PATCH 11/16] Overlay: update sysupgrade (#1338) --- general/overlay/usr/sbin/sysupgrade | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 69f9bad06..651cee47b 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -3,7 +3,7 @@ # OpenIPC.org | 2024 # -scr_version=1.0.38 +scr_version=1.0.39 args=" $@" @@ -101,7 +101,7 @@ download_firmware() { free_resources() { echo_c 37 "\nStop services, sync files, free up memory" - if [ "$vendor" = "sigmastar" ]; then + if [ "$vendor" = "sigmastar" ] || [ "$vendor" = "ingenic" ]; then killall -q -3 majestic sleep 1 else @@ -133,9 +133,9 @@ kill_process() { set_progress() { if [ "1" = "$silent_update" ]; then - busybox $@ | awk '{print NR, $1}' + busybox "$@" | awk '{print NR, $1}' else - busybox $@ + busybox "$@" fi } @@ -233,7 +233,6 @@ Usage: $0 [options] Where: -k Update kernel from online repository. -r Update rootfs from online repository. - -w Update Web UI to development version. -d Update firmware from development branch. --url=[URL] Custom URL to update from (.tgz format). --kernel=[FILE] Update kernel from file (uImage format). @@ -338,11 +337,6 @@ for i in "$@"; do shift ;; - -w) - update_webui=1 - shift - ;; - -x | --no_reboot) skip_reboot=1 shift @@ -367,21 +361,11 @@ print_sysinfo [ "1" != "$clear_overlay" ] && [ "1" != "$update_kernel" ] && [ "1" != "$update_rootfs" ] && -[ "1" != "$update_webui" ] && echo_c 37 "\nTry '$(basename "$0") --help' for options." && exit 0 [ "1" != "$skip_selfupdate" ] && self_update -if [ "1" = "$update_webui" ]; then - if [ "1" = "$update_rootfs" ]; then - update_webui=0 - echo_c 31 "\nCannot update Web UI along with RootFS!" - echo_c 37 "Please update RootFS then reboot the camera and re-run $0 -w to update Web UI in a separate run." - sleep 5 - fi -fi - create_lock free_resources @@ -390,7 +374,6 @@ free_resources [ "1" = "$update_kernel" ] && do_update_kernel "$kernel_file" [ "1" = "$update_rootfs" ] && do_update_rootfs "$rootfs_file" [ "1" = "$clear_overlay" ] && do_wipe_overlay -[ "1" = "$update_webui" ] && updatewebui.sh -b dev reboot_system From 9d0e4924fa1f3b7c97b6eab28b75e8276d53e7f1 Mon Sep 17 00:00:00 2001 From: Petru Soroaga Date: Sun, 10 Mar 2024 19:29:08 +0200 Subject: [PATCH 12/16] Ruby integration part 4 (#1340) --- general/package/linux-patcher/linux-patcher.mk | 11 +++++++++++ general/package/rubyfpv/Config.in | 2 -- general/package/rubyfpv/files/{S99ruby => S73ruby} | 7 ++++++- general/package/rubyfpv/files/ruby_stop.sh | 12 +++++------- general/package/rubyfpv/files/version_ruby_base.txt | 2 ++ general/package/rubyfpv/rubyfpv.mk | 13 +++---------- 6 files changed, 27 insertions(+), 20 deletions(-) rename general/package/rubyfpv/files/{S99ruby => S73ruby} (59%) create mode 100644 general/package/rubyfpv/files/version_ruby_base.txt diff --git a/general/package/linux-patcher/linux-patcher.mk b/general/package/linux-patcher/linux-patcher.mk index 32f947f2a..e7811c8fa 100644 --- a/general/package/linux-patcher/linux-patcher.mk +++ b/general/package/linux-patcher/linux-patcher.mk @@ -20,7 +20,18 @@ define LINUX_PATCHER_CONFIG_ATHEROS endef endif +ifeq ($(OPENIPC_VARIANT),rubyfpv) +define LINUX_PATCHER_CONFIG_TIMERS + $(call KCONFIG_DISABLE_OPT,CONFIG_HZ_100) + $(call KCONFIG_ENABLE_OPT,CONFIG_HZ_1000) + $(call KCONFIG_ENABLE_OPT,CONFIG_HZ) + $(call KCONFIG_SET_OPT,CONFIG_HZ,1000) + $(call KCONFIG_SET_OPT,CONFIG_HZ_1000,y) +endef +endif + define LINUX_PATCHER_LINUX_CONFIG_FIXUPS + $(LINUX_PATCHER_CONFIG_TIMERS) $(LINUX_PATCHER_CONFIG_ATHEROS) endef diff --git a/general/package/rubyfpv/Config.in b/general/package/rubyfpv/Config.in index 0cbfc9b6c..789cb07cf 100644 --- a/general/package/rubyfpv/Config.in +++ b/general/package/rubyfpv/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_RUBYFPV bool "rubyfpv" select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_IW - select BR2_PACKAGE_DATALINK default n help Ruby package diff --git a/general/package/rubyfpv/files/S99ruby b/general/package/rubyfpv/files/S73ruby similarity index 59% rename from general/package/rubyfpv/files/S99ruby rename to general/package/rubyfpv/files/S73ruby index 8a2e30152..84c57eb44 100644 --- a/general/package/rubyfpv/files/S99ruby +++ b/general/package/rubyfpv/files/S73ruby @@ -5,6 +5,10 @@ chip=$(ipcinfo -c) fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) +echo "Chip: " > /tmp/ruby_boot.log +echo ${chip} >> /tmp/ruby_boot.log +echo "Firmware: " >> /tmp/ruby_boot.log +echo ${fw} >> /tmp/ruby_boot.log case "$1" in start) @@ -13,11 +17,12 @@ case "$1" in fi echo "Starting Ruby..." - + echo "Starting Ruby..." >> /tmp/ruby_boot.log /usr/sbin/ruby_start ;; stop) echo "Stopping Ruby..." + echo "Stopping Ruby..." >> /tmp/ruby_boot.log /usr/sbin/ruby_stop.sh ;; *) diff --git a/general/package/rubyfpv/files/ruby_stop.sh b/general/package/rubyfpv/files/ruby_stop.sh index 89dc69a8b..acd502791 100644 --- a/general/package/rubyfpv/files/ruby_stop.sh +++ b/general/package/rubyfpv/files/ruby_stop.sh @@ -1,7 +1,5 @@ -kill -9 `pidof ruby_start` -kill -9 `pidof ruby_vehicle` -kill -9 `pidof ruby_rx_rc` -kill -9 `pidof ruby_rx_commands` -kill -9 `pidof ruby_tx_telemetry` -kill -9 `pidof ruby_rt_vehicle` -kill -9 `pidof ruby_logger` +pidof ruby_start | xargs kill -9 2>/dev/null +pidof ruby_rx_commands | xargs kill -9 2>/dev/null +pidof ruby_tx_telemetry | xargs kill -9 2>/dev/null +pidof ruby_rt_vehicle | xargs kill -9 2>/dev/null +pidof ruby_logger | xargs kill -9 2>/dev/null diff --git a/general/package/rubyfpv/files/version_ruby_base.txt b/general/package/rubyfpv/files/version_ruby_base.txt new file mode 100644 index 000000000..2e3327453 --- /dev/null +++ b/general/package/rubyfpv/files/version_ruby_base.txt @@ -0,0 +1,2 @@ +8.3 + diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index dac42ff3b..d9fc89628 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -6,14 +6,10 @@ endef define RUBYFPV_BUILD_CMDS (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_start) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_initradio) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_logger) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_timeinit) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rt_vehicle) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_tx_telemetry) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rx_rc) (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rx_commands) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_vehicle) endef define RUBYFPV_INSTALL_TARGET_CMDS @@ -22,23 +18,20 @@ define RUBYFPV_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -d $(TARGET_DIR)/root/ruby - cp $(RUBYFPV_PKGDIR)/files/S99ruby $(TARGET_DIR)/etc/init.d - chmod 755 $(TARGET_DIR)/etc/init.d/S99ruby + cp $(RUBYFPV_PKGDIR)/files/S73ruby $(TARGET_DIR)/etc/init.d + chmod 755 $(TARGET_DIR)/etc/init.d/S73ruby install -m 0755 -D $(@D)/ruby_start $(TARGET_DIR)/usr/sbin/ruby_start - install -m 0755 -D $(@D)/ruby_initradio $(TARGET_DIR)/usr/sbin/ruby_initradio install -m 0755 -D $(@D)/ruby_logger $(TARGET_DIR)/usr/sbin/ruby_logger - install -m 0755 -D $(@D)/ruby_timeinit $(TARGET_DIR)/usr/sbin/ruby_timeinit install -m 0755 -D $(@D)/ruby_rt_vehicle $(TARGET_DIR)/usr/sbin/ruby_rt_vehicle install -m 0755 -D $(@D)/ruby_tx_telemetry $(TARGET_DIR)/usr/sbin/ruby_tx_telemetry - install -m 0755 -D $(@D)/ruby_rx_rc $(TARGET_DIR)/usr/sbin/ruby_rx_rc install -m 0755 -D $(@D)/ruby_rx_commands $(TARGET_DIR)/usr/sbin/ruby_rx_commands - install -m 0755 -D $(@D)/ruby_vehicle $(TARGET_DIR)/usr/sbin/ruby_vehicle cp $(RUBYFPV_PKGDIR)/files/ruby_stop.sh $(TARGET_DIR)/usr/sbin chmod 755 $(TARGET_DIR)/usr/sbin/ruby_stop.sh cp $(RUBYFPV_PKGDIR)/files/tweaksys $(TARGET_DIR)/usr/bin cp -r $(RUBYFPV_PKGDIR)/files/licences $(TARGET_DIR)/root/ruby/ + cp $(RUBYFPV_PKGDIR)/files/version_ruby_base.txt $(TARGET_DIR)/usr/sbin endef $(eval $(generic-package)) From 29e6d8a3d029b4c554db6990f605469d6f97b887 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Sun, 10 Mar 2024 19:34:38 +0100 Subject: [PATCH 13/16] [no ci] rubyfpv: adjust makefiles (#1341) --- .../package/linux-patcher/linux-patcher.mk | 10 ++--- general/package/rubyfpv/Config.in | 8 ++-- general/package/rubyfpv/files/S73ruby | 0 general/package/rubyfpv/files/ruby_stop.sh | 10 ++--- general/package/rubyfpv/files/tweaksys | 18 ++++---- .../rubyfpv/files/version_ruby_base.txt | 1 - general/package/rubyfpv/rubyfpv.mk | 43 ++++++++----------- general/package/rubyfpv/src/Makefile | 7 +++ 8 files changed, 46 insertions(+), 51 deletions(-) mode change 100644 => 100755 general/package/rubyfpv/files/S73ruby mode change 100644 => 100755 general/package/rubyfpv/files/ruby_stop.sh create mode 100644 general/package/rubyfpv/src/Makefile diff --git a/general/package/linux-patcher/linux-patcher.mk b/general/package/linux-patcher/linux-patcher.mk index e7811c8fa..8703f5654 100644 --- a/general/package/linux-patcher/linux-patcher.mk +++ b/general/package/linux-patcher/linux-patcher.mk @@ -9,8 +9,8 @@ export UIMAGE_NAME = Linux-$(LINUX_VERSION_PROBED)-$(OPENIPC_SOC_MODEL) # Exclude buildroot yylloc patches LINUX_POST_PATCH_HOOKS = LINUX_APPLY_LOCAL_PATCHES -LINUX_PATCHER_BOARD_LIST = ssc338q_fpv ssc30kq_fpv -ifneq ($(filter $(BOARD),$(LINUX_PATCHER_BOARD_LIST)),) +LINUX_PATCHER_BOARD_FPV = ssc338q_fpv ssc30kq_fpv +ifneq ($(filter $(BOARD),$(LINUX_PATCHER_BOARD_FPV)),) define LINUX_PATCHER_CONFIG_ATHEROS $(call KCONFIG_ENABLE_OPT,CONFIG_FW_LOADER) $(call KCONFIG_ENABLE_OPT,CONFIG_WLAN) @@ -22,17 +22,13 @@ endif ifeq ($(OPENIPC_VARIANT),rubyfpv) define LINUX_PATCHER_CONFIG_TIMERS - $(call KCONFIG_DISABLE_OPT,CONFIG_HZ_100) $(call KCONFIG_ENABLE_OPT,CONFIG_HZ_1000) - $(call KCONFIG_ENABLE_OPT,CONFIG_HZ) - $(call KCONFIG_SET_OPT,CONFIG_HZ,1000) - $(call KCONFIG_SET_OPT,CONFIG_HZ_1000,y) endef endif define LINUX_PATCHER_LINUX_CONFIG_FIXUPS - $(LINUX_PATCHER_CONFIG_TIMERS) $(LINUX_PATCHER_CONFIG_ATHEROS) + $(LINUX_PATCHER_CONFIG_TIMERS) endef $(eval $(generic-package)) diff --git a/general/package/rubyfpv/Config.in b/general/package/rubyfpv/Config.in index 789cb07cf..3d9389f9e 100644 --- a/general/package/rubyfpv/Config.in +++ b/general/package/rubyfpv/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_RUBYFPV bool "rubyfpv" - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_IW - default n + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_IW help - Ruby package - + Ruby package. https://rubyfpv.com diff --git a/general/package/rubyfpv/files/S73ruby b/general/package/rubyfpv/files/S73ruby old mode 100644 new mode 100755 diff --git a/general/package/rubyfpv/files/ruby_stop.sh b/general/package/rubyfpv/files/ruby_stop.sh old mode 100644 new mode 100755 index acd502791..9100cde8d --- a/general/package/rubyfpv/files/ruby_stop.sh +++ b/general/package/rubyfpv/files/ruby_stop.sh @@ -1,5 +1,5 @@ -pidof ruby_start | xargs kill -9 2>/dev/null -pidof ruby_rx_commands | xargs kill -9 2>/dev/null -pidof ruby_tx_telemetry | xargs kill -9 2>/dev/null -pidof ruby_rt_vehicle | xargs kill -9 2>/dev/null -pidof ruby_logger | xargs kill -9 2>/dev/null +killall -q ruby_start +killall -q ruby_rx_commands +killall -q ruby_tx_telemetry +killall -q ruby_rt_vehicle +killall -q ruby_logger diff --git a/general/package/rubyfpv/files/tweaksys b/general/package/rubyfpv/files/tweaksys index 8abcbae36..57ee9fe6a 100755 --- a/general/package/rubyfpv/files/tweaksys +++ b/general/package/rubyfpv/files/tweaksys @@ -74,11 +74,11 @@ majestic_generic() { } majestic_sigmastar() { - cli -s .isp.exposure 10 - cli -s .isp.aGain 8 - cli -s .isp.dGain 8 + cli -s .isp.exposure 20 + cli -s .isp.aGain 40 + cli -s .isp.sensorConfig /etc/sensors/imx415_fpv.bin cli -s .video0.size 1920x1080 - cli -s .video0.fps 90 + cli -s .video0.fps 60 cli -s .video0.rcMode cbr cli -s .jpeg.enabled false } @@ -113,7 +113,6 @@ finish() { case "$1" in gk7205v200 | gk7205v210 | hi3516ev200) echo "Preparing system tweaks for ${chip}..." - # set custom config if [ ${chip} = "gk7205v200" ] && [ ${sensor} = "imx307" ]; then echo "switch to custom sensor config" @@ -136,6 +135,7 @@ case "$1" in streamer finish ;; + gk7205v300 | hi3516ev300) echo "Preparing system tweaks for ${chip}..." @@ -152,27 +152,29 @@ case "$1" in streamer finish ;; + t31l | t31n | t31x | t31zx) echo "Preparing system tweaks for ${chip}..." - basic streamer finish ;; + hi3536dv100) echo "Preparing system tweaks for ${chip}..." - finish ;; + ssc33x) echo "Preparing system tweaks for ${chip}..." - basic sigmastar streamer finish ;; + *) echo "Usage: $0 {gk7205v200|gk7205v210|gk7205v300|hi3516ev200|hi3516ev300|t31l|t31n|t31x|t31zx|hi3536dv100|ssc33x}" exit 1 + ;; esac diff --git a/general/package/rubyfpv/files/version_ruby_base.txt b/general/package/rubyfpv/files/version_ruby_base.txt index 2e3327453..cf022018d 100644 --- a/general/package/rubyfpv/files/version_ruby_base.txt +++ b/general/package/rubyfpv/files/version_ruby_base.txt @@ -1,2 +1 @@ 8.3 - diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index d9fc89628..1fc5d5aec 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -1,37 +1,30 @@ +################################################################################ +# +# rubyfpv +# +################################################################################ -define RUBYFPV_EXTRACT_CMDS - cp -avr $(RUBYFPV_PKGDIR)/src/* $(@D)/ - cp -avr $(RUBYFPV_PKGDIR)/files/* $(@D)/ -endef +RUBYFPV_SITE_METHOD = local +RUBYFPV_SITE = $(RUBYFPV_PKGDIR)/src define RUBYFPV_BUILD_CMDS - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_start) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_logger) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rt_vehicle) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_tx_telemetry) - (cd $(@D); $(TARGET_CC) -s ruby_start.c -o ruby_rx_commands) + $(MAKE) CC=$(TARGET_CC) -C $(@D) all endef define RUBYFPV_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -d $(TARGET_DIR)/root/ruby - - cp $(RUBYFPV_PKGDIR)/files/S73ruby $(TARGET_DIR)/etc/init.d - chmod 755 $(TARGET_DIR)/etc/init.d/S73ruby + $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(RUBYFPV_PKGDIR)/files/S73ruby - install -m 0755 -D $(@D)/ruby_start $(TARGET_DIR)/usr/sbin/ruby_start - install -m 0755 -D $(@D)/ruby_logger $(TARGET_DIR)/usr/sbin/ruby_logger - install -m 0755 -D $(@D)/ruby_rt_vehicle $(TARGET_DIR)/usr/sbin/ruby_rt_vehicle - install -m 0755 -D $(@D)/ruby_tx_telemetry $(TARGET_DIR)/usr/sbin/ruby_tx_telemetry - install -m 0755 -D $(@D)/ruby_rx_commands $(TARGET_DIR)/usr/sbin/ruby_rx_commands + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/ruby + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/ruby $(RUBYFPV_PKGDIR)/files/licences/* - cp $(RUBYFPV_PKGDIR)/files/ruby_stop.sh $(TARGET_DIR)/usr/sbin - chmod 755 $(TARGET_DIR)/usr/sbin/ruby_stop.sh - cp $(RUBYFPV_PKGDIR)/files/tweaksys $(TARGET_DIR)/usr/bin - cp -r $(RUBYFPV_PKGDIR)/files/licences $(TARGET_DIR)/root/ruby/ - cp $(RUBYFPV_PKGDIR)/files/version_ruby_base.txt $(TARGET_DIR)/usr/sbin + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(RUBYFPV_PKGDIR)/files/tweaksys + + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/output/* + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/ruby_stop.sh + $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/version_ruby_base.txt endef $(eval $(generic-package)) diff --git a/general/package/rubyfpv/src/Makefile b/general/package/rubyfpv/src/Makefile new file mode 100644 index 000000000..6ce5db661 --- /dev/null +++ b/general/package/rubyfpv/src/Makefile @@ -0,0 +1,7 @@ +TARGET := ruby_start ruby_logger ruby_rt_vehicle ruby_rx_commands ruby_tx_telemetry + +all: $(TARGET) + +$(TARGET): + @mkdir -p output + $(CC) ruby_start.c -o output/$@ -s From 4410246b4e47498af0be7820d45b16155004aa67 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Sun, 10 Mar 2024 19:51:20 +0100 Subject: [PATCH 14/16] [no ci] rubyfpv: adjust init.d script (#1342) --- general/package/rubyfpv/files/S73ruby | 45 +++++++++---------- .../rubyfpv/files/{ruby_stop.sh => ruby_stop} | 1 + general/package/rubyfpv/rubyfpv.mk | 2 +- 3 files changed, 22 insertions(+), 26 deletions(-) rename general/package/rubyfpv/files/{ruby_stop.sh => ruby_stop} (92%) diff --git a/general/package/rubyfpv/files/S73ruby b/general/package/rubyfpv/files/S73ruby index 84c57eb44..3efd0fb45 100755 --- a/general/package/rubyfpv/files/S73ruby +++ b/general/package/rubyfpv/files/S73ruby @@ -1,31 +1,26 @@ #!/bin/sh -# -# Start ruby -# - -chip=$(ipcinfo -c) +hw=$(ipcinfo -c) fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) -echo "Chip: " > /tmp/ruby_boot.log -echo ${chip} >> /tmp/ruby_boot.log -echo "Firmware: " >> /tmp/ruby_boot.log -echo ${fw} >> /tmp/ruby_boot.log + +echo "Chipset = ${hw}" | logger -s -t RubyFPV +echo "Firmware = ${fw}" | logger -s -t RubyFPV case "$1" in - start) - if ! [ -f /etc/system.ok ]; then - tweaksys ${chip} - fi + start) + if ! [ -f /etc/system.ok ]; then + tweaksys ${hw} + fi + echo "Starting Ruby..." | logger -s -t RubyFPV + ruby_start + ;; + + stop) + echo "Stopping Ruby..." | logger -s -t RubyFPV + ruby_stop + ;; - echo "Starting Ruby..." - echo "Starting Ruby..." >> /tmp/ruby_boot.log - /usr/sbin/ruby_start - ;; - stop) - echo "Stopping Ruby..." - echo "Stopping Ruby..." >> /tmp/ruby_boot.log - /usr/sbin/ruby_stop.sh - ;; - *) - echo "Usage: $0 {start|stop}" - exit 1 + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; esac diff --git a/general/package/rubyfpv/files/ruby_stop.sh b/general/package/rubyfpv/files/ruby_stop similarity index 92% rename from general/package/rubyfpv/files/ruby_stop.sh rename to general/package/rubyfpv/files/ruby_stop index 9100cde8d..e3d406459 100755 --- a/general/package/rubyfpv/files/ruby_stop.sh +++ b/general/package/rubyfpv/files/ruby_stop @@ -1,3 +1,4 @@ +#!/bin/sh killall -q ruby_start killall -q ruby_rx_commands killall -q ruby_tx_telemetry diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index 1fc5d5aec..2e6881ac3 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -23,7 +23,7 @@ define RUBYFPV_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/output/* - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/ruby_stop.sh + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/ruby_stop $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/version_ruby_base.txt endef From cd896c502eb6f0b8e1121f73184609482d495222 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Sun, 10 Mar 2024 20:07:55 +0100 Subject: [PATCH 15/16] [no ci] Overlay: minor script formatting --- .../{ => legacy/general}/compile4programmer.sh | 0 .../etc => scripts/legacy}/init.d/S50telnet | 0 general/scripts/rootfs_script.sh | 2 +- general/scripts/show_toolchains.sh | 14 ++++++++++---- general/scripts/sync_goke.sh | 16 ++++++++++++---- 5 files changed, 23 insertions(+), 9 deletions(-) rename general/scripts/{ => legacy/general}/compile4programmer.sh (100%) rename general/{overlay/etc => scripts/legacy}/init.d/S50telnet (100%) diff --git a/general/scripts/compile4programmer.sh b/general/scripts/legacy/general/compile4programmer.sh similarity index 100% rename from general/scripts/compile4programmer.sh rename to general/scripts/legacy/general/compile4programmer.sh diff --git a/general/overlay/etc/init.d/S50telnet b/general/scripts/legacy/init.d/S50telnet similarity index 100% rename from general/overlay/etc/init.d/S50telnet rename to general/scripts/legacy/init.d/S50telnet diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh index c28e67354..a8187c99e 100755 --- a/general/scripts/rootfs_script.sh +++ b/general/scripts/rootfs_script.sh @@ -19,5 +19,5 @@ fi LIST="${BR2_EXTERNAL_GENERAL_PATH}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_VARIANT}.list" if [ -f ${LIST} ]; then - xargs -a ${LIST} -I % rm -f ${TARGET_DIR}% + xargs -a ${LIST} -I % rm -f ${TARGET_DIR}% fi diff --git a/general/scripts/show_toolchains.sh b/general/scripts/show_toolchains.sh index 1a6e1eeb5..c96dbd040 100755 --- a/general/scripts/show_toolchains.sh +++ b/general/scripts/show_toolchains.sh @@ -10,6 +10,7 @@ toolchain_by_config() { VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g') KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}') GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF) + ARCH=$(sed -rn "s/^BR2_(arm[a-z0-9_]+)=y/\1/p" $CF) if [ -z "$ARCH" ]; then ARCH=$(sed -rn "s/^BR2_(cortex_[a-z0-9_]+)=y/\1/p" $CF) @@ -34,35 +35,40 @@ toolchain_by_config() { fi LIBC=$(sed -rn "s/^BR2_TOOLCHAIN_BUILDROOT_LIBC=\"(.*)\"/\1/p" $CF) - SOC=$(echo $CF | cut -d _ -f 3) + case $FMT in list) echo $ARCH $GCC_VER $LIBC $KVER $VENDOR $CF ;; + uniq) echo $ARCH $GCC_VER $LIBC $KVER ;; + *) if [ -n "$2" ]; then BR_DIR=buildroot-$2 GCC_VER=$(sed -rn \ "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \ - $BR_DIR/package/gcc/Config.in.host) + $BR_DIR/package/gcc/Config.in.host) case $LIBC in musl) VER=$(sed -rn "s/^MUSL_VERSION\s*=\s*([0-9.]+)/\1/p" \ $BR_DIR/package/musl/musl.mk) ;; + uclibc) VER=$(sed -rn "s/^UCLIBC_VERSION\s*=\s*([0-9.]+)/\1/p" \ $BR_DIR/package/uclibc/uclibc.mk) ;; + glibc) VER=$(sed -rn "s/^GLIBC_VERSION\s*=\s*([0-9.]+).*/\1/p" \ - $BR_DIR/package/glibc/glibc.mk | tail -1) + $BR_DIR/package/glibc/glibc.mk | tail -1) ;; - esac + esac + HASH=$(echo $VER | sha1sum | cut -c 1-8) echo ${ARCH}-gcc${GCC_VER}-${LIBC}-${KVER}-${HASH} else diff --git a/general/scripts/sync_goke.sh b/general/scripts/sync_goke.sh index 8aa505fb8..16184853a 100755 --- a/general/scripts/sync_goke.sh +++ b/general/scripts/sync_goke.sh @@ -4,10 +4,18 @@ OUTDIR=br-ext-chip-goke/board/gk7205v200/kernel function map_soc() { case $1 in - hi3516ev200) NEW_SOC=gk7205v200 ;; - hi3516dv200) NEW_SOC=gk7605v100 ;; - hi3516ev300) NEW_SOC=gk7205v300 ;; - hi3518ev300) NEW_SOC=gk7202v300 ;; + hi3516ev200) + NEW_SOC=gk7205v200 + ;; + hi3516dv200) + NEW_SOC=gk7605v100 + ;; + hi3516ev300) + NEW_SOC=gk7205v300 + ;; + hi3518ev300) + NEW_SOC=gk7202v300 + ;; esac } From d8f8854f6307087d5bb774852e39a59dd7ce7d3a Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:53:36 +0100 Subject: [PATCH 16/16] [no ci] Sigmastar: update vendor module script --- .../files/script/load_sigmastar | 12 +++++++++--- .../files/script/load_sigmastar | 16 +++++++++++----- .../files/script/load_sigmastar | 12 +++++++++--- .../files/script/load_sigmastar | 16 +++++++++++----- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar index 5a8538e90..48a34eb4c 100755 --- a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar @@ -9,7 +9,10 @@ SENSOR=$(fw_printenv -n sensor) detect_sensor() { insmod ${PATH_SENSOR}/sensor_config.ko - echo srcfg 0 1 0 0 0 0 > /dev/srcfg + if [ -e /dev/srcfg ]; then + echo srcfg 0 1 0 0 0 0 > /dev/srcfg + rmmod sensor_config + fi SENSOR=$(ipcinfo -s) fw_setenv sensor ${SENSOR} } @@ -44,7 +47,7 @@ insert_ko() { insmod ${PATH_MODULE}/mi_venc.ko } -if [ ! -e /dev/mi_poll ]; then +if [ ! -e /sys/module/mhal ]; then insert_ko fi @@ -58,7 +61,10 @@ if [ -z ${SENSOR} ]; then exit 1 else echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - $(lsmod | grep -q ${SENSOR}) || set_sensor + if [ -e /sys/module/sensor* ]; then + rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + fi + set_sensor fi exit 0 diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar index 9ea0b5aa0..1aecb32ef 100755 --- a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar @@ -9,7 +9,10 @@ SENSOR=$(fw_printenv -n sensor) detect_sensor() { insmod ${PATH_SENSOR}/sensor_config.ko - echo srcfg 0 1 0 0 0 0 > /dev/srcfg + if [ -e /dev/srcfg ]; then + echo srcfg 0 1 0 0 0 0 > /dev/srcfg + rmmod sensor_config + fi SENSOR=$(ipcinfo -s) fw_setenv sensor ${SENSOR} } @@ -42,12 +45,12 @@ insert_ko() { insmod ${PATH_MODULE}/mi_vpe.ko insmod ${PATH_MODULE}/mi_venc.ko fw_path=/etc/firmware/chagall.bin - major=$(awk '$2=="mi_poll" {print $1}' /proc/devices) - mknod /dev/mi_poll c $major 0 + MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices) + mknod /dev/mi_poll c ${MAJOR} 0 echo isproot /etc/firmware > /dev/ispmid } -if [ ! -e /dev/mi_poll ]; then +if [ ! -e /sys/module/mhal ]; then insert_ko fi @@ -61,7 +64,10 @@ if [ -z ${SENSOR} ]; then exit 1 else echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - $(lsmod | grep -q ${SENSOR}) || set_sensor + if [ -e /sys/module/sensor* ]; then + rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + fi + set_sensor fi exit 0 diff --git a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar index 593406cc3..f1732f23e 100755 --- a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar @@ -9,7 +9,10 @@ SENSOR=$(fw_printenv -n sensor) detect_sensor() { insmod ${PATH_SENSOR}/sensor_config.ko - echo srcfg 0 1 2 0 1 1 > /dev/srcfg + if [ -e /dev/srcfg ]; then + echo srcfg 0 1 0 0 0 0 > /dev/srcfg + rmmod sensor_config + fi SENSOR=$(ipcinfo -s) fw_setenv sensor ${SENSOR} } @@ -39,7 +42,7 @@ insert_ko() { echo isproot /etc/firmware > /dev/ispmid } -if [ ! -e /dev/mi_poll ]; then +if [ ! -e /sys/module/mhal ]; then insert_ko fi @@ -53,7 +56,10 @@ if [ -z ${SENSOR} ]; then exit 1 else echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - $(lsmod | grep -q ${SENSOR}) || set_sensor + if [ -e /sys/module/sensor* ]; then + rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + fi + set_sensor fi exit 0 diff --git a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar index 8d174de7e..fe5376c23 100755 --- a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar @@ -9,7 +9,10 @@ SENSOR=$(fw_printenv -n sensor) detect_sensor() { insmod ${PATH_SENSOR}/sensor_config.ko - echo srcfg 0 1 0 0 0 0 > /dev/srcfg + if [ -e /dev/srcfg ]; then + echo srcfg 0 1 0 0 0 0 > /dev/srcfg + rmmod sensor_config + fi SENSOR=$(ipcinfo -s) fw_setenv sensor ${SENSOR} } @@ -41,12 +44,12 @@ insert_ko() { insmod ${PATH_MODULE}/mi_vpe.ko insmod ${PATH_MODULE}/mi_venc.ko fw_path=/etc/firmware/chagall.bin - major=$(awk '$2=="mi_poll" {print $1}' /proc/devices) - mknod /dev/mi_poll c $major 0 + MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices) + mknod /dev/mi_poll c ${MAJOR} 0 echo isproot /etc/firmware > /dev/ispmid } -if [ ! -e /dev/mi_poll ]; then +if [ ! -e /sys/module/mhal ]; then insert_ko fi @@ -60,7 +63,10 @@ if [ -z ${SENSOR} ]; then exit 1 else echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - $(lsmod | grep -q ${SENSOR}) || set_sensor + if [ -e /sys/module/sensor* ]; then + rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + fi + set_sensor fi exit 0