Skip to contentSkip to conversation

libnma: initial add 1.8.28

PATCH In review Andreas Müller 3 participants 11 messages Mar 18, 2020 – Mar 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 libnma: initial add 1.8.28

With upcoming network-manager-applet 1.16 this library gets mandatory: GNOME splitted out common code from network-manager-applet to libnma.

---
 .../libnma/libnma_1.8.28.bb                    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb new file +18 -0
new file mode 100644
index 000000000..de5ad0863
@@ -0,0 +1,18 @@
+SUMMARY = "NetworkManager GUI library"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0 networkmanager"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gtk-doc gettext vala
+
+SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
+SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
+
+PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
+PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
Signature · 1 line
2.21.1
#1 lore raw

PATCH 2/5 network-manager-applet: upgrade 1.8.24 -> 1.16.0

* License changed in [1] - it is still GPLv2

=======================================================
network-manager-applet-1.16.0
Overview of changes since network-manager-applet-1.8.24
=======================================================

* Turned libnma into an external dependency and move to "https://gitlab.gnome.org/GNOME/libnma". To build, libnma-1.8.28 or newer is required.
* The libnm-gtk, the deprecated libnm-glib compatibility library was removed. Everybody should be using libnma by now.
* Improve applet icons for hidpi.
* Fix transparent dialog borders.

[1] https://gitlab.gnome.org/GNOME/network-manager-applet/-/commit/1ab20e8d49d10a7e673efc3c15983f2fac7a41fe

---
 .../network-manager-applet_1.16.0.bb          | 25 ++++++++++++++++
 .../network-manager-applet_1.8.24.bb          | 29 -------------------
 2 files changed, 25 insertions(+), 29 deletions(-)
 create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb
 delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb
meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb new file +25 -0
new file mode 100644
index 000000000..0cac52c05
@@ -0,0 +1,25 @@
+SUMMARY = "GTK+ applet for NetworkManager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit features_check gnomebase gsettings gtk-icon-cache gettext
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[archive.md5sum] = "9652c2757e85d6caba657405cf794fbd"
+SRC_URI[archive.sha256sum] = "d6f98a455a271e7e169b5d35d290f4880f503cdf7593251572c9330941b5c3e5"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager"
+PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux"
+
+RDEPENDS_${PN} =+ "networkmanager"
+
+FILES_${PN} += " \
+    ${datadir}/nm-applet/ \
+    ${datadir}/libnma/wifi.ui \
+    ${datadir}/metainfo \
+"
meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb deleted +0 -29
deleted file mode 100644
index 0853407ca..000000000
@@ -1,29 +0,0 @@
-SUMMARY = "GTK+ applet for NetworkManager"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-DEPENDS = "gtk+3 libnotify libsecret networkmanager iso-codes nss"
-
-GNOMEBASEBUILDCLASS = "meson"
-inherit features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection gettext
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050"
-SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf"
-
-GTKDOC_MESON_OPTION = "gtk_doc"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr"
-PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager"
-PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info"
-PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux"
-
-RDEPENDS_${PN} =+ "networkmanager"
-
-FILES_${PN} += " \
-    ${datadir}/nm-applet/ \
-    ${datadir}/libnma/wifi.ui \
-    ${datadir}/metainfo \
-"
Signature · 1 line
2.21.1
#2 lore raw

PATCH 3/5 networkmanager-openvpn: upgrade 1.8.10 -> 1.8.12

In reply to Andreas Müller

From [1]:
=======================================================
NetworkManager-openvpn-1.8.12
Overview of changes since NetworkManager-openvpn-1.8.10
=======================================================

* The auth helper in external UI mode can now be run without a display server. Future nmcli version will utilize this for handling the secrets without a graphical desktop.
* libnm-glib compatibility (NetworkManager < 1.0) is disabled by default. It can be enabled by passing --with-libnm-glib to configure script. Nobody should need it by now. Users that still use this are encouraged to let us know before the libnm-glib support is removed for good.
* Add support for the following OpenVPN options: tls-version-min, tls-version-max, compress.
* Support inline CRL blobs during import.
* Allow option mssfix to be set to zero.
* Update Catalan, Czech, Danish, Dutch, Friulian, Hungarian, Indonesian, Italian, Polish, Serbian, Spanish, Swedish and Ukrainian translations.

[1] http://ftp.gnome.org/pub/gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.news

---
 ...er-openvpn_1.8.10.bb => networkmanager-openvpn_1.8.12.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager-openvpn_1.8.10.bb => networkmanager-openvpn_1.8.12.bb} (85%)
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb renamed from meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb +3 -2
similarity index 85%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
index 56db770b9..5e246a85b 100644
@@ -10,8 +10,8 @@ inherit gnomebase useradd gettext systemd
 
 SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "4dbbc103761facc7a61a1c00dfd55231"
-SRC_URI[sha256sum] = "af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef"
+SRC_URI[md5sum] = "e8b1210011ece18d0278310fbff45af5"
+SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318"
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
@@ -26,6 +26,7 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system nm-openvpn"
 
 FILES_${PN} += " \
+    ${datadir}/dbus-1 \
     ${libdir}/NetworkManager/*.so \
     ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
 "
Signature · 1 line
2.21.1
#3 lore raw

PATCH 4/5 networkmanager-openvpn: Make PACKAGECONFIG gnome work

In reply to Andreas Müller
---
 .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +12 -1
index 5e246a85b..d455a0f06 100644
@@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
+# meta-gnome in layers is required using gnome:
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
+
+do_configure_append() {
+    # network-manager-openvpn.metainfo.xml is created in source folder but
+    # compile expects it in build folder. As long as nobody comes up with a
+    # better solution just support build:
+    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
+        mkdir -p ${B}/appdata
+        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/
+    fi
+}
 
 do_install_append () {
     rm -rf ${D}${libdir}/NetworkManager/*.la
Signature · 1 line
2.21.1
#4 lore raw

Re: [PATCH 4/5] networkmanager-openvpn: Make PACKAGECONFIG gnome work

Quoted 15 lines · Andreas Müller
---
 .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +0 -1
index 5e246a85b..d455a0f06 100644
@@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"

meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f · line 27

Quoted 10 lines
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +10 -0
+# meta-gnome in layers is required using gnome:
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
+
+do_configure_append() {
+    # network-manager-openvpn.metainfo.xml is created in source folder but
+    # compile expects it in build folder. As long as nobody comes up with a
+    # better solution just support build:
+    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
+        mkdir -p ${B}/appdata
+        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/

perhaps use install -Dm 0644 here

Quoted 13 lines
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +2 -1
+    fi
+}
 
 do_install_append () {
     rm -rf ${D}${libdir}/NetworkManager/*.la
--

2.21.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#5 lore raw

Re: [PATCH 4/5] networkmanager-openvpn: Make PACKAGECONFIG gnome work

Quoted 16 lines · Khem Raj
Quoted 14 lines · Andreas Müller
---
 .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +0 -0
index 5e246a85b..d455a0f06 100644
@@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
Quoted 13 lines

meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f · line 27

Quoted 11 lines
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +10 -1
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
+# meta-gnome in layers is required using gnome:
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
+
+do_configure_append() {
+    # network-manager-openvpn.metainfo.xml is created in source folder but
+    # compile expects it in build folder. As long as nobody comes up with a
+    # better solution just support build:
+    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
+        mkdir -p ${B}/appdata
+        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/

perhaps use install -Dm 0644 here

In do_configure for a file required for buld-time only?

Andreas

#6 lore raw

Re: [PATCH 4/5] networkmanager-openvpn: Make PACKAGECONFIG gnome work

Quoted 31 lines · Andreas Müller
Quoted 16 lines · Khem Raj
Quoted 14 lines · Andreas Müller
---
 .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +0 -0
index 5e246a85b..d455a0f06 100644
@@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
Quoted 13 lines

meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f · line 27

Quoted 11 lines
meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +10 -1
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
+# meta-gnome in layers is required using gnome:
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
+
+do_configure_append() {
+    # network-manager-openvpn.metainfo.xml is created in source folder but
+    # compile expects it in build folder. As long as nobody comes up with a
+    # better solution just support build:
+    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
+        mkdir -p ${B}/appdata
+        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/

perhaps use install -Dm 0644 here

Quoted 2 lines

In do_configure for a file required for buld-time only?

ah nevermind.

Quoted 1 line

Andreas

#7 lore raw

PATCH 5/5 gnome-control-center: replace network-manager-applet by libnma in DEPENDS

In reply to Andreas Müller
---
 .../gnome-control-center/gnome-control-center_3.34.4.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb +1 -1
index c4ba833a1..253322063 100644
@@ -20,7 +20,7 @@ DEPENDS = " \
     gnome-settings-daemon \
     gnome-desktop3 \
     gnome-online-accounts \
-    network-manager-applet \
+    libnma \
     gnome-bluetooth \
     grilo \
     libgtop \
Signature · 1 line
2.21.1
#8 lore raw
In reply to Andreas Müller

Hi Andreas,

I got the following error.

gcr was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'libnma', 'gcr']

Could you please take a look at it if convenient?

Best Regards,
Chen Qi
________________________________
From: [email protected] <[email protected]> on behalf of Andreas Müller <[email protected]>
Sent: Thursday, March 19, 2020 4:44
To: [email protected] <[email protected]>
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28

With upcoming network-manager-applet 1.16 this library gets mandatory: GNOME splitted out common code from network-manager-applet to libnma.

---
 .../libnma/libnma_1.8.28.bb                    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb new file +18 -0
new file mode 100644
index 000000000..de5ad0863
@@ -0,0 +1,18 @@
+SUMMARY = "NetworkManager GUI library"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0 networkmanager"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gtk-doc gettext vala
+
+SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
+SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
+
+PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
+PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
+
+GTKDOC_MESON_OPTION = "gtk_doc"

--
2.21.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#9 lore raw

Hi Andreas,

There's also another problem. The PACKAGECONFIG item, 'gcr', cannot be disabled, otherwise, we will have do_configure error.

Best Regards,
Chen Qi
________________________________
From: [email protected] <[email protected]> on behalf of Chen, Qi <[email protected]>
Sent: Friday, March 20, 2020 11:45
To: Andreas Müller <[email protected]>; [email protected] <[email protected]>
Subject: Re: [oe] [PATCH 1/5] libnma: initial add 1.8.28

Hi Andreas,

I got the following error.

gcr was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'libnma', 'gcr']

Could you please take a look at it if convenient?

Best Regards,
Chen Qi
________________________________
From: [email protected] <[email protected]> on behalf of Andreas Müller <[email protected]>
Sent: Thursday, March 19, 2020 4:44
To: [email protected] <[email protected]>
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28

With upcoming network-manager-applet 1.16 this library gets mandatory: GNOME splitted out common code from network-manager-applet to libnma.

---
 .../libnma/libnma_1.8.28.bb                    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb new file +18 -0
new file mode 100644
index 000000000..de5ad0863
@@ -0,0 +1,18 @@
+SUMMARY = "NetworkManager GUI library"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0 networkmanager"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gtk-doc gettext vala
+
+SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
+SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
+
+PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
+PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
+
+GTKDOC_MESON_OPTION = "gtk_doc"

--
2.21.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#10 lore raw
Quoted 7 lines · Qi

Hi Andreas,

There's also another problem. The PACKAGECONFIG item, 'gcr', cannot be disabled, otherwise, we will have do_configure error.

Best Regards,
Chen Qi

Thanks for feedback - will look into both issues and send follow up.

Andreas