[arch-commits] Commit in networkmanager/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Wed Oct 24 06:48:42 UTC 2018
Date: Wednesday, October 24, 2018 @ 06:48:41
Author: heftig
Revision: 337206
1.14.3dev+21+g0ffb390bf-1: Restore plugin RPATH
Added:
networkmanager/trunk/26.patch
Modified:
networkmanager/trunk/PKGBUILD
Deleted:
networkmanager/trunk/0001-meson-Fix-platform-tests.patch
-------------------------------------+
0001-meson-Fix-platform-tests.patch | 137 ----------------------------------
26.patch | 53 +++++++++++++
PKGBUILD | 11 +-
3 files changed, 60 insertions(+), 141 deletions(-)
Deleted: 0001-meson-Fix-platform-tests.patch
===================================================================
--- 0001-meson-Fix-platform-tests.patch 2018-10-23 23:38:44 UTC (rev 337205)
+++ 0001-meson-Fix-platform-tests.patch 2018-10-24 06:48:41 UTC (rev 337206)
@@ -1,137 +0,0 @@
-From a407e10a2646771cd649976aae03f2cc6111ff92 Mon Sep 17 00:00:00 2001
-Message-Id: <a407e10a2646771cd649976aae03f2cc6111ff92.1539968035.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 19 Oct 2018 18:48:43 +0200
-Subject: [PATCH] meson: Fix platform tests
-
-All platform tests were run twice with the `linux` platform, instead of
-`fake` and `linux`, as expected.
----
- src/meson.build | 13 ++++++++++---
- src/ndisc/tests/meson.build | 6 ++----
- src/platform/tests/meson.build | 26 ++++++++++++--------------
- 3 files changed, 24 insertions(+), 21 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index f293f299b..d58fb4d1f 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -216,23 +216,30 @@ if enable_tests
- test_cflags += ['-DREQUIRE_ROOT_TESTS=1']
- endif
-
-- platform = (host_machine.system().contains('linux') ? 'linux' : 'fake')
-- test_cflags_platform = '-DSETUP=nm_' + platform + '_platform_setup'
--
- libnetwork_manager_test = static_library(
- nm_name + 'Test',
- sources: sources,
- dependencies: deps,
- c_args: cflags + test_cflags,
- link_with: libnetwork_manager
- )
-
- test_nm_dep = declare_dependency(
- dependencies: nm_dep,
- compile_args: test_cflags,
- link_with: libnetwork_manager_test
- )
-
-+ test_nm_dep_fake = declare_dependency(
-+ dependencies: test_nm_dep,
-+ compile_args: ['-DSETUP=nm_fake_platform_setup']
-+ )
-+
-+ test_nm_dep_linux = declare_dependency(
-+ dependencies: test_nm_dep,
-+ compile_args: ['-DSETUP=nm_linux_platform_setup']
-+ )
-+
- subdir('dnsmasq/tests')
- subdir('ndisc/tests')
- subdir('platform/tests')
-diff --git a/src/ndisc/tests/meson.build b/src/ndisc/tests/meson.build
-index 2f479c2d9..e0dc9aa6c 100644
---- a/src/ndisc/tests/meson.build
-+++ b/src/ndisc/tests/meson.build
-@@ -3,21 +3,19 @@ test_unit = 'test-ndisc-fake'
- exe = executable(
- test_unit,
- test_unit + '.c',
-- dependencies: test_nm_dep,
-- c_args: test_cflags_platform
-+ dependencies: test_nm_dep_fake,
- )
-
- test(
- 'ndisc/' + test_unit,
- test_script,
- args: test_args + [exe.full_path()]
- )
-
- test = 'test-ndisc-linux'
-
- exe = executable(
- test,
- test + '.c',
-- dependencies: test_nm_dep,
-- c_args: test_cflags_platform
-+ dependencies: test_nm_dep_linux,
- )
-diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
-index 0571efacf..67582d776 100644
---- a/src/platform/tests/meson.build
-+++ b/src/platform/tests/meson.build
-@@ -1,37 +1,35 @@
- test_units = [
-- ['test-link-fake', 'test-link.c', 60],
-- ['test-link-linux', 'test-link.c', 60],
-- ['test-address-fake', 'test-address.c'],
-- ['test-address-linux', 'test-address.c'],
-- ['test-general', 'test-general.c'],
-- ['test-nmp-object', 'test-nmp-object.c'],
-- ['test-route-fake', 'test-route.c'],
-- ['test-route-linux', 'test-route.c'],
-- ['test-cleanup-fake', 'test-cleanup.c'],
-- ['test-cleanup-linux', 'test-cleanup.c'],
-+ ['test-link-fake', 'test-link.c', test_nm_dep_fake, 30],
-+ ['test-link-linux', 'test-link.c', test_nm_dep_linux, 90],
-+ ['test-address-fake', 'test-address.c', test_nm_dep_fake, 30],
-+ ['test-address-linux', 'test-address.c', test_nm_dep_linux, 30],
-+ ['test-general', 'test-general.c', test_nm_dep, 30],
-+ ['test-nmp-object', 'test-nmp-object.c', test_nm_dep, 30],
-+ ['test-route-fake', 'test-route.c', test_nm_dep_fake, 30],
-+ ['test-route-linux', 'test-route.c', test_nm_dep_linux, 30],
-+ ['test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, 30],
-+ ['test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, 30],
- ]
-
- foreach test_unit: test_units
- exe = executable(
- 'platform-' + test_unit[0],
- test_unit[1],
-- dependencies: test_nm_dep,
-- c_args: test_cflags_platform
-+ dependencies: test_unit[2],
- )
-
- test(
- 'platform/' + test_unit[0],
- test_script,
-- timeout: test_unit.length() > 2 ? test_unit[2] : 30,
-+ timeout: test_unit[3],
- args: test_args + [exe.full_path()]
- )
- endforeach
-
- test = 'monitor'
-
- executable(
- test,
- test + '.c',
- dependencies: test_nm_dep,
-- c_args: test_cflags_platform
- )
---
-2.19.1
-
Added: 26.patch
===================================================================
--- 26.patch (rev 0)
+++ 26.patch 2018-10-24 06:48:41 UTC (rev 337206)
@@ -0,0 +1,53 @@
+From 7b9eb1528d7092ebe62c0a816cd3d14d4407463b Mon Sep 17 00:00:00 2001
+From: Taegil Bae <esrevinu at gmail.com>
+Date: Mon, 22 Oct 2018 02:50:05 +0000
+Subject: [PATCH 1/2] Set RPATH for libnm_device_plugin_bluetooth.so
+
+---
+ src/devices/bluetooth/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build
+index 019f04f6b..628a3bc80 100644
+--- a/src/devices/bluetooth/meson.build
++++ b/src/devices/bluetooth/meson.build
+@@ -26,7 +26,8 @@ libnm_device_plugin_bluetooth = shared_module(
+ link_args: ldflags_linker_script_devices,
+ link_depends: linker_script_devices,
+ install: true,
+- install_dir: nm_plugindir
++ install_dir: nm_plugindir,
++ install_rpath: nm_plugindir
+ )
+
+ core_plugins += libnm_device_plugin_bluetooth
+--
+2.18.1
+
+
+From f7c5745d81205ce3675bee55b0ab1e814a63c817 Mon Sep 17 00:00:00 2001
+From: Taegil Bae <esrevinu at gmail.com>
+Date: Mon, 22 Oct 2018 02:52:06 +0000
+Subject: [PATCH 2/2] Set RPATH for libnm_device_plugin_wwan.so
+
+---
+ src/devices/wwan/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build
+index 2c0ea5a10..5fe6e433e 100644
+--- a/src/devices/wwan/meson.build
++++ b/src/devices/wwan/meson.build
+@@ -54,7 +54,8 @@ libnm_device_plugin_wwan = shared_module(
+ link_args: ldflags_linker_script_devices,
+ link_depends: linker_script_devices,
+ install: true,
+- install_dir: nm_plugindir
++ install_dir: nm_plugindir,
++ install_rpath: nm_plugindir
+ )
+
+ core_plugins += libnm_device_plugin_wwan
+--
+2.18.1
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-23 23:38:44 UTC (rev 337205)
+++ PKGBUILD 2018-10-24 06:48:41 UTC (rev 337206)
@@ -7,7 +7,7 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm libnm-glib)
-pkgver=1.14.3dev+15+g3fc592219
+pkgver=1.14.3dev+21+g0ffb390bf
pkgrel=1
pkgdesc="Network connection manager and user applications"
url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -19,11 +19,11 @@
libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
glib2-docs dhcpcd iwd dnsmasq systemd-resolvconf libpsl audit meson)
checkdepends=(libx11 python-dbus)
-_commit=3fc592219e106fdbf98e9e994a4531d9d045d0da # nm-1-14
+_commit=0ffb390bf3390aafd08ba5df5d0b4eb96e93327e # nm-1-14
source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
- 0001-meson-Fix-platform-tests.patch)
+ 26.patch)
sha256sums=('SKIP'
- 'e993a727bb06494419071baea3c20fcc00aa2f9cf110d14f09f043be23952a1b')
+ '0051e1021494d0b56050e7d6c0d44668ae12465ea1429f88a38f26ac90416e9e')
pkgver() {
cd NetworkManager
@@ -32,6 +32,9 @@
prepare() {
cd NetworkManager
+
+ # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/26
+ git apply -3 ../26.patch
}
build() {
More information about the arch-commits
mailing list