From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 21 Oct 2017 20:18:53 +0000 (+0300)
Subject: wpa-supplicant: old oe hacks
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openembedded.git;a=commitdiff_plain;h=e70ea93b4041a0e0580eb85ba38193f01cab23ed

wpa-supplicant: old oe hacks
---

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 18b170950e..41cd42058a 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -52,7 +52,7 @@ PREFERRED_VERSION_udev_libc-uclibc = "141"
 UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_usbutils = "0.86"
-PREFERRED_VERSION_wpa-supplicant = "2.2"
+# PREFERRED_VERSION_wpa-supplicant = "2.6"
 PREFERRED_VERSION_xserver-common = "1.32"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
 
diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.6.bb b/recipes/wpa-supplicant/wpa-supplicant_2.6.bb
index d6d4206a58..d789ee87d3 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_2.6.bb
+++ b/recipes/wpa-supplicant/wpa-supplicant_2.6.bb
@@ -6,17 +6,20 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=292eece3f2ebbaa25608eed8464018a3 \
                     file://README;beginline=1;endline=56;md5=3f01d778be8f953962388307ee38ed2b \
                     file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=4061612fc5715696134e3baf933e8aba"
-DEPENDS = "dbus libnl"
+DEPENDS = "dbus libnl gnutls libgcrypt"
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
-PACKAGECONFIG ??= "gnutls"
-PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt"
-PACKAGECONFIG[openssl] = ",,openssl"
+#PACKAGECONFIG ??= "gnutls"
+#PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt"
+#PACKAGECONFIG[openssl] = ",,openssl"
 
-inherit pkgconfig systemd
+export PACKAGECONFIG = "gnutls"
 
-SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
-SYSTEMD_AUTO_ENABLE = "disable"
+inherit pkgconfig
+# systemd
+
+#SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
+#SYSTEMD_AUTO_ENABLE = "disable"
 
 SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz  \
            file://defconfig \
@@ -24,7 +27,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz  \
            file://wpa_supplicant.conf \
            file://wpa_supplicant.conf-sane \
            file://99_wpa_supplicant \
-           file://key-replay-cve-multiple.patch \
+           file://key-replay-cve-multiple.patch;patch=1 \
           "
 SRC_URI[md5sum] = "091569eb4440b7d7f2b4276dbfc03c3c"
 SRC_URI[sha256sum] = "b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450"
@@ -42,8 +45,8 @@ CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
 do_configure () {
 	${MAKE} -C wpa_supplicant clean
 	install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config
-	echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config
-	echo "DRV_CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config
+	#echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config
+	#echo "DRV_CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config
 	
 	if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then
         	ssl=openssl
@@ -54,6 +57,9 @@ do_configure () {
         	sed -i "s/%ssl%/$ssl/" wpa_supplicant/.config
 	fi
 
+	# pandora has old libnl
+	sed -i "s/^CONFIG_LIBNL32=y/#CONFIG_LIBNL32=y/" wpa_supplicant/.config
+
 	# For rebuild
 	rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d
 }
@@ -93,11 +99,6 @@ do_install () {
 	install -d ${D}/${datadir}/dbus-1/system-services
 	install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
 
-	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-		install -d ${D}/${systemd_unitdir}/system
-		install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
-	fi
-
 	install -d ${D}/etc/default/volatiles
 	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }