Skip to contentSkip to conversation

package/ulogd: use --without-mysql

PATCH New Fabrice Fontaine 2 participants 3 messages Mar 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/ulogd: use --without-mysql

Replace --with-mysql=no by --without-mysql

---
 package/ulogd/ulogd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/ulogd/ulogd.mk +2 -2
index 55bbec489d..8fecc0ed38 100644
@@ -20,7 +20,7 @@ ifeq ($(BR2_PACKAGE_MYSQL),y)
 ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
 ULOGD_DEPENDENCIES += mysql
 else
-ULOGD_CONF_OPTS += --with-mysql=no
+ULOGD_CONF_OPTS += --without-mysql
 endif
 ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
 ULOGD_CONF_OPTS += --with-pgsql
@@ -32,7 +32,7 @@ ifeq ($(BR2_PACKAGE_SQLITE),y)
 ULOGD_DEPENDENCIES += sqlite
 endif
 else
-ULOGD_CONF_OPTS += --with-mysql=no --without-pgsql --without-sqlite
+ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite
 endif
 
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
Signature · 1 line
2.14.1
#1 lore raw

PATCH 2/2 package/ulogd: use --without-dbi

Use --without-dbi instead of --with-dbi=off

---
 package/ulogd/ulogd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/ulogd/ulogd.mk +1 -1
index 8fecc0ed38..a2cad40677 100644
@@ -7,7 +7,7 @@
 ULOGD_VERSION = 2.0.7
 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
-ULOGD_CONF_OPTS = --with-dbi=no
+ULOGD_CONF_OPTS = --without-dbi
 ULOGD_DEPENDENCIES = host-pkgconf \
 	libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
 	libnfnetlink
Signature · 1 line
2.14.1
#2 lore raw

PATCH 1/2 package/ulogd: use --without-mysql

In reply to Fabrice Fontaine
Quoted 6 lines · On Thu, 14 Mar 2019 22:20:58 +0100 Fabrice Fontaine…

Replace --with-mysql=no by --without-mysql

---
 package/ulogd/ulogd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Both applied, thanks! They could have been a single patch.

Thomas

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