diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2017-11-26 20:46:37 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2017-11-26 20:46:37 -0500 |
| commit | 6ff1dd386725596a4a72d0d517e8509b616316bc (patch) | |
| tree | 7f5d440404b7eb9000f269a1ebe622591a45b885 /debian | |
| parent | 7c2b542be1948d644993caf97e00fa3a418cd9ff (diff) | |
Drop Only-test-team-devices-if-we-built-support-for-them.patch
Not needed
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/Only-test-team-devices-if-we-built-support-for-them.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 0 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index 1ba91515..6cd3e6a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,7 +37,6 @@ network-manager (1.10.0-1ubuntu1) UNRELEASED; urgency=medium + Ignore-rmnet_usbX-devices.patch + Ignore-p2p0-wifi-devices-from-android.patch + Track-killswitch-change-signals-from-urfkill.patch - + Only-test-team-devices-if-we-built-support-for-them.patch + Disable-general-with-expect.patch + libnm-Check-self-still-NMManager-or-not.patch + dns-manager-don-t-merge-split-DNS-search-domains.patch diff --git a/debian/patches/Only-test-team-devices-if-we-built-support-for-them.patch b/debian/patches/Only-test-team-devices-if-we-built-support-for-them.patch deleted file mode 100644 index 4883a2b5..00000000 --- a/debian/patches/Only-test-team-devices-if-we-built-support-for-them.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> -Date: Fri, 13 May 2016 11:13:16 +0800 -Subject: Only test team devices if we built support for them. - -Team device support is already conditional to teamdctl being available at -compile time. If we're not building support for them, we shouldn't attempt -to test them either as doing so would fail the build. ---- - src/platform/tests/test-link.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c -index ed43556..6395e02 100644 ---- a/src/platform/tests/test-link.c -+++ b/src/platform/tests/test-link.c -@@ -2509,7 +2509,9 @@ _nmtstp_setup_tests (void) - g_test_add_func ("/link/internal", test_internal); - g_test_add_func ("/link/software/bridge", test_bridge); - g_test_add_func ("/link/software/bond", test_bond); -+#if WITH_TEAMDCTL - g_test_add_func ("/link/software/team", test_team); -+#endif - g_test_add_func ("/link/software/vlan", test_vlan); - g_test_add_func ("/link/software/bridge/addr", test_bridge_addr); - diff --git a/debian/patches/series b/debian/patches/series index 62038d6a..6d826682 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,7 +9,6 @@ Update-dnsmasq-parameters.patch Ignore-rmnet_usbX-devices.patch Ignore-p2p0-wifi-devices-from-android.patch Track-killswitch-change-signals-from-urfkill.patch -Only-test-team-devices-if-we-built-support-for-them.patch Disable-general-with-expect.patch libnm-Check-self-still-NMManager-or-not.patch dns-manager-don-t-merge-split-DNS-search-domains.patch |