From 23d982699285717efe87ca05144c5d3fd9f912c9 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sun, 26 Sep 2021 02:48:02 +0300 Subject: wpa_supplicant: use libnl-tiny instead --- extra/wpa_supplicant/build | 15 +++++++++++++-- extra/wpa_supplicant/checksums | 5 +++-- extra/wpa_supplicant/depends | 6 +++--- extra/wpa_supplicant/files/.config | 7 ++++--- extra/wpa_supplicant/files/wpa_supplicant.run | 2 ++ 5 files changed, 25 insertions(+), 10 deletions(-) create mode 100755 extra/wpa_supplicant/files/wpa_supplicant.run diff --git a/extra/wpa_supplicant/build b/extra/wpa_supplicant/build index 9b82e869..125301f1 100755 --- a/extra/wpa_supplicant/build +++ b/extra/wpa_supplicant/build @@ -2,5 +2,16 @@ cd wpa_supplicant -make LIBDIR=/usr/lib BINDIR=/usr/bin LDFLAGS="$LDFLAGS -static" -make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="$1" install +mk() { + make \ + LIBDIR=/usr/lib \ + BINDIR=/usr/bin \ + LDFLAGS="$LDFLAGS -static" \ + "$@" +} + +mk +mk DESTDIR="$1" install + +clman -d "$1" ./doc/docbook/*.[0-9] +clsv -d "$1" wpa_supplicant.run diff --git a/extra/wpa_supplicant/checksums b/extra/wpa_supplicant/checksums index 8be19a91..d990a7e9 100644 --- a/extra/wpa_supplicant/checksums +++ b/extra/wpa_supplicant/checksums @@ -1,2 +1,3 @@ -fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz -6a753cde8110f38580ed8e73a50b344c9249aabcef9f1fc689900e9f0c424640 .config +%BLAKE3 +ab40db58499bba835d5a9979295022678dcf2b7d23397d9330fa24ed3f1ed832 wpa_supplicant-2.9.tar.gz +67a51a809af00ee94b712c3c10d95114eaf9844cd9301de43ee470e0e2ad9305 .config diff --git a/extra/wpa_supplicant/depends b/extra/wpa_supplicant/depends index acecf458..9c0f7582 100644 --- a/extra/wpa_supplicant/depends +++ b/extra/wpa_supplicant/depends @@ -1,3 +1,3 @@ -libnl make -libressl make -pkgconf make +libnl-tiny make +libressl make +pkgconf make diff --git a/extra/wpa_supplicant/files/.config b/extra/wpa_supplicant/files/.config index 5851a44f..fd8c998f 100644 --- a/extra/wpa_supplicant/files/.config +++ b/extra/wpa_supplicant/files/.config @@ -37,14 +37,15 @@ CONFIG_DRIVER_NL80211=y # driver_nl80211.c requires libnl. If you are compiling it yourself # you may need to point hostapd to your version of libnl. # -#CFLAGS += -I$ -#LIBS += -L$ +CFLAGS += -I/usr/include/libnl-tiny -DLIBNL1_COMPAT -D_GNU_SOURCE +LIBS += /usr/lib/libnl-tiny.a +CONFIG_LIBNL_TINY=y # Use libnl v2.0 (or 3.0) libraries. #CONFIG_LIBNL20=y # Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) -CONFIG_LIBNL32=y +#CONFIG_LIBNL32=y # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) diff --git a/extra/wpa_supplicant/files/wpa_supplicant.run b/extra/wpa_supplicant/files/wpa_supplicant.run new file mode 100755 index 00000000..55e1be7f --- /dev/null +++ b/extra/wpa_supplicant/files/wpa_supplicant.run @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec wpa_supplicant -C /etc/wpa_supplicant.conf -- cgit v1.2.3