[General] use global release and family variable (#768)

Co-authored-by: viktorxda <viktorxda@users.noreply.github.com>
pull/771/head
viktorxda 2023-05-08 04:05:54 +02:00 committed by GitHub
parent 55dbb4d84b
commit ca3fffe5cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 61 deletions

View File

@ -1,6 +1,9 @@
export EXTERNAL_FAMILY = $(shell cat $(BR2_CONFIG) | grep -oE -m1 "board.\w+" | cut -d "/" -f 2)
export EXTERNAL_RELEASE = $(shell cat $(BR2_CONFIG) | grep -oE "\w+_defconfig" | cut -d "_" -f 2)
export EXTERNAL_VENDOR = $(shell cat $(BR2_CONFIG) | grep -oE "br-ext-chip-\w+" | cut -d "-" -f 4)
BR2_EXTERNAL_VENDOR_PATH = $(BR2_EXTERNAL_GENERAL_PATH)/../br-ext-chip-$(EXTERNAL_VENDOR)
BR2_EXTERNAL_SCRIPTS_PATH = $(BR2_EXTERNAL_GENERAL_PATH)/../scripts
include $(BR2_EXTERNAL_GENERAL_PATH)/linux/linux-ext-vendor-patcher.mk include $(BR2_EXTERNAL_GENERAL_PATH)/linux/linux-ext-vendor-patcher.mk
include $(sort $(wildcard $(BR2_EXTERNAL_GENERAL_PATH)/package/*/*.mk)) include $(sort $(wildcard $(BR2_EXTERNAL_GENERAL_PATH)/package/*/*.mk))
export EXTERNAL_VENDOR = $(shell echo $(BR2_DEFCONFIG) | grep -o "br-ext-chip-\w*")
BR2_EXTERNAL_VENDOR_PATH = $(BR2_EXTERNAL_GENERAL_PATH)/../$(EXTERNAL_VENDOR)
BR2_EXTERNAL_SCRIPTS_PATH = $(BR2_EXTERNAL_GENERAL_PATH)/../scripts

View File

@ -24,7 +24,6 @@ define AMBARELLA_OSDRV_S3L_INSTALL_TARGET_CMDS
# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(AMBARELLA_OSDRV_S3L_PKGDIR)/files/sensor/*.so # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(AMBARELLA_OSDRV_S3L_PKGDIR)/files/sensor/*.so
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(AMBARELLA_OSDRV_S3L_PKGDIR)/files/lib/xxx.so # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(AMBARELLA_OSDRV_S3L_PKGDIR)/files/lib/xxx.so
endef endef

View File

@ -7,14 +7,11 @@ DATALINK_VERSION =
DATALINK_SITE = DATALINK_SITE =
DATALINK_LICENSE = GPL-2.0 DATALINK_LICENSE = GPL-2.0
DATALINK_FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3)
DATALINK_RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 3)
DATALINK_FPATH = air DATALINK_FPATH = air
ifeq ($(EXTERNAL_FAMILY),hi3536dv100)
ifeq ($(DATALINK_FAMILY),hi3536dv100) ifeq ($(EXTERNAL_RELEASE),fpv)
ifeq ($(DATALINK_RELEASE),fpv) DATALINK_FPATH = gs
DATALINK_FPATH = gs endif
endif
endif endif
define DATALINK_INSTALL_TARGET_CMDS define DATALINK_INSTALL_TARGET_CMDS

View File

@ -5,16 +5,13 @@
################################################################################ ################################################################################
# - Package information # - Package information
DF_SDWAN_EDGE_VERSION = current DF_SDWAN_EDGE_VERSION = current
DF_SDWAN_EDGE_SITE = http://getdataflow.ru/download/sdwan/openipc DF_SDWAN_EDGE_SITE = http://getdataflow.ru/download/sdwan/openipc
DF_SDWAN_EDGE_LICENSE = PROPRIETARY DF_SDWAN_EDGE_LICENSE = PROPRIETARY
DF_SDWAN_EDGE_LICENSE_FILES = LICENSE DF_SDWAN_EDGE_LICENSE_FILES = LICENSE
# - Detect CPU family
DF_SDWAN_EDGE_FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3)
# - File name on server # - File name on server
DF_SDWAN_EDGE_SOURCE := df_sdwan_edge.$(DF_SDWAN_EDGE_FAMILY).tar.xz DF_SDWAN_EDGE_SOURCE = df_sdwan_edge.$(EXTERNAL_FAMILY).tar.xz
# - Install commands # - Install commands
define DF_SDWAN_EDGE_INSTALL_TARGET_CMDS define DF_SDWAN_EDGE_INSTALL_TARGET_CMDS
@ -25,21 +22,21 @@ define DF_SDWAN_EDGE_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/opt/sdwan/config $(INSTALL) -m 755 -d $(TARGET_DIR)/opt/sdwan/config
# --- Install binaries # --- Install binaries
$(INSTALL) -m 755 $(@D)/bin/sdwan-edge-core $(TARGET_DIR)/opt/sdwan/bin/sdwan-edge-core $(INSTALL) -m 755 $(@D)/bin/sdwan-edge-core $(TARGET_DIR)/opt/sdwan/bin/sdwan-edge-core
$(INSTALL) -m 644 $(@D)/bin/libdataflow.so $(TARGET_DIR)/opt/sdwan/bin/libdataflow.so $(INSTALL) -m 644 $(@D)/bin/libdataflow.so $(TARGET_DIR)/opt/sdwan/bin/libdataflow.so
$(INSTALL) -m 644 $(@D)/bin/modules/df_netio.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_netio.so $(INSTALL) -m 644 $(@D)/bin/modules/df_netio.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_netio.so
$(INSTALL) -m 644 $(@D)/bin/modules/df_sdfl.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_sdfl.so $(INSTALL) -m 644 $(@D)/bin/modules/df_sdfl.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_sdfl.so
$(INSTALL) -m 644 $(@D)/bin/modules/df_sdwan-edge.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_sdwan-edge.so $(INSTALL) -m 644 $(@D)/bin/modules/df_sdwan-edge.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_sdwan-edge.so
# --- Install configuration # --- Install configuration
$(INSTALL) -m 644 $(@D)/config/edge.conf $(TARGET_DIR)/opt/sdwan/config/edge.conf $(INSTALL) -m 644 $(@D)/config/edge.conf $(TARGET_DIR)/opt/sdwan/config/edge.conf
$(INSTALL) -m 644 $(@D)/config/memory.conf $(TARGET_DIR)/opt/sdwan/config/memory.conf $(INSTALL) -m 644 $(@D)/config/memory.conf $(TARGET_DIR)/opt/sdwan/config/memory.conf
$(INSTALL) -m 644 $(@D)/config/sdwan.conf $(TARGET_DIR)/opt/sdwan/config/sdwan.conf $(INSTALL) -m 644 $(@D)/config/sdwan.conf $(TARGET_DIR)/opt/sdwan/config/sdwan.conf
$(INSTALL) -m 644 $(@D)/config/sdwan_logger.conf $(TARGET_DIR)/opt/sdwan/config/sdwan_logger.conf $(INSTALL) -m 644 $(@D)/config/sdwan_logger.conf $(TARGET_DIR)/opt/sdwan/config/sdwan_logger.conf
# --- Install service # --- Install service
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
$(INSTALL) -m 755 $(@D)/service/S45sdwan-edge $(TARGET_DIR)/etc/init.d/S45sdwan-edge $(INSTALL) -m 755 $(@D)/service/S45sdwan-edge $(TARGET_DIR)/etc/init.d/S45sdwan-edge
endef endef

View File

@ -9,12 +9,12 @@ GOKE_OSDRV_GK710X_SITE =
GOKE_OSDRV_GK710X_LICENSE = MIT GOKE_OSDRV_GK710X_LICENSE = MIT
GOKE_OSDRV_GK710X_LICENSE_FILES = LICENSE GOKE_OSDRV_GK710X_LICENSE_FILES = LICENSE
CHIP := $(shell echo $(BOARD) | cut -d "_" -f 1) GOKE_OSDRV_GK710X_CHIP = $(shell echo $(BOARD) | cut -d "_" -f 1)
ifeq ($(CHIP),gk7102) ifeq ($(GOKE_OSDRV_GK710X_CHIP),gk7102)
FIRMWARE=gk_fw_710x.bin GOKE_OSDRV_GK710X_FIRMWARE = gk_fw_710x.bin
else ifeq ($(CHIP),gk7102s) else ifeq ($(GOKE_OSDRV_GK710X_CHIP),gk7102s)
FIRMWARE=gk_fw_710xs.bin GOKE_OSDRV_GK710X_FIRMWARE = gk_fw_710xs.bin
endif endif
define GOKE_OSDRV_GK710X_INSTALL_TARGET_CMDS define GOKE_OSDRV_GK710X_INSTALL_TARGET_CMDS
@ -24,7 +24,7 @@ define GOKE_OSDRV_GK710X_INSTALL_TARGET_CMDS
$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(GOKE_OSDRV_GK710X_PKGDIR)/files/sensor/config/gc1034.bin $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(GOKE_OSDRV_GK710X_PKGDIR)/files/sensor/config/gc1034.bin
$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(GOKE_OSDRV_GK710X_PKGDIR)/files/sensor/fw/$(FIRMWARE) $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(GOKE_OSDRV_GK710X_PKGDIR)/files/sensor/fw/$(GOKE_OSDRV_GK710X_FIRMWARE)
$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke $(GOKE_OSDRV_GK710X_PKGDIR)/files/kmod/*.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke $(GOKE_OSDRV_GK710X_PKGDIR)/files/kmod/*.ko

View File

@ -9,31 +9,29 @@ HISILICON_OPENSDK_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK
HISILICON_OPENSDK_LICENSE = GPL-3.0 HISILICON_OPENSDK_LICENSE = GPL-3.0
HISILICON_OPENSDK_LICENSE_FILES = LICENSE HISILICON_OPENSDK_LICENSE_FILES = LICENSE
HISILICON_OPENSDK_FAMILY = $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3)
HISILICON_OPENSDK_MODULE_SUBDIRS = kernel HISILICON_OPENSDK_MODULE_SUBDIRS = kernel
HISILICON_OPENSDK_MODULE_MAKE_OPTS = \ HISILICON_OPENSDK_MODULE_MAKE_OPTS = \
DISABLE_IST=1 \ DISABLE_IST=1 \
DISABLE_PM=1 \ DISABLE_PM=1 \
DISABLE_TDE=1 \ DISABLE_TDE=1 \
DISABLE_VO=1 \ DISABLE_VO=1 \
CHIPARCH=$(HISILICON_OPENSDK_FAMILY) CHIPARCH=$(EXTERNAL_FAMILY)
ifeq ($(HISILICON_OPENSDK_FAMILY),hi3516ev200) ifeq ($(EXTERNAL_FAMILY),hi3516ev200)
HISILICON_OPENSDK_MODULE_MAKE_OPTS += DISABLE_ISP=1 HISILICON_OPENSDK_MODULE_MAKE_OPTS += DISABLE_ISP=1
SDK_CODE=0x3516E200 HISILICON_OPENSDK_SDK_CODE = 0x3516E200
else ifeq ($(HISILICON_OPENSDK_FAMILY),gk7205v200) else ifeq ($(EXTERNAL_FAMILY),gk7205v200)
SDK_CODE=0x7205200 HISILICON_OPENSDK_SDK_CODE = 0x7205200
endif endif
# for userspace libraries # for userspace libraries
define HISILICON_OPENSDK_BUILD_CMDS define HISILICON_OPENSDK_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) CHIPARCH=$(HISILICON_OPENSDK_FAMILY) SDK_CODE=$(SDK_CODE) -C $(@D)/libraries all $(MAKE) $(TARGET_CONFIGURE_OPTS) CHIPARCH=$(EXTERNAL_FAMILY) SDK_CODE=$(HISILICON_OPENSDK_SDK_CODE) -C $(@D)/libraries all
endef endef
define HISILICON_OPENSDK_INSTALL_TARGET_CMDS define HISILICON_OPENSDK_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors
$(INSTALL) -D -m 0644 $(@D)/libraries/sensor/$(HISILICON_OPENSDK_FAMILY)/sony_imx335/libsns_imx335.so $(TARGET_DIR)/usr/lib/sensors $(INSTALL) -D -m 0644 $(@D)/libraries/sensor/$(EXTERNAL_FAMILY)/sony_imx335/libsns_imx335.so $(TARGET_DIR)/usr/lib/sensors
endef endef
$(eval $(kernel-module)) $(eval $(kernel-module))

View File

@ -9,24 +9,24 @@ MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com
MAJESTIC_LICENSE = PROPRIETARY MAJESTIC_LICENSE = PROPRIETARY
MAJESTIC_LICENSE_FILES = LICENSE MAJESTIC_LICENSE_FILES = LICENSE
MAJESTIC_FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3) MAJESTIC_FAMILY = $(EXTERNAL_FAMILY)
MAJESTIC_RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 3) MAJESTIC_RELEASE = $(EXTERNAL_RELEASE)
ifeq ($(MAJESTIC_RELEASE),ultimate) ifeq ($(MAJESTIC_RELEASE),ultimate)
# we don't have Majestic binary Ultimate distributions for these # we don't have Majestic binary Ultimate distributions for these
# platforms so use Lite # platforms so use Lite
ifeq ($(MAJESTIC_FAMILY),hi3516av100) ifeq ($(MAJESTIC_FAMILY),hi3516av100)
MAJESTIC_RELEASE := lite MAJESTIC_RELEASE = lite
else ifeq ($(MAJESTIC_FAMILY),hi3519v101) else ifeq ($(MAJESTIC_FAMILY),hi3519v101)
MAJESTIC_RELEASE := lite MAJESTIC_RELEASE = lite
endif endif
endif endif
ifeq ($(MAJESTIC_RELEASE),lte) ifeq ($(MAJESTIC_RELEASE),lte)
MAJESTIC_RELEASE := fpv MAJESTIC_RELEASE = fpv
endif endif
MAJESTIC_SOURCE := majestic.$(MAJESTIC_FAMILY).$(MAJESTIC_RELEASE).master.tar.bz2 MAJESTIC_SOURCE = majestic.$(MAJESTIC_FAMILY).$(MAJESTIC_RELEASE).master.tar.bz2
MAJESTIC_DEPENDENCIES = \ MAJESTIC_DEPENDENCIES = \
libevent-openipc \ libevent-openipc \

View File

@ -12,12 +12,12 @@ MINI_LICENSE = GPL-3.0
MINI_LICENSE_FILES = LICENSE MINI_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV200),y) ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV200),y)
SDK_DIR := glutinium/hisi-osdrv2 MINI_SDK_DIR = glutinium/hisi-osdrv2
else ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV300),y) else ifeq ($(BR2_PACKAGE_HISILICON_OSDRV_HI3516CV300),y)
SDK_DIR := glutinium/hisi-osdrv3 MINI_SDK_DIR = glutinium/hisi-osdrv3
endif endif
MINI_CONF_OPTS = -DPLATFORM_SDK_DIR=$(SDK_DIR) MINI_CONF_OPTS = -DPLATFORM_SDK_DIR=$(MINI_SDK_DIR)
define MINI_INSTALL_TARGET_CMDS define MINI_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc $(INSTALL) -m 755 -d $(TARGET_DIR)/etc

View File

@ -7,14 +7,11 @@ WIFIBROADCAST_VERSION = 23.01
WIFIBROADCAST_SITE = $(call github,svpcom,wfb-ng,wfb-ng-$(WIFIBROADCAST_VERSION)) WIFIBROADCAST_SITE = $(call github,svpcom,wfb-ng,wfb-ng-$(WIFIBROADCAST_VERSION))
WIFIBROADCAST_LICENSE = GPL-2.0 WIFIBROADCAST_LICENSE = GPL-2.0
WIFIBROADCAST_FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3)
WIFIBROADCAST_RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 3)
WIFIBROADCAST_FPATH = air WIFIBROADCAST_FPATH = air
ifeq ($(EXTERNAL_FAMILY),hi3536dv100)
ifeq ($(WIFIBROADCAST_FAMILY),hi3536dv100) ifeq ($(EXTERNAL_RELEASE),fpv)
ifeq ($(WIFIBROADCAST_RELEASE),fpv) WIFIBROADCAST_FPATH = gs
WIFIBROADCAST_FPATH = gs endif
endif
endif endif
WIFIBROADCAST_DEPENDENCIES += libpcap libsodium iw WIFIBROADCAST_DEPENDENCIES += libpcap libsodium iw