From d010bf375140c143c8ca5d7206272a71b264ffcf Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Sat, 7 Aug 2021 20:39:46 +0300 Subject: [PATCH] Update libevent --- ...unknown_unknown_hi3516ev300_opus_defconfig | 14 +++++----- general/package/lame-openipc/lame-openipc.mk | 1 - general/package/libevent-mini/Config.in | 6 ----- .../package/libevent-mini/libevent-mini.mk | 26 ------------------- .../libevent-openipc/libevent-openipc.mk | 22 ++++++++++++---- 5 files changed, 24 insertions(+), 45 deletions(-) delete mode 100644 general/package/libevent-mini/Config.in delete mode 100644 general/package/libevent-mini/libevent-mini.mk diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_opus_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_opus_defconfig index 47cff908..c772b096 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_opus_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_opus_defconfig @@ -62,13 +62,13 @@ BR2_PACKAGE_VTUND_OPENIPC=y BR2_PACKAGE_YAML_CLI=y # WiFi -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y +# BR2_PACKAGE_WIRELESS_TOOLS is not set +# BR2_PACKAGE_WPA_SUPPLICANT is not set +# BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set +# BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set +# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set +# BR2_PACKAGE_LINUX_FIRMWARE is not set +# BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U is not set # Unused # BR2_SHARED_STATIC_LIBS is not set diff --git a/general/package/lame-openipc/lame-openipc.mk b/general/package/lame-openipc/lame-openipc.mk index dec9800d..940b4936 100644 --- a/general/package/lame-openipc/lame-openipc.mk +++ b/general/package/lame-openipc/lame-openipc.mk @@ -6,7 +6,6 @@ LAME_OPENIPC_VERSION = 3.100 LAME_OPENIPC_SOURCE = lame-$(LAME_OPENIPC_VERSION).tar.gz -#LAME_OPENIPC_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_OPENIPC_VERSION) LAME_OPENIPC_SITE = http://prdownloads.sourceforge.net/lame LAME_OPENIPC_DEPENDENCIES = host-pkgconf LAME_OPENIPC_INSTALL_STAGING = YES diff --git a/general/package/libevent-mini/Config.in b/general/package/libevent-mini/Config.in deleted file mode 100644 index 4a2c122c..00000000 --- a/general/package/libevent-mini/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBEVENT_MINI - bool "libevent-mini" - help - Userspace library for handling asynchronous notifications (mini) - - http://libevent.org diff --git a/general/package/libevent-mini/libevent-mini.mk b/general/package/libevent-mini/libevent-mini.mk deleted file mode 100644 index f185200c..00000000 --- a/general/package/libevent-mini/libevent-mini.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# libevent-mini -# -################################################################################ - -LIBEVENT_MINI_VERSION = 2.1.12 -LIBEVENT_MINI_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_MINI_VERSION)-stable -LIBEVENT_MINI_SOURCE = libevent-$(LIBEVENT_MINI_VERSION)-stable.tar.gz -LIBEVENT_MINI_INSTALL_STAGING = YES -LIBEVENT_MINI_LICENSE = BSD-3-Clause, OpenBSD -LIBEVENT_MINI_LICENSE_FILES = LICENSE -LIBEVENT_MINI_CONF_OPTS = \ - --disable-thread-support \ - --disable-debug-mode \ - --disable-largefile \ - --disable-libevent-regress \ - --disable-samples \ - --disable-openssl - -define LIBEVENT_MINI_REMOVE_PYSCRIPT - rm $(TARGET_DIR)/usr/bin/event_rpcgen.py -endef - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/general/package/libevent-openipc/libevent-openipc.mk b/general/package/libevent-openipc/libevent-openipc.mk index 8756a6a3..5f4e5203 100644 --- a/general/package/libevent-openipc/libevent-openipc.mk +++ b/general/package/libevent-openipc/libevent-openipc.mk @@ -4,14 +4,26 @@ # ################################################################################ -LIBEVENT_OPENIPC_VERSION = 2.1.12 -LIBEVENT_OPENIPC_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_OPENIPC_VERSION)-stable -LIBEVENT_OPENIPC_SOURCE = libevent-$(LIBEVENT_OPENIPC_VERSION)-stable.tar.gz -# LIBEVENT_OPENIPC_VERSION = 6f139b871100aa2322598dfd37c4145e033d2602 -# LIBEVENT_OPENIPC_SITE = $(call github,libevent,libevent,$(LIBEVENT_OPENIPC_VERSION)) +# LIBEVENT_OPENIPC_VERSION = 2.1.12 +# LIBEVENT_OPENIPC_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_OPENIPC_VERSION)-stable +# LIBEVENT_OPENIPC_SOURCE = libevent-$(LIBEVENT_OPENIPC_VERSION)-stable.tar.gz +# +LIBEVENT_OPENIPC_VERSION = 6f139b871100aa2322598dfd37c4145e033d2602 +LIBEVENT_OPENIPC_SITE = $(call github,libevent,libevent,$(LIBEVENT_OPENIPC_VERSION)) +# LIBEVENT_OPENIPC_INSTALL_STAGING = YES LIBEVENT_OPENIPC_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_OPENIPC_LICENSE_FILES = LICENSE + +# This package uses autoconf, but not automake, so we need to call +# their special autogen.sh script, and have custom target and staging +# installation commands. + +define LIBEVENT_OPENIPC_RUN_AUTOGEN + cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef +LIBEVENT_OPENIPC_PRE_CONFIGURE_HOOKS += LIBEVENT_OPENIPC_RUN_AUTOGEN + LIBEVENT_OPENIPC_CONF_OPTS = \ --disable-libevent-regress \ --disable-samples \