| Message ID | 20250528061506.466361-1-f_l_k@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-networking] networkmanager: update 1.50.0 -> 1-52-0 | expand |
> -----Original Message----- > From: openembedded-devel@lists.openembedded.org <openembedded- > devel@lists.openembedded.org> On Behalf Of Markus Volk via > lists.openembedded.org > Sent: Wednesday, May 28, 2025 8:15 > To: openembedded-devel@lists.openembedded.org > Subject: [oe] [meta-networking][PATCH] networkmanager: update 1.50.0 -> 1-52-0 > > - there is no tarball hosted at gnome anymore -> switch from > gnomebase class to meson + git > - add missing dependencies for uuid and nvme, add pkgconfig class > - dhcpcanon option was removed upstream > - gtkdoc is broken. Disable to unbreak builds if api-documentation > is enabled > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > --- > ...rkmanager_1.50.0.bb => networkmanager_1.52.0.bb} | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > rename meta-networking/recipes- > connectivity/networkmanager/{networkmanager_1.50.0.bb => > networkmanager_1.52.0.bb} (96%) > > diff --git a/meta-networking/recipes- > connectivity/networkmanager/networkmanager_1.50.0.bb b/meta- > networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb > similarity index 96% > rename from meta-networking/recipes- > connectivity/networkmanager/networkmanager_1.50.0.bb > rename to meta-networking/recipes- > connectivity/networkmanager/networkmanager_1.52.0.bb > index 702b80ac68..cc37bd05d7 100644 > --- a/meta-networking/recipes- > connectivity/networkmanager/networkmanager_1.50.0.bb > +++ b/meta-networking/recipes- > connectivity/networkmanager/networkmanager_1.52.0.bb > @@ -25,32 +25,34 @@ DEPENDS = " \ > intltool-native \ > libxslt-native \ > libnl \ > + libnvme \ > udev \ > util-linux \ > + util-linux-libuuid \ > libndp \ > curl \ > dbus \ > " > DEPENDS:append:class-target = " bash-completion" > > -inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc > update-alternatives upstream-version-is-even > +inherit meson gettext update-rc.d systemd gobject-introspection update- > alternatives upstream-version-is-even pkgconfig > > SRC_URI = " \ > - > ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager > -${PV}.tar.xz \ > + > git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=main > \ > file://${BPN}.initd \ > file://enable-dhcpcd.conf \ > file://enable-iwd.conf \ > " > SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is- > lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" > > -SRC_URI[sha256sum] = > "fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3" > +SRCREV = "7ee8d84a1ea030f5a4dd867702ed2992f192c5c8" This is tip of current main branch (1.53.4-dev-23-g7ee8d84a1e), not 1.52.0 Ideally this should be hash of 1.52.0 (or even better 1.53.4) and SRC_URI should contain ";tag=${PV}" Peter > > -S = "${WORKDIR}/NetworkManager-${PV}" > +S = "${WORKDIR}/git" > > # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] > NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" > > -# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] > +# ['dhclient', 'dhcpcd', 'internal', 'nettools'] > NETWORKMANAGER_DHCP_DEFAULT ??= "internal" > > # The default gets detected based on whether /usr/sbin/nft or /usr/sbin/iptables is > installed, with nftables preferred. > @@ -65,7 +67,6 @@ EXTRA_OEMESON = "\ > -Dqt=false \ > - > Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_ > DEFAULT} \ > -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ > - -Ddhcpcanon=false \ > -Diptables=${sbindir}/iptables \ > -Dnft=${sbindir}/nft \ > " > -- > 2.49.0
I had updated to tip of master to check if there was already a fix for the gobject issue that could be backported, and then forgot to set SRCREV back to 1.52.0 On Wed, May 28 2025 at 06:23:22 +00:00:00, "Marko, Peter" <Peter.Marko@siemens.com> wrote: > > >> -----Original Message----- >> From: openembedded-devel@lists.openembedded.org >> <mailto:openembedded-devel@lists.openembedded.org> <openembedded- >> devel@lists.openembedded.org <mailto:devel@lists.openembedded.org>> >> On Behalf Of Markus Volk via >> lists.openembedded.org >> Sent: Wednesday, May 28, 2025 8:15 >> To: openembedded-devel@lists.openembedded.org >> <mailto:openembedded-devel@lists.openembedded.org> >> Subject: [oe] [meta-networking][PATCH] networkmanager: update >> 1.50.0 -> 1-52-0 >> >> - there is no tarball hosted at gnome anymore -> switch from >> gnomebase class to meson + git >> - add missing dependencies for uuid and nvme, add pkgconfig class >> - dhcpcanon option was removed upstream >> - gtkdoc is broken. Disable to unbreak builds if api-documentation >> is enabled >> >> Signed-off-by: Markus Volk <f_l_k@t-online.de >> <mailto:f_l_k@t-online.de>> >> --- >> ...rkmanager_1.50.0.bb => networkmanager_1.52.0.bb} | 13 >> +++++++------ >> 1 file changed, 7 insertions(+), 6 deletions(-) >> rename meta-networking/recipes- >> connectivity/networkmanager/{networkmanager_1.50.0.bb => >> networkmanager_1.52.0.bb} (96%) >> >> diff --git a/meta-networking/recipes- >> connectivity/networkmanager/networkmanager_1.50.0.bb b/meta- >> >> networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb >> similarity index 96% >> rename from meta-networking/recipes- >> connectivity/networkmanager/networkmanager_1.50.0.bb >> rename to meta-networking/recipes- >> connectivity/networkmanager/networkmanager_1.52.0.bb >> index 702b80ac68..cc37bd05d7 100644 >> --- a/meta-networking/recipes- >> connectivity/networkmanager/networkmanager_1.50.0.bb >> +++ b/meta-networking/recipes- >> connectivity/networkmanager/networkmanager_1.52.0.bb >> @@ -25,32 +25,34 @@ DEPENDS = " \ >> intltool-native \ >> libxslt-native \ >> libnl \ >> + libnvme \ >> udev \ >> util-linux \ >> + util-linux-libuuid \ >> libndp \ >> curl \ >> dbus \ >> " >> DEPENDS:append:class-target = " bash-completion" >> >> -inherit gnomebase gettext update-rc.d systemd >> gobject-introspection gtk-doc >> update-alternatives upstream-version-is-even >> +inherit meson gettext update-rc.d systemd gobject-introspection >> update- >> alternatives upstream-version-is-even pkgconfig >> >> SRC_URI = " \ >> - >> >> ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager >> -${PV}.tar.xz \ >> + >> >> git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=main >> \ >> file://${BPN}.initd <file://${bpn}.initd/> \ >> file://enable-dhcpcd.conf <file://enable-dhcpcd.conf/> \ >> file://enable-iwd.conf <file://enable-iwd.conf/> \ >> " >> SRC_URI:append:libc-musl = "${@bb.utils.contains >> <mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'ld-is- >> lld', ' >> file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', >> <file://0001-linker-scripts-do-not-export-_io_stdin_used.patch',/> >> '', d)}" >> >> -SRC_URI[sha256sum] = >> "fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3" >> +SRCREV = "7ee8d84a1ea030f5a4dd867702ed2992f192c5c8" > > This is tip of current main branch (1.53.4-dev-23-g7ee8d84a1e), not > 1.52.0 > Ideally this should be hash of 1.52.0 (or even better 1.53.4) and > SRC_URI should contain ";tag=${PV}" > > Peter > >> >> -S = "${WORKDIR}/NetworkManager-${PV}" >> +S = "${WORKDIR}/git" >> >> # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] >> NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" >> >> -# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] >> +# ['dhclient', 'dhcpcd', 'internal', 'nettools'] >> NETWORKMANAGER_DHCP_DEFAULT ??= "internal" >> >> # The default gets detected based on whether /usr/sbin/nft or >> /usr/sbin/iptables is >> installed, with nftables preferred. >> @@ -65,7 +67,6 @@ EXTRA_OEMESON = "\ >> -Dqt=false \ >> - >> Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_ >> DEFAULT} \ >> -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ >> - -Ddhcpcanon=false \ >> -Diptables=${sbindir}/iptables \ >> -Dnft=${sbindir}/nft \ >> " >> -- >> 2.49.0 >
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb similarity index 96% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb index 702b80ac68..cc37bd05d7 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb @@ -25,32 +25,34 @@ DEPENDS = " \ intltool-native \ libxslt-native \ libnl \ + libnvme \ udev \ util-linux \ + util-linux-libuuid \ libndp \ curl \ dbus \ " DEPENDS:append:class-target = " bash-completion" -inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc update-alternatives upstream-version-is-even +inherit meson gettext update-rc.d systemd gobject-introspection update-alternatives upstream-version-is-even pkgconfig SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=main \ file://${BPN}.initd \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ " SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3" +SRCREV = "7ee8d84a1ea030f5a4dd867702ed2992f192c5c8" -S = "${WORKDIR}/NetworkManager-${PV}" +S = "${WORKDIR}/git" # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" -# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] +# ['dhclient', 'dhcpcd', 'internal', 'nettools'] NETWORKMANAGER_DHCP_DEFAULT ??= "internal" # The default gets detected based on whether /usr/sbin/nft or /usr/sbin/iptables is installed, with nftables preferred. @@ -65,7 +67,6 @@ EXTRA_OEMESON = "\ -Dqt=false \ -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ - -Ddhcpcanon=false \ -Diptables=${sbindir}/iptables \ -Dnft=${sbindir}/nft \ "
- there is no tarball hosted at gnome anymore -> switch from gnomebase class to meson + git - add missing dependencies for uuid and nvme, add pkgconfig class - dhcpcanon option was removed upstream - gtkdoc is broken. Disable to unbreak builds if api-documentation is enabled Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...rkmanager_1.50.0.bb => networkmanager_1.52.0.bb} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.50.0.bb => networkmanager_1.52.0.bb} (96%)