Skip to contentSkip to conversation

aircrack-ng: add optional hwloc dependency

PATCH New Fabrice Fontaine 2 participants 4 messages Jan 30, 2019 – Feb 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 aircrack-ng: add optional hwloc dependency

hwloc dependency has been added in version 1.4 with
https://github.com/aircrack-ng/aircrack-ng/commit/c31b27449962bc69638b32ec14e0ffdb8997dfcf

---
 package/aircrack-ng/aircrack-ng.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/aircrack-ng/aircrack-ng.mk +7 -0
index 350e251bfe..b51332ab77 100644
@@ -31,6 +31,13 @@ else
 AIRCRACK_NG_CONF_OPTS += --without-duma
 endif
 
+ifeq ($(BR2_PACKAGE_HWLOC),y)
+AIRCRACK_NG_DEPENDENCIES += hwloc
+AIRCRACK_NG_CONF_OPTS += --enable-hwloc
+else
+AIRCRACK_NG_CONF_OPTS += --disable-hwloc
+endif
+
 ifeq ($(BR2_PACKAGE_JEMALLOC),y)
 AIRCRACK_NG_DEPENDENCIES += jemalloc
 AIRCRACK_NG_CONF_OPTS += --with-jemalloc
Signature · 1 line
2.14.1
#1 lore raw

PATCH 2/3 aircrack-ng: add optional cmocka dependency

cmocka dependency has been added in version 1.3 with
https://github.com/aircrack-ng/aircrack-ng/commit/e3a3a6db30ca99c2473928621a1ba234abcaebf3

---
 package/aircrack-ng/aircrack-ng.mk | 1 +
 1 file changed, 1 insertion(+)
package/aircrack-ng/aircrack-ng.mk +1 -0
index b51332ab77..64dc15a4aa 100644
@@ -9,6 +9,7 @@ AIRCRACK_NG_SITE = http://download.aircrack-ng.org
 AIRCRACK_NG_LICENSE = GPL-2.0+
 AIRCRACK_NG_LICENSE_FILES = LICENSE
 AIRCRACK_NG_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_CMOCKA),cmocka) \
 	$(if $(BR2_PACKAGE_LIBNL),libnl) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_PCRE),pcre) \
Signature · 1 line
2.14.1
#2 lore raw

PATCH 3/3 aircrack-ng: bump to version 1.5.2

In reply to Fabrice Fontaine
---
 package/aircrack-ng/aircrack-ng.hash | 4 ++--
 package/aircrack-ng/aircrack-ng.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/aircrack-ng/aircrack-ng.hash +2 -2
index 031e803eee..d8a171dc07 100644
@@ -1,6 +1,6 @@
 # From http://www.aircrack-ng.org/downloads.html
-sha1 22bae2c6f21e463df62b4c06c9c3c45c42a9b4ea aircrack-ng-1.4.tar.gz
-md5 24e22f6f6eca1e7dc0d203e5719d3e8d aircrack-ng-1.3.tar.gz
+sha1 7b63c7ce01cb65a4775833c6cadf7ddd82bf46d5 aircrack-ng-1.5.2.tar.gz
+md5 2648c192d206e953c67dca64967d2982 aircrack-ng-1.5.2.tar.gz
 
 # Hash for license file:
 sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE
package/aircrack-ng/aircrack-ng.mk +1 -1
index 64dc15a4aa..a6db384b84 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AIRCRACK_NG_VERSION = 1.4
+AIRCRACK_NG_VERSION = 1.5.2
 AIRCRACK_NG_SITE = http://download.aircrack-ng.org
 AIRCRACK_NG_LICENSE = GPL-2.0+
 AIRCRACK_NG_LICENSE_FILES = LICENSE
Signature · 1 line
2.14.1
#3 lore raw

PATCH 1/3 aircrack-ng: add optional hwloc dependency

In reply to Fabrice Fontaine

Hello Fabrice,

Quoted 7 lines · On Wed, 30 Jan 2019 18:28:33 +0100 Fabrice Fontaine…

hwloc dependency has been added in version 1.4 with
https://github.com/aircrack-ng/aircrack-ng/commit/c31b27449962bc69638b32ec14e0ffdb8997dfcf

---
 package/aircrack-ng/aircrack-ng.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Series applied, thanks. I hesitated a bit on PATCH 2/3, because we typically don't really care about building tests in the context of Buildroot. However, since unit tests in aircrack-ng are unconditionally built, and the result depends on whether cmoka is available or not, it makes sense to have it as an optional dependency.

Also, could you start using the convention of "package/<foo>" prefixes for your commit titles ? We have finally standardized a bit the format of commit titles, see:

http://nightly.buildroot.org/manual.html#submitting-patches

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com