diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/create-exports-NetworkManager.sh | 11 | ||||
| -rwxr-xr-x | tools/meson-post-install.sh | 47 | ||||
| -rwxr-xr-x | tools/test-networkmanager-service.py | 9 |
3 files changed, 61 insertions, 6 deletions
diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh index 7d359005..3c5789d8 100755 --- a/tools/create-exports-NetworkManager.sh +++ b/tools/create-exports-NetworkManager.sh @@ -35,7 +35,12 @@ call_nm() { } get_symbols_nm () { - call_nm ./src/${libs}libNetworkManager.a | + if [ -z "$from_meson" ]; then + base=./src/.libs/libNetworkManager.a + else + base=./src/nm-full-symbols + fi + call_nm "$base" | sed -n 's/^[tTDGRBS] //p' | _sort } @@ -48,8 +53,8 @@ EOF get_symbols_missing() { (for f in $(find ./src/settings/plugins/*/${libs} \ - ./src/devices/*/${libs} \ - ./src/ppp/${libs} -name '*.so'); do + ./src/devices/*/${libs} \ + ./src/ppp/${libs} -name '*.so' 2>/dev/null); do call_nm "$f" | sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|c_siphash_\).*\)$/\2/p' done) | diff --git a/tools/meson-post-install.sh b/tools/meson-post-install.sh new file mode 100755 index 00000000..8a60ce33 --- /dev/null +++ b/tools/meson-post-install.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +datadir=$1 +bindir=$2 +pkgconfdir=$3 +pkglibdir=$4 +pkgstatedir=$5 + +[ -n "$DESTDIR" ] && DESTDIR=${DESTDIR%%/}/ + +if [ -f "${DESTDIR}${datadir}/bash-completion/completions/nmcli-completion" ]; then + mv "${DESTDIR}${datadir}/bash-completion/completions/nmcli-completion" \ + "${DESTDIR}${datadir}/bash-completion/completions/nmcli" +fi + +if [ -x "${DESTDIR}${bindir}/nmtui" ]; then + for alias in nmtui-connect nmtui-edit nmtui-hostname; do + ln -sf nmtui "${DESTDIR}${bindir}/$alias" + done +fi + +for dir in "${pkgconfdir}/conf.d" \ + "${pkgconfdir}/system-connections" \ + "${pkgconfdir}/dispatcher.d/no-wait.d" \ + "${pkgconfdir}/dispatcher.d/pre-down.d" \ + "${pkgconfdir}/dispatcher.d/pre-up.d" \ + "${pkgconfdir}/dnsmasq.d" \ + "${pkgconfdir}/dnsmasq-shared.d" \ + "${pkglibdir}/conf.d" \ + "${pkglibdir}/VPN"; do + mkdir -p "${DESTDIR}${dir}" + chmod 0755 "${DESTDIR}${dir}" +done + +mkdir -p "${DESTDIR}${pkgstatedir}" +chmod 0700 "${DESTDIR}${pkgstatedir}" + +if [ "$6" = install_docs ]; then + mandir=$7 + + for alias in nmtui-connect nmtui-edit nmtui-hostname; do + ln -f "${DESTDIR}${mandir}/man1/nmtui.1" "${DESTDIR}${mandir}/man1/${alias}.1" + done + + ln -f "${DESTDIR}${mandir}/man5/NetworkManager.conf.5" "${DESTDIR}${mandir}/man5/nm-system-settings.conf" +fi + diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 9dd75bea..8a37fb17 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -281,6 +281,8 @@ class Util: return GLib.Variant('s', str(val)) if isinstance(val, dbus.UInt32): return GLib.Variant('u', int(val)) + if isinstance(val, dbus.UInt64): + return GLib.Variant('t', int(val)) if isinstance(val, dbus.Boolean): return GLib.Variant('b', bool(val)) if isinstance(val, dbus.Byte): @@ -481,11 +483,12 @@ class NmUtil: if not do_verify_strict: return; t = s_con[NM.SETTING_CONNECTION_TYPE] - if t not in [ NM.SETTING_WIRED_SETTING_NAME, - NM.SETTING_WIRELESS_SETTING_NAME, + if t not in [ NM.SETTING_GSM_SETTING_NAME, NM.SETTING_VLAN_SETTING_NAME, + NM.SETTING_VPN_SETTING_NAME, NM.SETTING_WIMAX_SETTING_NAME, - NM.SETTING_VPN_SETTING_NAME ]: + NM.SETTING_WIRED_SETTING_NAME, + NM.SETTING_WIRELESS_SETTING_NAME ]: raise BusErr.InvalidPropertyException('connection.type: unsupported connection type "%s"' % (t)) try: |