* [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.2 @ 2016-12-13 16:18 Ladislav Michl 2016-12-16 14:45 ` Michael Olbrich 2016-12-16 15:32 ` [ptxdist] [PATCH] " Michael Olbrich 0 siblings, 2 replies; 5+ messages in thread From: Ladislav Michl @ 2016-12-13 16:18 UTC (permalink / raw) To: ptxdist Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- ...-sleep-monitor-upower-add-missing-include.patch | 26 ---------------------- rules/networkmanager.make | 6 ++--- 2 files changed, 3 insertions(+), 29 deletions(-) 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/rules/networkmanager.make b/rules/networkmanager.make index 3e4d2ac..cd06bd6 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.2 +NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e 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 := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) -- 2.10.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.2 2016-12-13 16:18 [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.2 Ladislav Michl @ 2016-12-16 14:45 ` Michael Olbrich 2016-12-19 9:24 ` [ptxdist] [PATCHv2] " Ladislav Michl 2016-12-16 15:32 ` [ptxdist] [PATCH] " Michael Olbrich 1 sibling, 1 reply; 5+ messages in thread From: Michael Olbrich @ 2016-12-16 14:45 UTC (permalink / raw) To: ptxdist Hi, There are some new configure options that need handling. Michael On Tue, Dec 13, 2016 at 05:18:03PM +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > --- > ...-sleep-monitor-upower-add-missing-include.patch | 26 ---------------------- > rules/networkmanager.make | 6 ++--- > 2 files changed, 3 insertions(+), 29 deletions(-) > > 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/rules/networkmanager.make b/rules/networkmanager.make > index 3e4d2ac..cd06bd6 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.2 > +NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e > 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 := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) > > -- > 2.10.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] 5+ messages in thread
* [ptxdist] [PATCHv2] networkmanager: version bump 1.2.2 -> 1.4.2 2016-12-16 14:45 ` Michael Olbrich @ 2016-12-19 9:24 ` Ladislav Michl 2017-01-05 16:54 ` Michael Olbrich 0 siblings, 1 reply; 5+ messages in thread From: Ladislav Michl @ 2016-12-19 9:24 UTC (permalink / raw) To: ptxdist Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- changes: -v2: remove series file, handle new configure options ...-sleep-monitor-upower-add-missing-include.patch | 26 ---------------------- patches/NetworkManager-1.2.2/series | 4 ---- rules/networkmanager.in | 5 +++++ rules/networkmanager.make | 22 +++++++++++++----- 4 files changed, 21 insertions(+), 36 deletions(-) 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.in b/rules/networkmanager.in index 85b1e91..36fe00a 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -16,6 +16,7 @@ menuconfig NETWORKMANAGER select LIBNDP select LIBNEWT if NETWORKMANAGER_NMTUI select LIBNL3 + select LIBSOUP if NETWORKMANAGER_CONCHECK select LIBUUID select MODEMMANAGER if NETWORKMANAGER_WWAN select PPP if NETWORKMANAGER_PPP @@ -80,6 +81,10 @@ config NETWORKMANAGER_PPP bool prompt "enable ppp support" +config NETWORKMANAGER_CONCHECK + bool + prompt "enable connectivity checking support" + config NETWORKMANAGER_EXAMPLES bool prompt "install examples for Network Manager" diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 3e4d2ac..f3a9596 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.2 +NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e 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 := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) @@ -35,8 +35,12 @@ NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) NETWORKMANAGER_CONF_TOOL := autoconf NETWORKMANAGER_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --enable-silent-rules \ + --disable-maintainer-mode \ + --disable-dependency-tracking \ --disable-static \ --enable-shared \ + --enable-fast-install \ --disable-nls \ --disable-rpath \ --disable-ifcfg-rh \ @@ -47,15 +51,19 @@ NETWORKMANAGER_CONF_OPT := \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \ --disable-introspection \ --disable-qt \ - --disable-wimax \ + --disable-teamdctl \ + --disable-json-validation \ --disable-polkit \ --disable-modify-system \ --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \ --disable-bluez5-dun \ - --disable-concheck \ + --$(call ptx/endis,PTXCONF_NETWORKMANAGER_CONCHECK)-concheck \ --enable-more-warnings \ --disable-more-asserts \ --disable-more-logging \ + --disable-lto \ + --disable-address-sanitizer \ + --disable-undefined-sanitizer \ --disable-vala \ --disable-tests \ --disable-gtk-doc \ @@ -76,16 +84,18 @@ 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 \ + --without-ofono \ --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 \ --with-system-ca-path=/etc/ssl/certs \ --with-kernel-firmware-dir=/lib/firmware \ - --without-libsoup \ + --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_CONCHECK)-libsoup \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMCLI)-nmcli \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \ --without-valgrind \ -- 2.10.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCHv2] networkmanager: version bump 1.2.2 -> 1.4.2 2016-12-19 9:24 ` [ptxdist] [PATCHv2] " Ladislav Michl @ 2017-01-05 16:54 ` Michael Olbrich 0 siblings, 0 replies; 5+ messages in thread From: Michael Olbrich @ 2017-01-05 16:54 UTC (permalink / raw) To: ptxdist On Mon, Dec 19, 2016 at 10:24:01AM +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > --- > changes: > -v2: remove series file, handle new configure options I've removed some of them again when I applied the patch. I should really document the policy for this... Thanks, Michael > ...-sleep-monitor-upower-add-missing-include.patch | 26 ---------------------- > patches/NetworkManager-1.2.2/series | 4 ---- > rules/networkmanager.in | 5 +++++ > rules/networkmanager.make | 22 +++++++++++++----- > 4 files changed, 21 insertions(+), 36 deletions(-) > > 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.in b/rules/networkmanager.in > index 85b1e91..36fe00a 100644 > --- a/rules/networkmanager.in > +++ b/rules/networkmanager.in > @@ -16,6 +16,7 @@ menuconfig NETWORKMANAGER > select LIBNDP > select LIBNEWT if NETWORKMANAGER_NMTUI > select LIBNL3 > + select LIBSOUP if NETWORKMANAGER_CONCHECK > select LIBUUID > select MODEMMANAGER if NETWORKMANAGER_WWAN > select PPP if NETWORKMANAGER_PPP > @@ -80,6 +81,10 @@ config NETWORKMANAGER_PPP > bool > prompt "enable ppp support" > > +config NETWORKMANAGER_CONCHECK > + bool > + prompt "enable connectivity checking support" > + > config NETWORKMANAGER_EXAMPLES > bool > prompt "install examples for Network Manager" > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > index 3e4d2ac..f3a9596 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.2 > +NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e > 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 := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) > > @@ -35,8 +35,12 @@ NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) > NETWORKMANAGER_CONF_TOOL := autoconf > NETWORKMANAGER_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > + --enable-silent-rules \ > + --disable-maintainer-mode \ > + --disable-dependency-tracking \ > --disable-static \ > --enable-shared \ > + --enable-fast-install \ > --disable-nls \ > --disable-rpath \ > --disable-ifcfg-rh \ > @@ -47,15 +51,19 @@ NETWORKMANAGER_CONF_OPT := \ > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \ > --disable-introspection \ > --disable-qt \ > - --disable-wimax \ > + --disable-teamdctl \ > + --disable-json-validation \ > --disable-polkit \ > --disable-modify-system \ > --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \ > --disable-bluez5-dun \ > - --disable-concheck \ > + --$(call ptx/endis,PTXCONF_NETWORKMANAGER_CONCHECK)-concheck \ > --enable-more-warnings \ > --disable-more-asserts \ > --disable-more-logging \ > + --disable-lto \ > + --disable-address-sanitizer \ > + --disable-undefined-sanitizer \ > --disable-vala \ > --disable-tests \ > --disable-gtk-doc \ > @@ -76,16 +84,18 @@ 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 \ > + --without-ofono \ > --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 \ > --with-system-ca-path=/etc/ssl/certs \ > --with-kernel-firmware-dir=/lib/firmware \ > - --without-libsoup \ > + --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_CONCHECK)-libsoup \ > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMCLI)-nmcli \ > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \ > --without-valgrind \ > -- > 2.10.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] 5+ messages in thread
* Re: [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.2 2016-12-13 16:18 [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.2 Ladislav Michl 2016-12-16 14:45 ` Michael Olbrich @ 2016-12-16 15:32 ` Michael Olbrich 1 sibling, 0 replies; 5+ messages in thread From: Michael Olbrich @ 2016-12-16 15:32 UTC (permalink / raw) To: ptxdist On Tue, Dec 13, 2016 at 05:18:03PM +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > --- > ...-sleep-monitor-upower-add-missing-include.patch | 26 ---------------------- You forgot to remove the series file. Michael > rules/networkmanager.make | 6 ++--- > 2 files changed, 3 insertions(+), 29 deletions(-) > > 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/rules/networkmanager.make b/rules/networkmanager.make > index 3e4d2ac..cd06bd6 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.2 > +NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e > 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 := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) > > -- > 2.10.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] 5+ messages in thread
end of thread, other threads:[~2017-01-05 16:54 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-12-13 16:18 [ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.2 Ladislav Michl 2016-12-16 14:45 ` Michael Olbrich 2016-12-19 9:24 ` [ptxdist] [PATCHv2] " Ladislav Michl 2017-01-05 16:54 ` Michael Olbrich 2016-12-16 15:32 ` [ptxdist] [PATCH] " Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox