From 44051fedc506f8554206c0dcc3c81053b68f8209 Mon Sep 17 00:00:00 2001 From: cronyx <xcronyx@gmail.com> Date: Wed, 3 Aug 2022 23:15:19 +0300 Subject: [PATCH 1/3] more strip majestic.mk --- Makefile | 1 - general/package/majestic/majestic.mk | 100 +++------------------------ 2 files changed, 9 insertions(+), 92 deletions(-) diff --git a/Makefile b/Makefile index 211bd172..47459037 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,6 @@ board-info: @cat $(BR_EXT_DIR)/board/$(FAMILY)/$(CHIP).config @cat $(BR_EXT_DIR)/board/$(BOARD)/config - # ------------------------------------------------------------------------------------------------- # such targets (with trimmed `br-` prefix) are passed to Buildroot's Makefile br-%: $(OUT_DIR)/.config diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index c5555fff..12d552e0 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -10,6 +10,8 @@ MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com MAJESTIC_LICENSE = MIT 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) @@ -18,104 +20,20 @@ else BUILD = lite endif -ifeq ($(BR2_PACKAGE_AMBARELLA_OSDRV_S3L),y) -MAJESTIC_SOURCE = majestic.s3l.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_ANYKA_OSDRV_AK3918EV200),y) -MAJESTIC_SOURCE = majestic.ak3918ev200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_ANYKA_OSDRV_AK3918EV300),y) -MAJESTIC_SOURCE = majestic.ak3918ev300.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_FULLHAN_OSDRV_FH8852V100),y) -MAJESTIC_SOURCE = majestic.fh8852v100.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_FULLHAN_OSDRV_FH8852V200),y) -MAJESTIC_SOURCE = majestic.fh8852v200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_GOKE_OSDRV_GK710X),y) -MAJESTIC_SOURCE = majestic.gk710x.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_GOKE_OSDRV_GK7205V200),y) -MAJESTIC_SOURCE = majestic.gk7205v200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_GRAINMEDIA_OSDRV_GM8136),y) -MAJESTIC_SOURCE = majestic.gm8136.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516AV100),y) -MAJESTIC_SOURCE = majestic.hi3516av100.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3519V101),y) -MAJESTIC_SOURCE = majestic.hi3519v101.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV100),y) -MAJESTIC_SOURCE = majestic.hi3516cv100.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV200),y) -MAJESTIC_SOURCE = majestic.hi3516cv200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV300),y) -MAJESTIC_SOURCE = majestic.hi3516cv300.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV500),y) -MAJESTIC_SOURCE = majestic.hi3516cv500.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300),y) -MAJESTIC_SOURCE = majestic.hi3516ev300.$(BUILD).master.tar.bz2 -endif - ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y) MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T21),y) +else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T21),y) MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) +else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) MAJESTIC_SOURCE = majestic.t30.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) +else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) MAJESTIC_SOURCE = majestic.t31.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_NOVATEK_OSDRV_NT9856X),y) -MAJESTIC_SOURCE = majestic.nt9856x.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_ROCKCHIP_OSDRV_RV11xx),y) -MAJESTIC_SOURCE = majestic.rv11xx.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y) +else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y) MAJESTIC_SOURCE = majestic.msc313e.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) +else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) MAJESTIC_SOURCE = majestic.ssc335.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_XIONGMAI_OSDRV_XM510),y) -MAJESTIC_SOURCE = majestic.xm510.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_XIONGMAI_OSDRV_XM530),y) -MAJESTIC_SOURCE = majestic.xm530.$(BUILD).master.tar.bz2 +else +MAJESTIC_SOURCE = majestic.$(FAMILY).$(BUILD).master.tar.bz2 endif define MAJESTIC_INSTALL_TARGET_CMDS From 0219c3199539858d9622734ea529d8f994960c2a Mon Sep 17 00:00:00 2001 From: cronyx <xcronyx@gmail.com> Date: Thu, 4 Aug 2022 09:37:47 +0300 Subject: [PATCH 2/3] revert strip --- general/package/majestic/majestic.mk | 100 ++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 9 deletions(-) diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index 12d552e0..c5555fff 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -10,8 +10,6 @@ MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com MAJESTIC_LICENSE = MIT 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) @@ -20,20 +18,104 @@ else BUILD = lite endif +ifeq ($(BR2_PACKAGE_AMBARELLA_OSDRV_S3L),y) +MAJESTIC_SOURCE = majestic.s3l.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_ANYKA_OSDRV_AK3918EV200),y) +MAJESTIC_SOURCE = majestic.ak3918ev200.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_ANYKA_OSDRV_AK3918EV300),y) +MAJESTIC_SOURCE = majestic.ak3918ev300.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_FULLHAN_OSDRV_FH8852V100),y) +MAJESTIC_SOURCE = majestic.fh8852v100.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_FULLHAN_OSDRV_FH8852V200),y) +MAJESTIC_SOURCE = majestic.fh8852v200.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_GOKE_OSDRV_GK710X),y) +MAJESTIC_SOURCE = majestic.gk710x.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_GOKE_OSDRV_GK7205V200),y) +MAJESTIC_SOURCE = majestic.gk7205v200.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_GRAINMEDIA_OSDRV_GM8136),y) +MAJESTIC_SOURCE = majestic.gm8136.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516AV100),y) +MAJESTIC_SOURCE = majestic.hi3516av100.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3519V101),y) +MAJESTIC_SOURCE = majestic.hi3519v101.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV100),y) +MAJESTIC_SOURCE = majestic.hi3516cv100.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV200),y) +MAJESTIC_SOURCE = majestic.hi3516cv200.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV300),y) +MAJESTIC_SOURCE = majestic.hi3516cv300.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV500),y) +MAJESTIC_SOURCE = majestic.hi3516cv500.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300),y) +MAJESTIC_SOURCE = majestic.hi3516ev300.$(BUILD).master.tar.bz2 +endif + ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y) MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2 -else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T21),y) +endif + +ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T21),y) MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2 -else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) +endif + +ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) MAJESTIC_SOURCE = majestic.t30.$(BUILD).master.tar.bz2 -else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) +endif + +ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) MAJESTIC_SOURCE = majestic.t31.$(BUILD).master.tar.bz2 -else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y) +endif + +ifeq ($(BR2_PACKAGE_NOVATEK_OSDRV_NT9856X),y) +MAJESTIC_SOURCE = majestic.nt9856x.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_ROCKCHIP_OSDRV_RV11xx),y) +MAJESTIC_SOURCE = majestic.rv11xx.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y) MAJESTIC_SOURCE = majestic.msc313e.$(BUILD).master.tar.bz2 -else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) +endif + +ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) MAJESTIC_SOURCE = majestic.ssc335.$(BUILD).master.tar.bz2 -else -MAJESTIC_SOURCE = majestic.$(FAMILY).$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_XIONGMAI_OSDRV_XM510),y) +MAJESTIC_SOURCE = majestic.xm510.$(BUILD).master.tar.bz2 +endif + +ifeq ($(BR2_PACKAGE_XIONGMAI_OSDRV_XM530),y) +MAJESTIC_SOURCE = majestic.xm530.$(BUILD).master.tar.bz2 endif define MAJESTIC_INSTALL_TARGET_CMDS From e5bce709e4b8f5830b6abd9b53bab8cc482a4f43 Mon Sep 17 00:00:00 2001 From: cronyx <xcronyx@gmail.com> Date: Thu, 4 Aug 2022 10:24:57 +0300 Subject: [PATCH 3/3] fix build ev200 ev300 based profiles --- general/package/majestic/majestic.mk | 100 +++------------------------ 1 file changed, 10 insertions(+), 90 deletions(-) diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index c5555fff..2bd9f296 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -10,6 +10,8 @@ MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com MAJESTIC_LICENSE = MIT 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) @@ -18,104 +20,22 @@ else BUILD = lite endif -ifeq ($(BR2_PACKAGE_AMBARELLA_OSDRV_S3L),y) -MAJESTIC_SOURCE = majestic.s3l.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_ANYKA_OSDRV_AK3918EV200),y) -MAJESTIC_SOURCE = majestic.ak3918ev200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_ANYKA_OSDRV_AK3918EV300),y) -MAJESTIC_SOURCE = majestic.ak3918ev300.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_FULLHAN_OSDRV_FH8852V100),y) -MAJESTIC_SOURCE = majestic.fh8852v100.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_FULLHAN_OSDRV_FH8852V200),y) -MAJESTIC_SOURCE = majestic.fh8852v200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_GOKE_OSDRV_GK710X),y) -MAJESTIC_SOURCE = majestic.gk710x.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_GOKE_OSDRV_GK7205V200),y) -MAJESTIC_SOURCE = majestic.gk7205v200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_GRAINMEDIA_OSDRV_GM8136),y) -MAJESTIC_SOURCE = majestic.gm8136.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516AV100),y) -MAJESTIC_SOURCE = majestic.hi3516av100.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3519V101),y) -MAJESTIC_SOURCE = majestic.hi3519v101.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV100),y) -MAJESTIC_SOURCE = majestic.hi3516cv100.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV200),y) -MAJESTIC_SOURCE = majestic.hi3516cv200.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV300),y) -MAJESTIC_SOURCE = majestic.hi3516cv300.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV500),y) -MAJESTIC_SOURCE = majestic.hi3516cv500.$(BUILD).master.tar.bz2 -endif - ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300),y) MAJESTIC_SOURCE = majestic.hi3516ev300.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y) +else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y) MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T21),y) +else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T21),y) MAJESTIC_SOURCE = majestic.t21.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) +else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) MAJESTIC_SOURCE = majestic.t30.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) +else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) MAJESTIC_SOURCE = majestic.t31.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_NOVATEK_OSDRV_NT9856X),y) -MAJESTIC_SOURCE = majestic.nt9856x.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_ROCKCHIP_OSDRV_RV11xx),y) -MAJESTIC_SOURCE = majestic.rv11xx.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y) +else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E),y) MAJESTIC_SOURCE = majestic.msc313e.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) +else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) MAJESTIC_SOURCE = majestic.ssc335.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_XIONGMAI_OSDRV_XM510),y) -MAJESTIC_SOURCE = majestic.xm510.$(BUILD).master.tar.bz2 -endif - -ifeq ($(BR2_PACKAGE_XIONGMAI_OSDRV_XM530),y) -MAJESTIC_SOURCE = majestic.xm530.$(BUILD).master.tar.bz2 +else +MAJESTIC_SOURCE = majestic.$(FAMILY).$(BUILD).master.tar.bz2 endif define MAJESTIC_INSTALL_TARGET_CMDS