* [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.0
@ 2016-08-24 20:27 Robert Schwebel
2016-08-24 20:29 ` Robert Schwebel
0 siblings, 1 reply; 3+ messages in thread
From: Robert Schwebel @ 2016-08-24 20:27 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Update version. The patch is not necessary any more, sleep-monitor
already has the missing header file.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...-sleep-monitor-upower-add-missing-include.patch | 26 ----------------------
patches/NetworkManager-1.2.2/series | 4 ----
rules/networkmanager.make | 21 +++++++++++++----
3 files changed, 17 insertions(+), 34 deletions(-)
delete mode 100644 patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
delete mode 100644 patches/NetworkManager-1.2.2/series
diff --git a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
deleted file mode 100644
index 425974c..0000000
--- a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 18 May 2016 10:16:15 +0200
-Subject: [PATCH] sleep-monitor-upower: add missing include
-
-Otherwise building fails with:
-
-nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get'
-nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/nm-sleep-monitor-upower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-index 5f0ff24552b2..8d0719039ccf 100644
---- a/src/nm-sleep-monitor-upower.c
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
-
- #include "nm-core-internal.h"
-+#include "NetworkManagerUtils.h"
-
- #include "nm-sleep-monitor.h"
-
diff --git a/patches/NetworkManager-1.2.2/series b/patches/NetworkManager-1.2.2/series
deleted file mode 100644
index d288508..0000000
--- a/patches/NetworkManager-1.2.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-sleep-monitor-upower-add-missing-include.patch
-# ed83c6f2cf812e4453d3644fb7eafaaf - git-ptx-patches magic
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 3e4d2ac..10f2a20 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 1.2.2
-NETWORKMANAGER_MD5 := a922bf20c2243c9014fb14c4427ad035
+NETWORKMANAGER_VERSION := 1.4.0
+NETWORKMANAGER_MD5 := 337e676261ca94af08f8e9b6f9b09a5b
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.xz
-NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
@@ -48,6 +48,7 @@ NETWORKMANAGER_CONF_OPT := \
--disable-introspection \
--disable-qt \
--disable-wimax \
+ --disable-json-validation \
--disable-polkit \
--disable-modify-system \
--$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
@@ -66,7 +67,7 @@ NETWORKMANAGER_CONF_OPT := \
--with-systemdsystemunitdir=/lib/systemd/system \
--with-hostname-persist=default \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \
- --with-logging-backend-default="" \
+ --with-config-logging-backend-default="" \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \
--without-consolekit \
--with-session-tracking=no \
@@ -76,10 +77,12 @@ NETWORKMANAGER_CONF_OPT := \
--with-crypto=gnutls \
--with-dbus-sys-dir=/usr/share/dbus-1/system.d \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WWAN)-modem-manager-1 \
+ --with-ofono=no \
--with-dhclient=/sbin/dhclient \
--without-dhcpcd \
--without-resolvconf \
--without-netconfig \
+ --with-config-dns-rc-manager-default=file \
--with-iptables=/usr/sbin/iptables \
--with-dnsmasq=/usr/sbin/dnsmasq \
--with-dnssec-trigger=/bin/true \
@@ -91,6 +94,16 @@ NETWORKMANAGER_CONF_OPT := \
--without-valgrind \
--without-tests
+# FIXME:
+#
+# --enable-ld-gc Enable garbage collection of unused symbols on
+# linking (default: auto)
+# --enable-address-sanitizer
+# Compile with address sanitizer (default: no)
+# --enable-undefined-sanitizer
+# Compile with undefined behavior sanitizer (default:
+# no)
+
ifdef PTXCONF_NETWORKMANAGER_PPP
NETWORKMANAGER_CONF_OPT += \
--with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH)
--
2.8.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.0
2016-08-24 20:27 [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.0 Robert Schwebel
@ 2016-08-24 20:29 ` Robert Schwebel
2016-08-25 11:46 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Robert Schwebel @ 2016-08-24 20:29 UTC (permalink / raw)
To: ptxdist
Hi,
This is a first attempt to update NetworkManager to 1.4.0.
On Wed, Aug 24, 2016 at 10:27:54PM +0200, Robert Schwebel wrote:
> Update version. The patch is not necessary any more, sleep-monitor
> already has the missing header file.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
> ...-sleep-monitor-upower-add-missing-include.patch | 26 ----------------------
> patches/NetworkManager-1.2.2/series | 4 ----
> rules/networkmanager.make | 21 +++++++++++++----
> 3 files changed, 17 insertions(+), 34 deletions(-)
> delete mode 100644 patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
> delete mode 100644 patches/NetworkManager-1.2.2/series
>
> diff --git a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
> deleted file mode 100644
> index 425974c..0000000
> --- a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Wed, 18 May 2016 10:16:15 +0200
> -Subject: [PATCH] sleep-monitor-upower: add missing include
> -
> -Otherwise building fails with:
> -
> -nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get'
> -nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - src/nm-sleep-monitor-upower.c | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
> -index 5f0ff24552b2..8d0719039ccf 100644
> ---- a/src/nm-sleep-monitor-upower.c
> -+++ b/src/nm-sleep-monitor-upower.c
> -@@ -24,6 +24,7 @@
> - #include <sys/stat.h>
> -
> - #include "nm-core-internal.h"
> -+#include "NetworkManagerUtils.h"
> -
> - #include "nm-sleep-monitor.h"
> -
> diff --git a/patches/NetworkManager-1.2.2/series b/patches/NetworkManager-1.2.2/series
> deleted file mode 100644
> index d288508..0000000
> --- a/patches/NetworkManager-1.2.2/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-sleep-monitor-upower-add-missing-include.patch
> -# ed83c6f2cf812e4453d3644fb7eafaaf - git-ptx-patches magic
> diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> index 3e4d2ac..10f2a20 100644
> --- a/rules/networkmanager.make
> +++ b/rules/networkmanager.make
> @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
> #
> # Paths and names
> #
> -NETWORKMANAGER_VERSION := 1.2.2
> -NETWORKMANAGER_MD5 := a922bf20c2243c9014fb14c4427ad035
> +NETWORKMANAGER_VERSION := 1.4.0
> +NETWORKMANAGER_MD5 := 337e676261ca94af08f8e9b6f9b09a5b
> NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
> NETWORKMANAGER_SUFFIX := tar.xz
> -NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
> +NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
> NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
> NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
>
> @@ -48,6 +48,7 @@ NETWORKMANAGER_CONF_OPT := \
> --disable-introspection \
> --disable-qt \
> --disable-wimax \
> + --disable-json-validation \
> --disable-polkit \
> --disable-modify-system \
> --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
> @@ -66,7 +67,7 @@ NETWORKMANAGER_CONF_OPT := \
> --with-systemdsystemunitdir=/lib/systemd/system \
> --with-hostname-persist=default \
> --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \
> - --with-logging-backend-default="" \
> + --with-config-logging-backend-default="" \
> --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \
> --without-consolekit \
> --with-session-tracking=no \
> @@ -76,10 +77,12 @@ NETWORKMANAGER_CONF_OPT := \
> --with-crypto=gnutls \
> --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
> --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WWAN)-modem-manager-1 \
> + --with-ofono=no \
> --with-dhclient=/sbin/dhclient \
> --without-dhcpcd \
> --without-resolvconf \
> --without-netconfig \
> + --with-config-dns-rc-manager-default=file \
I'm not entirely sure if this is the right choice.
> --with-iptables=/usr/sbin/iptables \
> --with-dnsmasq=/usr/sbin/dnsmasq \
> --with-dnssec-trigger=/bin/true \
> @@ -91,6 +94,16 @@ NETWORKMANAGER_CONF_OPT := \
> --without-valgrind \
> --without-tests
> +# FIXME:
> +#
> +# --enable-ld-gc Enable garbage collection of unused symbols on
> +# linking (default: auto)
> +# --enable-address-sanitizer
> +# Compile with address sanitizer (default: no)
> +# --enable-undefined-sanitizer
> +# Compile with undefined behavior sanitizer (default:
> +# no)
Any idea what to do with these new options? Switching all off?
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] 3+ messages in thread
* Re: [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.0
2016-08-24 20:29 ` Robert Schwebel
@ 2016-08-25 11:46 ` Michael Olbrich
0 siblings, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2016-08-25 11:46 UTC (permalink / raw)
To: ptxdist
Hi,
On Wed, Aug 24, 2016 at 10:29:57PM +0200, Robert Schwebel wrote:
> This is a first attempt to update NetworkManager to 1.4.0.
>
> On Wed, Aug 24, 2016 at 10:27:54PM +0200, Robert Schwebel wrote:
> > Update version. The patch is not necessary any more, sleep-monitor
> > already has the missing header file.
> >
> > Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> > ---
> > ...-sleep-monitor-upower-add-missing-include.patch | 26 ----------------------
> > patches/NetworkManager-1.2.2/series | 4 ----
> > rules/networkmanager.make | 21 +++++++++++++----
> > 3 files changed, 17 insertions(+), 34 deletions(-)
> > delete mode 100644 patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
> > delete mode 100644 patches/NetworkManager-1.2.2/series
> >
> > diff --git a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
> > deleted file mode 100644
> > index 425974c..0000000
> > --- a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
> > +++ /dev/null
> > @@ -1,26 +0,0 @@
> > -From: Michael Olbrich <m.olbrich@pengutronix.de>
> > -Date: Wed, 18 May 2016 10:16:15 +0200
> > -Subject: [PATCH] sleep-monitor-upower: add missing include
> > -
> > -Otherwise building fails with:
> > -
> > -nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get'
> > -nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token
> > -
> > -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> > ----
> > - src/nm-sleep-monitor-upower.c | 1 +
> > - 1 file changed, 1 insertion(+)
> > -
> > -diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
> > -index 5f0ff24552b2..8d0719039ccf 100644
> > ---- a/src/nm-sleep-monitor-upower.c
> > -+++ b/src/nm-sleep-monitor-upower.c
> > -@@ -24,6 +24,7 @@
> > - #include <sys/stat.h>
> > -
> > - #include "nm-core-internal.h"
> > -+#include "NetworkManagerUtils.h"
> > -
> > - #include "nm-sleep-monitor.h"
> > -
> > diff --git a/patches/NetworkManager-1.2.2/series b/patches/NetworkManager-1.2.2/series
> > deleted file mode 100644
> > index d288508..0000000
> > --- a/patches/NetworkManager-1.2.2/series
> > +++ /dev/null
> > @@ -1,4 +0,0 @@
> > -# generated by git-ptx-patches
> > -#tag:base --start-number 1
> > -0001-sleep-monitor-upower-add-missing-include.patch
> > -# ed83c6f2cf812e4453d3644fb7eafaaf - git-ptx-patches magic
> > diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> > index 3e4d2ac..10f2a20 100644
> > --- a/rules/networkmanager.make
> > +++ b/rules/networkmanager.make
> > @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
> > #
> > # Paths and names
> > #
> > -NETWORKMANAGER_VERSION := 1.2.2
> > -NETWORKMANAGER_MD5 := a922bf20c2243c9014fb14c4427ad035
> > +NETWORKMANAGER_VERSION := 1.4.0
> > +NETWORKMANAGER_MD5 := 337e676261ca94af08f8e9b6f9b09a5b
> > NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
> > NETWORKMANAGER_SUFFIX := tar.xz
> > -NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
> > +NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
> > NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
> > NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
> >
> > @@ -48,6 +48,7 @@ NETWORKMANAGER_CONF_OPT := \
> > --disable-introspection \
> > --disable-qt \
> > --disable-wimax \
> > + --disable-json-validation \
> > --disable-polkit \
> > --disable-modify-system \
> > --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
> > @@ -66,7 +67,7 @@ NETWORKMANAGER_CONF_OPT := \
> > --with-systemdsystemunitdir=/lib/systemd/system \
> > --with-hostname-persist=default \
> > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \
> > - --with-logging-backend-default="" \
> > + --with-config-logging-backend-default="" \
> > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \
> > --without-consolekit \
> > --with-session-tracking=no \
> > @@ -76,10 +77,12 @@ NETWORKMANAGER_CONF_OPT := \
> > --with-crypto=gnutls \
> > --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
> > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WWAN)-modem-manager-1 \
> > + --with-ofono=no \
> > --with-dhclient=/sbin/dhclient \
> > --without-dhcpcd \
> > --without-resolvconf \
> > --without-netconfig \
> > + --with-config-dns-rc-manager-default=file \
>
> I'm not entirely sure if this is the right choice.
>
> > --with-iptables=/usr/sbin/iptables \
> > --with-dnsmasq=/usr/sbin/dnsmasq \
> > --with-dnssec-trigger=/bin/true \
> > @@ -91,6 +94,16 @@ NETWORKMANAGER_CONF_OPT := \
> > --without-valgrind \
> > --without-tests
>
> > +# FIXME:
> > +#
> > +# --enable-ld-gc Enable garbage collection of unused symbols on
Leave this one out. It's usefull, but may not be supported by all toolchains.
> > +# linking (default: auto)
> > +# --enable-address-sanitizer
> > +# Compile with address sanitizer (default: no)
> > +# --enable-undefined-sanitizer
> > +# Compile with undefined behavior sanitizer (default:
> > +# no)
>
> Any idea what to do with these new options? Switching all off?
These two should be disabled.
Michael
--
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] 3+ messages in thread
end of thread, other threads:[~2016-08-25 11:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-24 20:27 [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.0 Robert Schwebel
2016-08-24 20:29 ` Robert Schwebel
2016-08-25 11:46 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox