diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig index 099716f7..4b694558 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig @@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_FPV is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_ultimate_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_ultimate_defconfig index ca457f64..24d01c19 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_ultimate_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_ultimate_defconfig @@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig index a87b625d..6af4f22d 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig @@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_FPV is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig index 1f666491..96edb105 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig @@ -72,7 +72,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av100_ultimate_defconfig index e5c7b041..140a48c4 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av100_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av100_ultimate_defconfig @@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av200_ultimate_defconfig index 595bd8d2..4d680dfd 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av200_ultimate_defconfig @@ -77,7 +77,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig index 9feeba44..045f42e6 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig @@ -75,7 +75,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv100_ultimate_defconfig index 680845b6..ddefcef1 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv100_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv100_ultimate_defconfig @@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig index 0f19a4e9..73d38655 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig @@ -71,7 +71,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_FPV is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig index ddc71624..b1ab2941 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig @@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -BR2_PACKAGE_MAJESTIC_ULTIMATE=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig index 1e3a77f0..a8eaed2e 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig @@ -71,7 +71,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -# BR2_PACKAGE_MAJESTIC_FPV is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig index a8e50a8d..558a5283 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig @@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -BR2_PACKAGE_MAJESTIC_ULTIMATE=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_ultimate_defconfig index fbd41e32..3acc4aa8 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_ultimate_defconfig @@ -75,7 +75,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -BR2_PACKAGE_MAJESTIC_ULTIMATE=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_ultimate_defconfig index 562ff842..8edfa934 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_ultimate_defconfig @@ -76,7 +76,6 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC=y -BR2_PACKAGE_MAJESTIC_ULTIMATE=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/general/package/majestic/Config.in b/general/package/majestic/Config.in index f0ad7aec..e17f3e99 100644 --- a/general/package/majestic/Config.in +++ b/general/package/majestic/Config.in @@ -7,14 +7,6 @@ config BR2_PACKAGE_MAJESTIC 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 bool default n diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index 2bd9f296..1404885e 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -5,39 +5,40 @@ ################################################################################ MAJESTIC_VERSION = current -MAJESTIC_SOURCE = MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com -MAJESTIC_LICENSE = MIT +MAJESTIC_LICENSE = PROPRIETARY MAJESTIC_LICENSE_FILES = LICENSE FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3) -ifeq ($(BR2_PACKAGE_MAJESTIC_ULTIMATE),y) -BUILD = ultimate -else ifeq ($(BR2_PACKAGE_MAJESTIC_FPV),y) -BUILD = fpv -else -BUILD = lite +# TODO: change field number removing unknown_unknown +RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 5) + +ifneq ($(RELEASE),ultimate) + RELEASE := lite endif -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300),y) -MAJESTIC_SOURCE = majestic.hi3516ev300.$(BUILD).master.tar.bz2 -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 +ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y) + FAMILY := t21 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) -MAJESTIC_SOURCE = majestic.t31.$(BUILD).master.tar.bz2 -else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y) -MAJESTIC_SOURCE = majestic.msc313e.$(BUILD).master.tar.bz2 + FAMILY := t31 else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) -MAJESTIC_SOURCE = majestic.ssc335.$(BUILD).master.tar.bz2 -else -MAJESTIC_SOURCE = majestic.$(FAMILY).$(BUILD).master.tar.bz2 + FAMILY := ssc335 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 $(INSTALL) -m 755 -d $(TARGET_DIR)/etc $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml