OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Improve majestic.mk configuration (#378) 

* Improve majestic.mk configuration

* Remove R2_PACKAGE_MAJESTIC_ULTIMATE and R2_PACKAGE_MAJESTIC_FPV options
pull/387/head
Dmitry Ilyin 2022-08-19 14:18:27 +03:00 committed by GitHub
parent f3f14ab965
commit 0f2a1d223e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig
View File

@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_FPV is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-goke/configs/unknown_unknown_gk7205v200_ultimate_defconfig
View File

@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig
View File

@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_FPV is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig
View File

@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av100_ultimate_defconfig
View File

@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av200_ultimate_defconfig
View File

@ -77,7 +77,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig
View File

@ -75,7 +75,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv100_ultimate_defconfig
View File

@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig
View File

@ -71,7 +71,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_FPV is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig
View File

@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
BR2_PACKAGE_MAJESTIC_ULTIMATE=y
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig
View File

@ -71,7 +71,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
# BR2_PACKAGE_MAJESTIC_FPV is not set
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig
View File

@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
BR2_PACKAGE_MAJESTIC_ULTIMATE=y
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_ultimate_defconfig
View File

@ -75,7 +75,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
BR2_PACKAGE_MAJESTIC_ULTIMATE=y
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

1
br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_ultimate_defconfig
View File

@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MAJESTIC=y
BR2_PACKAGE_MAJESTIC_ULTIMATE=y
BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y
# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set

8
general/package/majestic/Config.in
View File

@ -7,14 +7,6 @@ config BR2_PACKAGE_MAJESTIC
https://openipc.org https://openipc.org
config BR2_PACKAGE_MAJESTIC_ULTIMATE
bool "Use this option for the ultimate build"
default n
config BR2_PACKAGE_MAJESTIC_FPV
bool "Use this option for the fpv build"
default n
config BR2_PACKAGE_AMBARELLA_OSDRV_S3L config BR2_PACKAGE_AMBARELLA_OSDRV_S3L
bool bool
default n default n

43
general/package/majestic/majestic.mk
View File

@ -5,39 +5,40 @@
################################################################################ ################################################################################
MAJESTIC_VERSION = current MAJESTIC_VERSION = current
MAJESTIC_SOURCE =
MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com
MAJESTIC_LICENSE = MIT MAJESTIC_LICENSE = PROPRIETARY
MAJESTIC_LICENSE_FILES = LICENSE MAJESTIC_LICENSE_FILES = LICENSE
FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3) FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3)
ifeq ($(BR2_PACKAGE_MAJESTIC_ULTIMATE),y) # TODO: change field number removing unknown_unknown
BUILD = ultimate RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 5)
else ifeq ($(BR2_PACKAGE_MAJESTIC_FPV),y)
BUILD = fpv ifneq ($(RELEASE),ultimate)
else RELEASE := lite
BUILD = lite
endif endif
ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300),y) ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y)
MAJESTIC_SOURCE = majestic.hi3516ev300.$(BUILD).master.tar.bz2 FAMILY := t21
else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y)
MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2
else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T21),y)
MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2
else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y)
MAJESTIC_SOURCE = majestic.t30.$(BUILD).master.tar.bz2 FAMILY := t31
else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y)
MAJESTIC_SOURCE = majestic.t31.$(BUILD).master.tar.bz2 FAMILY := t31
else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y)
MAJESTIC_SOURCE = majestic.msc313e.$(BUILD).master.tar.bz2
else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y)
MAJESTIC_SOURCE = majestic.ssc335.$(BUILD).master.tar.bz2 FAMILY := ssc335
else
MAJESTIC_SOURCE = majestic.$(FAMILY).$(BUILD).master.tar.bz2
endif endif
MAJESTIC_SOURCE := majestic.$(FAMILY).$(RELEASE).master.tar.bz2
MAJESTIC_DEPENDENCIES = \
libevent-openipc \
mbedtls-openipc \
json-c-openipc \
zlib \
lame-openipc \
opus-openipc \
libogg-openipc
define MAJESTIC_INSTALL_TARGET_CMDS define MAJESTIC_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc $(INSTALL) -m 755 -d $(TARGET_DIR)/etc
$(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml