diff options
| -rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb (renamed from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb) | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.50.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb index 702b80ac68..dd894c0900 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 = " \ | |||
| 25 | intltool-native \ | 25 | intltool-native \ |
| 26 | libxslt-native \ | 26 | libxslt-native \ |
| 27 | libnl \ | 27 | libnl \ |
| 28 | libnvme \ | ||
| 28 | udev \ | 29 | udev \ |
| 29 | util-linux \ | 30 | util-linux \ |
| 31 | util-linux-libuuid \ | ||
| 30 | libndp \ | 32 | libndp \ |
| 31 | curl \ | 33 | curl \ |
| 32 | dbus \ | 34 | dbus \ |
| 33 | " | 35 | " |
| 34 | DEPENDS:append:class-target = " bash-completion" | 36 | DEPENDS:append:class-target = " bash-completion" |
| 35 | 37 | ||
| 36 | inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc update-alternatives upstream-version-is-even | 38 | inherit meson gettext update-rc.d systemd gobject-introspection update-alternatives upstream-version-is-even pkgconfig |
| 37 | 39 | ||
| 38 | SRC_URI = " \ | 40 | SRC_URI = " \ |
| 39 | ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ | 41 | git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=main;tag=${PV} \ |
| 40 | file://${BPN}.initd \ | 42 | file://${BPN}.initd \ |
| 41 | file://enable-dhcpcd.conf \ | 43 | file://enable-dhcpcd.conf \ |
| 42 | file://enable-iwd.conf \ | 44 | file://enable-iwd.conf \ |
| 43 | " | 45 | " |
| 44 | 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)}" | 46 | 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)}" |
| 45 | 47 | ||
| 46 | SRC_URI[sha256sum] = "fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3" | 48 | SRCREV = "995a28fa1ccc54ad22e794294c3c6783cc3f30ed" |
| 47 | 49 | ||
| 48 | S = "${WORKDIR}/NetworkManager-${PV}" | 50 | S = "${WORKDIR}/git" |
| 49 | 51 | ||
| 50 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] | 52 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] |
| 51 | NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" | 53 | NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" |
| 52 | 54 | ||
| 53 | # ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] | 55 | # ['dhclient', 'dhcpcd', 'internal', 'nettools'] |
| 54 | NETWORKMANAGER_DHCP_DEFAULT ??= "internal" | 56 | NETWORKMANAGER_DHCP_DEFAULT ??= "internal" |
| 55 | 57 | ||
| 56 | # The default gets detected based on whether /usr/sbin/nft or /usr/sbin/iptables is installed, with nftables preferred. | 58 | # 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 = "\ | |||
| 65 | -Dqt=false \ | 67 | -Dqt=false \ |
| 66 | -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ | 68 | -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ |
| 67 | -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ | 69 | -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ |
| 68 | -Ddhcpcanon=false \ | ||
| 69 | -Diptables=${sbindir}/iptables \ | 70 | -Diptables=${sbindir}/iptables \ |
| 70 | -Dnft=${sbindir}/nft \ | 71 | -Dnft=${sbindir}/nft \ |
| 71 | " | 72 | " |
