* [ptxdist] [PATCH] batctl: whitespace cleanup
2017-06-28 21:32 [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Robert Schwebel
@ 2017-06-28 21:32 ` Robert Schwebel
2017-06-28 21:32 ` [ptxdist] [PATCH] batctl: version bump 2016.2 -> 2017.1 Robert Schwebel
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2017-06-28 21:32 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/batctl.make | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/rules/batctl.make b/rules/batctl.make
index 50f8238c1..bdd3f5f9c 100644
--- a/rules/batctl.make
+++ b/rules/batctl.make
@@ -16,18 +16,17 @@ PACKAGES-$(PTXCONF_BATCTL) += batctl
#
# Paths and names
#
-BATCTL_VERSION := 2016.2
+BATCTL_VERSION := 2016.2
BATCTL_MD5 := 50f42d06611afae58ccfcde502f94c1a
-BATCTL := batctl-$(BATCTL_VERSION)
-BATCTL_SUFFIX := tar.gz
+BATCTL := batctl-$(BATCTL_VERSION)
+BATCTL_SUFFIX := tar.gz
BATCTL_URL := http://downloads.open-mesh.org/batman/stable/sources/batctl/$(BATCTL).$(BATCTL_SUFFIX)
-BATCTL_SOURCE := $(SRCDIR)/$(BATCTL).$(BATCTL_SUFFIX)
+BATCTL_SOURCE := $(SRCDIR)/$(BATCTL).$(BATCTL_SUFFIX)
BATCTL_DIR := $(BUILDDIR)/$(BATCTL)
-BATCTL_LICENSE := GPL-2.0
-
+BATCTL_LICENSE := GPL-2.0
BATCTL_CONF_TOOL := NO
-BATCTL_MAKE_ENV := $(CROSS_ENV)
+BATCTL_MAKE_ENV := $(CROSS_ENV)
# ----------------------------------------------------------------------------
# Target-Install
--
2.13.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread* [ptxdist] [PATCH] batctl: version bump 2016.2 -> 2017.1
2017-06-28 21:32 [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Robert Schwebel
2017-06-28 21:32 ` [ptxdist] [PATCH] batctl: whitespace cleanup Robert Schwebel
@ 2017-06-28 21:32 ` Robert Schwebel
2017-06-28 21:32 ` [ptxdist] [PATCH] dnsmasq: version bump 2.76 -> 2.77 Robert Schwebel
2017-06-30 8:08 ` [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Michael Olbrich
3 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2017-06-28 21:32 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
There are no patches and no configure options.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/batctl.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/batctl.make b/rules/batctl.make
index bdd3f5f9c..294b237bf 100644
--- a/rules/batctl.make
+++ b/rules/batctl.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BATCTL) += batctl
#
# Paths and names
#
-BATCTL_VERSION := 2016.2
-BATCTL_MD5 := 50f42d06611afae58ccfcde502f94c1a
+BATCTL_VERSION := 2017.1
+BATCTL_MD5 := e152ad369f57a3c9f9a7de5c430790fe
BATCTL := batctl-$(BATCTL_VERSION)
BATCTL_SUFFIX := tar.gz
BATCTL_URL := http://downloads.open-mesh.org/batman/stable/sources/batctl/$(BATCTL).$(BATCTL_SUFFIX)
--
2.13.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH] dnsmasq: version bump 2.76 -> 2.77
2017-06-28 21:32 [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Robert Schwebel
2017-06-28 21:32 ` [ptxdist] [PATCH] batctl: whitespace cleanup Robert Schwebel
2017-06-28 21:32 ` [ptxdist] [PATCH] batctl: version bump 2016.2 -> 2017.1 Robert Schwebel
@ 2017-06-28 21:32 ` Robert Schwebel
2017-06-30 8:08 ` [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Michael Olbrich
3 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2017-06-28 21:32 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Patches have been ported, one patch needed to be adapted.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/dnsmasq-2.76/series | 4 ----
.../0001-the-pkg-config-file-is-lua-no-lua5.2.patch} | 14 +++++++-------
patches/dnsmasq-2.77/series | 4 ++++
rules/dnsmasq.make | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 patches/dnsmasq-2.76/series
rename patches/{dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch => dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch} (73%)
create mode 100644 patches/dnsmasq-2.77/series
diff --git a/patches/dnsmasq-2.76/series b/patches/dnsmasq-2.76/series
deleted file mode 100644
index d7b1936fe..000000000
--- a/patches/dnsmasq-2.76/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-the-pkg-config-file-is-lua-no-lua5.1.patch
-# 180d55f55eebd3126d06018dcf79ed5a - git-ptx-patches magic
diff --git a/patches/dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch b/patches/dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
similarity index 73%
rename from patches/dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch
rename to patches/dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
index 4ae6f1225..42fe46a88 100644
--- a/patches/dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch
+++ b/patches/dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
@@ -1,6 +1,6 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Sat, 28 Jun 2014 16:37:34 +0200
-Subject: [PATCH] the pkg-config file is 'lua' no 'lua5.1'
+Subject: [PATCH] the pkg-config file is 'lua' no 'lua5.2'
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -8,17 +8,17 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 292c8bd..77e8001 100644
+index 73ea23e11d07..1dba188f9c30 100644
--- a/Makefile
+++ b/Makefile
-@@ -57,8 +57,8 @@ idn_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) -
- idn_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn`
+@@ -59,8 +59,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI
+ idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
--lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1`
--lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1`
+-lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2`
+-lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2`
+lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua`
+lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua`
nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed`
nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`
- gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --copy -lgmp`
+ gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp`
diff --git a/patches/dnsmasq-2.77/series b/patches/dnsmasq-2.77/series
new file mode 100644
index 000000000..bdbf61ed5
--- /dev/null
+++ b/patches/dnsmasq-2.77/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-the-pkg-config-file-is-lua-no-lua5.2.patch
+# e26535bce3c0926f9bcb6b388a2b95ab - git-ptx-patches magic
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 8b682d447..76aad2156 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq
#
# Paths and names
#
-DNSMASQ_VERSION := 2.76
-DNSMASQ_MD5 := 00f5ee66b4e4b7f14538bf62ae3c9461
+DNSMASQ_VERSION := 2.77
+DNSMASQ_MD5 := 5b973fea8e66e76a0e6bb44adefc6f9b
DNSMASQ := dnsmasq-$(DNSMASQ_VERSION)
DNSMASQ_SUFFIX := tar.xz
DNSMASQ_URL := http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
--
2.13.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1
2017-06-28 21:32 [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Robert Schwebel
` (2 preceding siblings ...)
2017-06-28 21:32 ` [ptxdist] [PATCH] dnsmasq: version bump 2.76 -> 2.77 Robert Schwebel
@ 2017-06-30 8:08 ` Michael Olbrich
2017-07-02 15:46 ` Robert Schwebel
3 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2017-06-30 8:08 UTC (permalink / raw)
To: ptxdist
On Wed, Jun 28, 2017 at 11:32:35PM +0200, Robert Schwebel wrote:
> There are no patches and no configure options.
>
Makefile:98: *** No libnl-3.0 development libraries found!. Stop.
Missing dependency? Also, I notices that we build with
CONFIG_ALFRED_CAPABILITIES=n. I think we should change that and select
libcap instead. Droping capabilities is a good thing. We should use that.
Michael
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
> rules/alfred.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/alfred.make b/rules/alfred.make
> index 18b58c79d..356c56e28 100644
> --- a/rules/alfred.make
> +++ b/rules/alfred.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_ALFRED) += alfred
> #
> # Paths and names
> #
> -ALFRED_VERSION := 2016.2
> -ALFRED_MD5 := cc7d5b352942477033a4cafbed84152d
> +ALFRED_VERSION := 2017.1
> +ALFRED_MD5 := 74e457ee49a6525ccdb3fa3bef58f685
> ALFRED := alfred-$(ALFRED_VERSION)
> ALFRED_SUFFIX := tar.gz
> ALFRED_URL := http://downloads.open-mesh.org/batman/stable/sources/alfred/$(ALFRED).$(ALFRED_SUFFIX)
> --
> 2.13.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1
2017-06-30 8:08 ` [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Michael Olbrich
@ 2017-07-02 15:46 ` Robert Schwebel
0 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2017-07-02 15:46 UTC (permalink / raw)
To: ptxdist
On Fri, Jun 30, 2017 at 10:08:49AM +0200, Michael Olbrich wrote:
> On Wed, Jun 28, 2017 at 11:32:35PM +0200, Robert Schwebel wrote:
> > There are no patches and no configure options.
> >
>
> Makefile:98: *** No libnl-3.0 development libraries found!. Stop.
>
> Missing dependency? Also, I notices that we build with
> CONFIG_ALFRED_CAPABILITIES=n. I think we should change that and select
> libcap instead. Droping capabilities is a good thing. We should use that.
Ok, sent a v2 with those changes.
rsc
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread