From e0ee4dd97f3434352c275b662f34a43bbdb03ca2 Mon Sep 17 00:00:00 2001 From: brl Date: Tue, 12 Dec 2017 15:33:24 -0500 Subject: [PATCH] NetworkManager package --- ...reating-libnm-core-tests-directory-f.patch | 33 +++++ .../networkmanager/networkmanager_1.10.0.bb | 130 ++++++++++++++++++ 2 files changed, 163 insertions(+) create mode 100644 meta-citadel/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch create mode 100644 meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb diff --git a/meta-citadel/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch b/meta-citadel/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch new file mode 100644 index 0000000..c238310 --- /dev/null +++ b/meta-citadel/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch @@ -0,0 +1,33 @@ +From b55fba8fbda49b9ec2f6f67c44960a0a5fd35ad9 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Wed, 14 Jun 2017 14:03:30 +0200 +Subject: [PATCH] build: fix race creating "libnm-core/tests" directory for + "nm-core-tests-enum-types.c" + +https://bugzilla.gnome.org/show_bug.cgi?id=783783 + +Upstream-Status: Backport + +Signed-off-by: Andrei Gherzan + +--- + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 72bd241..f25fc02 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -616,6 +616,9 @@ GLIB_GENERATED += \ + libnm-core/tests/nm-core-tests-enum-types.c + nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h + ++libnm-core/tests/nm-core-tests-enum-types.h.stamp: libnm-core/tests/.dirstamp ++libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp ++ + $(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h + + libnm_core_tests_cppflags = \ +-- +2.7.4 + diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb new file mode 100644 index 0000000..6a4679d --- /dev/null +++ b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb @@ -0,0 +1,130 @@ +# +# meta-openembedded recipe, edited as little as possible +# + +SUMMARY = "NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ + file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ + file://docs/api/html/license.html;md5=eb0c003714e5391000fdfd9c9615cccf \ +" + +DEPENDS = "intltool-native libnl dbus dbus-glib dbus-glib-native libgudev util-linux libnewt polkit libndp" + + +inherit gnomebase gettext systemd bluetooth gobject-introspection upstream-version-is-even + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://0001-build-fix-race-creating-libnm-core-tests-directory-f.patch \ +" +SRC_URI[md5sum] = "c4308b83f77a7cb8c6e0e0ec1a30c89f" +SRC_URI[sha256sum] = "8abbd60cf0e56003a7b9428ceb50a58c80e02e045ac31c3399e9227a712e04de" + +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-ifnet \ + --disable-ifcfg-suse \ + --disable-json-validation \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --disable-ovs \ + --disable-vala \ + --without-selinux \ + --without-wext \ + --without-libnm-glib \ + --with-tests \ + --disable-introspection \ + --with-nmtui=yes \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs" +} + +PACKAGECONFIG ??= "nss ifupdown netconfig dhclient concheck \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ +" +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ + --without-systemdsystemunitdir, \ + polkit \ +" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" +# Use full featured dhcp client instead of internal one +PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" +PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" +PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,curl,curl" + +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-adsl \ +" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm-glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${base_libdir}/udev/* \ + ${systemd_unitdir}/system \ +" + +RRECOMMENDS_${PN} += "iptables \ + ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/NetworkManager/.debug/ \ + ${libdir}/pppd/*/.debug/ \ +" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ +" + +FILES_${PN}-tests = " \ + ${bindir}/nm-online \ +" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" + +do_install_append() { + rm -rf ${D}/run ${D}${localstatedir}/run +}