diff --git a/general/package/datalink/datalink.mk b/general/package/datalink/datalink.mk index 4d1a7de4..38d81cf1 100644 --- a/general/package/datalink/datalink.mk +++ b/general/package/datalink/datalink.mk @@ -8,17 +8,16 @@ DATALINK_SITE = DATALINK_LICENSE = GPL-2.0 FPATH = air +FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3) + +RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 3) + ifeq ($(FAMILY),hi3536dv100) ifeq ($(RELEASE),fpv) FPATH = gs endif endif -#$(info $(FAMILY)) -#$(info $(RELEASE)) -#$(info $(FPATH)) - - define DATALINK_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc cp ../general/package/datalink/files/datalink.conf $(TARGET_DIR)/etc diff --git a/general/package/wifibroadcast/wifibroadcast.mk b/general/package/wifibroadcast/wifibroadcast.mk index c347cb9e..8fbf4be9 100644 --- a/general/package/wifibroadcast/wifibroadcast.mk +++ b/general/package/wifibroadcast/wifibroadcast.mk @@ -8,16 +8,16 @@ WIFIBROADCAST_SITE = $(call github,svpcom,wfb-ng,wfb-ng-$(WIFIBROADCAST_VERSION) WIFIBROADCAST_LICENSE = GPL-2.0 FPATH = air +FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3) + +RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 3) + ifeq ($(FAMILY),hi3536dv100) ifeq ($(RELEASE),fpv) FPATH = gs endif endif -#$(info $(FAMILY)) -#$(info $(RELEASE)) -#$(info $(FPATH)) - WIFIBROADCAST_DEPENDENCIES += libpcap libsodium iw WIFIBROADCAST_MAKE_OPTS = \ diff --git a/openipc.lock b/openipc.lock deleted file mode 100644 index ae551775..00000000 --- a/openipc.lock +++ /dev/null @@ -1 +0,0 @@ -1376334