| Message ID | 20241107191634.378670-1-james.hilliard1@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v5,1/4] package/kismet: bump to version 52bcb902e36b2df1562cfbe644b113362248d029 | expand |
On 07/11/2024 20:16, James Hilliard wrote: > We need to use the latest git commit as the last release does not > support compiling with the newer protobuf releases. > > Add optional mosquito support. > > Add librtlsdr mosquito support. > > Fix python-setuptools dependency which should be > host-python-setuptools. > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/kismet/Config.in | 1 - > package/kismet/kismet.hash | 2 +- > package/kismet/kismet.mk | 21 +++++++++++++++++---- > 3 files changed, 18 insertions(+), 6 deletions(-) > > diff --git a/package/kismet/Config.in b/package/kismet/Config.in > index 2e1e0cfbd0..aa05e045d5 100644 > --- a/package/kismet/Config.in > +++ b/package/kismet/Config.in > @@ -42,7 +42,6 @@ config BR2_PACKAGE_KISMET_PYTHON_TOOLS > select BR2_PACKAGE_PYTHON_NUMPY # runtime for RTLAMR and RTLADSB > select BR2_PACKAGE_PYTHON_PROTOBUF # runtime > select BR2_PACKAGE_PYTHON_SERIAL # runtime for Freaklabs Zigbee > - select BR2_PACKAGE_PYTHON_SETUPTOOLS > help > Enable Python and Python-related tools (RTL_433, RTLAMR, > RTLADSB and Freaklabs Zigbee) > diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash > index 543515858e..2d05a6791b 100644 > --- a/package/kismet/kismet.hash > +++ b/package/kismet/kismet.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7 kismet-2023-07-R1.tar.xz > +sha256 2dccf9b5bbf5f4e6b04a44bf8cfecf80db8dcfa52a8183dd1166396c3ca04660 kismet-52bcb902e36b2df1562cfbe644b113362248d029.tar.gz > sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE > diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk > index c448233d60..f182fbe328 100644 > --- a/package/kismet/kismet.mk > +++ b/package/kismet/kismet.mk > @@ -4,9 +4,8 @@ > # > ################################################################################ > > -KISMET_VERSION = 2023-07-R1 > -KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz > -KISMET_SITE = http://www.kismetwireless.net/code > +KISMET_VERSION = 52bcb902e36b2df1562cfbe644b113362248d029 > +KISMET_SITE = $(call github,kismetwireless,kismet,$(KISMET_VERSION)) > KISMET_DEPENDENCIES = \ > host-pkgconf \ > libpcap \ > @@ -37,6 +36,13 @@ else > KISMET_CONF_OPTS += --disable-libcap > endif > > +ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) > +KISMET_DEPENDENCIES += librtlsdr > +KISMET_CONF_OPTS += --enable-librtlsdr > +else > +KISMET_CONF_OPTS += --disable-librtlsdr > +endif > + > ifeq ($(BR2_PACKAGE_LIBUSB),y) > KISMET_DEPENDENCIES += libusb > KISMET_CONF_OPTS += --enable-libusb > @@ -58,6 +64,13 @@ else > KISMET_CONF_OPTS += --disable-lmsensors > endif > > +ifeq ($(BR2_PACKAGE_MOSQUITTO),y) > +KISMET_DEPENDENCIES += mosquitto > +KISMET_CONF_OPTS += --enable-mosquitto > +else > +KISMET_CONF_OPTS += --disable-mosquitto > +endif > + > ifeq ($(BR2_PACKAGE_PCRE2),y) > KISMET_DEPENDENCIES += pcre2 > KISMET_CONF_OPTS += --enable-pcre --enable-require-pcre2 > @@ -69,7 +82,7 @@ KISMET_CONF_OPTS += --disable-pcre > endif > > ifeq ($(BR2_PACKAGE_KISMET_PYTHON_TOOLS),y) > -KISMET_DEPENDENCIES += python3 python-setuptools > +KISMET_DEPENDENCIES += python3 host-python-setuptools > KISMET_CONF_OPTS += \ > --enable-python-tools \ > --with-python-interpreter=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)
diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 2e1e0cfbd0..aa05e045d5 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -42,7 +42,6 @@ config BR2_PACKAGE_KISMET_PYTHON_TOOLS select BR2_PACKAGE_PYTHON_NUMPY # runtime for RTLAMR and RTLADSB select BR2_PACKAGE_PYTHON_PROTOBUF # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime for Freaklabs Zigbee - select BR2_PACKAGE_PYTHON_SETUPTOOLS help Enable Python and Python-related tools (RTL_433, RTLAMR, RTLADSB and Freaklabs Zigbee) diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 543515858e..2d05a6791b 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7 kismet-2023-07-R1.tar.xz +sha256 2dccf9b5bbf5f4e6b04a44bf8cfecf80db8dcfa52a8183dd1166396c3ca04660 kismet-52bcb902e36b2df1562cfbe644b113362248d029.tar.gz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index c448233d60..f182fbe328 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,9 +4,8 @@ # ################################################################################ -KISMET_VERSION = 2023-07-R1 -KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz -KISMET_SITE = http://www.kismetwireless.net/code +KISMET_VERSION = 52bcb902e36b2df1562cfbe644b113362248d029 +KISMET_SITE = $(call github,kismetwireless,kismet,$(KISMET_VERSION)) KISMET_DEPENDENCIES = \ host-pkgconf \ libpcap \ @@ -37,6 +36,13 @@ else KISMET_CONF_OPTS += --disable-libcap endif +ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) +KISMET_DEPENDENCIES += librtlsdr +KISMET_CONF_OPTS += --enable-librtlsdr +else +KISMET_CONF_OPTS += --disable-librtlsdr +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) KISMET_DEPENDENCIES += libusb KISMET_CONF_OPTS += --enable-libusb @@ -58,6 +64,13 @@ else KISMET_CONF_OPTS += --disable-lmsensors endif +ifeq ($(BR2_PACKAGE_MOSQUITTO),y) +KISMET_DEPENDENCIES += mosquitto +KISMET_CONF_OPTS += --enable-mosquitto +else +KISMET_CONF_OPTS += --disable-mosquitto +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) KISMET_DEPENDENCIES += pcre2 KISMET_CONF_OPTS += --enable-pcre --enable-require-pcre2 @@ -69,7 +82,7 @@ KISMET_CONF_OPTS += --disable-pcre endif ifeq ($(BR2_PACKAGE_KISMET_PYTHON_TOOLS),y) -KISMET_DEPENDENCIES += python3 python-setuptools +KISMET_DEPENDENCIES += python3 host-python-setuptools KISMET_CONF_OPTS += \ --enable-python-tools \ --with-python-interpreter=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)
We need to use the latest git commit as the last release does not support compiling with the newer protobuf releases. Add optional mosquito support. Add librtlsdr mosquito support. Fix python-setuptools dependency which should be host-python-setuptools. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- package/kismet/Config.in | 1 - package/kismet/kismet.hash | 2 +- package/kismet/kismet.mk | 21 +++++++++++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-)