diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-02 20:29:27 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-02 20:29:31 +0300 |
commit | 36a3e3e747c6df39fc2e3910b72a40c0bd7f3c7d (patch) | |
tree | 9480192d0cca5018cf5a364d4931b90694b96aec /meta-openembedded/meta-networking/recipes-connectivity/networkmanager | |
parent | 63417d1f540c12c3e0b456409555ecbe50f39875 (diff) | |
download | openbmc-36a3e3e747c6df39fc2e3910b72a40c0bd7f3c7d.tar.xz |
meta-openembedded: subtree update:41fe46157c..e6d76b05a7
Adrian Bunk (1):
networkmanager: Correct the upstream version check
Adrian Ratiu (1):
renderdoc: add new recipe
Changqing Li (1):
kea: upgrade 1.5.0 -> 1.7.0
Denys Dmytriyenko (1):
rwmem: add recipe
Hongxu Jia (1):
lvm2: fix run lvcreate hung while PACKAGECONFIG udev
Jackie Huang (6):
python-versiontools: add recipes for python2 and python3
python-pymysql: add recipes for python2 and python3
python-statistics: add new recipe
python-pyperf: add recipes for python2 and python3
python-pika: add recipes for python2 and python3
python-pycurl: add recipes for python2 and python3
Khem Raj (6):
openipmi: Mark libOpenIPMI.so.0 as private lib in openipmi-perl
ttf-gentium: Use OFL-1.0 version of OFL license
ttf-hunkyfonts: Use LGPL-2.1 which is correct version from LICENSE file
python-configparser: Mark license as MIT
fontforge: Upgrade to 20190801 release
opensaf: Fix duplicate copies of shared libs in package
Martin Jansa (2):
spice: ignore all warnings not just address-of-packed-member
Revert "spice: Drop broken native"
Otavio Salvador (5):
networkmanager: Fix ADSL plugin packaging
networkmanager: Add a `resolvconf` PACKAGECONFIG
networkmanager: Add sysvinit support
libqmi: Upgrade 1.22.2 -> 1.24.0
modemmanager: Upgrade 1.10.0 -> 1.10.2
Qi.Chen@windriver.com (1):
protobuf-c: fix race condition
Robert Yang (2):
corosync: Fix PACKAGECONFIG flag for rdma
net-snmp: Fix PACKAGECONFIG for perl
Zang Ruochen (1):
python-urllib3: upgrade 1.25.5 -> 1.25.6
Change-Id: I20029cc79a225f6ab8f1b133ebc16129b7b32082
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity/networkmanager')
2 files changed, 117 insertions, 5 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd new file mode 100644 index 0000000000..4fdd80d410 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd @@ -0,0 +1,110 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: network-manager +# Required-Start: $remote_fs dbus udev +# Required-Stop: $remote_fs dbus udev +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: network connection manager +# Description: Daemon for automatically switching network +# connections to the best available connection. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="network connection manager" +NAME="NetworkManager" + +DAEMON=/usr/sbin/$NAME + +PIDFILE=/run/$NAME/$NAME.pid + +SCRIPTNAME=/etc/init.d/network-manager + +. /etc/init.d/functions || exit 1 + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +log_daemon_msg() { + echo -n $* +} + +log_end_msg() { + if [ $1 -eq 0 ]; then + success + else + failure + fi + echo +} + +log_progress_msg () { + if [ -z "${1:-}" ]; then + return 1 + fi + echo -n " $@" +} + +# +# Function that starts the daemon/service. +# +d_start() { + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ + --exec $DAEMON +} + +d_reload() { + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \ + --exec $DAEMON +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + d_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + d_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC" "$NAME" + d_reload + log_end_msg $? + ;; + restart) + $0 stop + $0 start + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb index b760a40c35..0d6e1a0b0d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb @@ -19,10 +19,11 @@ DEPENDS = " \ curl \ " -inherit gnomebase gettext systemd bash-completion vala gobject-introspection gtk-doc update-alternatives +inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://${BPN}.initd \ file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ " @@ -33,9 +34,6 @@ SRC_URI_append_libc-musl = " \ SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9" SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3" -UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.16/" -UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz" - S = "${WORKDIR}/NetworkManager-${PV}" EXTRA_OECONF = " \ @@ -78,6 +76,7 @@ PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-clien PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib" +PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" @@ -92,7 +91,7 @@ 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}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" FILES_${PN} += " \ ${libexecdir} \ @@ -129,6 +128,7 @@ FILES_${PN}-nmtui-doc = " \ ${mandir}/man1/nmtui* \ " +INITSCRIPT_NAME = "network-manager" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" ALTERNATIVE_PRIORITY = "100" @@ -137,6 +137,8 @@ ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','syste ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" do_install_append() { + install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager + rm -rf ${D}/run ${D}${localstatedir}/run # For read-only filesystem, do not create links during bootup |