From 467b3897fb643da792dab251c7cb3e963b27aef6 Mon Sep 17 00:00:00 2001 From: Anjan Chanda Date: Thu, 21 Aug 2025 09:50:01 +0200 Subject: [PATCH] Revert "libwifi: 7.13.0" This reverts commit 9917da1ca3ddfddbaeec82c98a2300d81c3839d2. --- libwifi/Makefile | 84 +++++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/libwifi/Makefile b/libwifi/Makefile index 0a717f36b..47d4d3506 100644 --- a/libwifi/Makefile +++ b/libwifi/Makefile @@ -1,32 +1,28 @@ # -# Copyright (C) 2019-2024 Iopsys -# Copyright (C) 2025 Genexis Sweden AB +# Copyright (C) 2020-2023 Iopsys # include $(TOPDIR)/rules.mk PKG_NAME:=libwifi -PKG_VERSION:=7.20.0 +PKG_VERSION:=7.14.0 LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=8ec7780251accc7068c1991dd97cf0a6feddc1de -PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libwifi.git +PKG_SOURCE_VERSION:=b4b8f524a93d03fd1f89d4c32b8eaca90d9ccc1a +PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git +PKG_MAINTAINER:=Anjan Chanda PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_HASH:=skip endif PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=LGPL-2.1-only -PKG_LICENSE_FILES:= -PKG_MAINTAINER:=Anjan Chanda - -MAKE_VERBOSE := 1 +PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/cmake.mk ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_PLATFORM=BROADCOM @@ -77,7 +73,6 @@ PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e_en7523:mt76_en7523 ifneq ($(CONFIG_PACKAGE_libwifi),) TARGET_CFLAGS +=-DHAS_WIFI -CMAKE_OPTIONS +=-DHAS_WIFI=ON endif ifeq ($(CONFIG_LIBWIFI_USE_CTRL_IFACE),y) @@ -88,8 +83,18 @@ ifeq ($(CONFIG_LIBWIFI_SKIP_PROBES),y) TARGET_CFLAGS +=-DLIBWIFI_BRCM_SKIP_PROBES endif +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/usr/include \ + -I$(STAGING_DIR)/usr/include/openssl \ + -I$(STAGING_DIR)/usr/include/libnl3 -CMAKE_OPTIONS += "-DPLATFORM=$(TARGET_PLATFORM) -DWIFI_TYPE=$(TARGET_WIFI_TYPE)" +MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + FPIC="$(FPIC)" \ + PLATFORM="$(TARGET_PLATFORM)" \ + WIFI_TYPE="$(TARGET_WIFI_TYPE)" \ + subdirs="$(subdirs)" ifeq ($(LOCAL_DEV),1) define Build/Prepare @@ -97,39 +102,43 @@ define Build/Prepare endef endif -define Package/libwifiutils - SECTION:=libs - CATEGORY:=Libraries - TITLE:= WiFi utility library (libwifiutils.so) - DEPENDS+=+libnl +libnl-route +libeasy +libopenssl -endef - -define Package/libwifiutils/description - Library provides WiFi utility functions -endef - -define Package/libwifi - SECTION:=libs - CATEGORY:=Libraries - TITLE:= WiFi HAL library (libwifi-7.so.m) - DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcm963xx-bsp +define Package/libwifi-common + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libwifi + SUBMENU:=IOPSYS HAL libs + DEPENDS:=+libopenssl + MENU:=1 endef define Package/libwifi/description - Library provides WiFi HAL APIs + Library provides WiFi HAL APIs and WiFi common utility functions +endef + +define Package/libwifiutils + $(call Package/libwifi-common) + TITLE:= WiFi utility library (libwifiutils.so) + DEPENDS+=+libnl +libnl-route +libeasy endef define Build/InstallDev/libwifiutils $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libwifiutils/wifidefs.h $(1)/usr/include/ - $(CP) $(PKG_BUILD_DIR)/libwifiutils/wifiutils.h $(1)/usr/include/ - $(CP) $(PKG_BUILD_DIR)/libwifiutils/libwifiutils*.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/wifidefs.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/wifiutils.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/libwifiutils*.so* $(1)/usr/lib/ endef define Package/libwifiutils/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libwifiutils/libwifiutils*.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libwifiutils*.so* $(1)/usr/lib/ +endef + + +define Package/libwifi + $(call Package/libwifi-common) + TITLE:= WiFi library (libwifi) + DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcm963xx-bsp endef define Package/libwifi/config @@ -150,12 +159,13 @@ define Package/libwifi/config endif endef + define Build/InstallDev/libwifi $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libwifi/wifiops.h $(1)/usr/include/ - $(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/ - $(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/wifiops.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/wifi.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/libwifi-7*.so* $(1)/usr/lib/ endef @@ -168,7 +178,7 @@ endef define Package/libwifi/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libwifi-7*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libwifiutils))