diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-03-12 10:15:29 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-03-12 10:15:29 +0100 |
| commit | 899c6d9ae5a63e15234383cecfd401c4e7f8df1b (patch) | |
| tree | 42fa49e0051f3965f666baa765b2c1b497da97ec /net-misc/networkmanager | |
| parent | app-arch/xz-utils: Bumped live ebuild to EAPI-7 (diff) | |
| download | gentoo-899c6d9ae5a63e15234383cecfd401c4e7f8df1b.tar.gz gentoo-899c6d9ae5a63e15234383cecfd401c4e7f8df1b.tar.bz2 gentoo-899c6d9ae5a63e15234383cecfd401c4e7f8df1b.zip | |
net-misc/networkmanager: Revbump: Don't call helpers with full path
84-nm-drivers.rules calls /usr/bin/sed but we have sed in /bin/
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-misc/networkmanager')
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch | 12 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild (renamed from net-misc/networkmanager/networkmanager-1.22.8.ebuild) | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch b/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch new file mode 100644 index 000000000000..f7ce742c5d53 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch @@ -0,0 +1,12 @@ +We don't have sed in /usr/bin + +--- NetworkManager-1.20.6/data/84-nm-drivers.rules ++++ NetworkManager-1.20.6/data/84-nm-drivers.rules +@@ -7,6 +7,6 @@ + # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) + ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" + DRIVERS=="?*", GOTO="nm_drivers_end" +-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="/bin/sh -c 'ethtool -i $$1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" + + LABEL="nm_drivers_end" diff --git a/net-misc/networkmanager/networkmanager-1.22.8.ebuild b/net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild index 3e0f281bfc96..08e86947d2ea 100644 --- a/net-misc/networkmanager/networkmanager-1.22.8.ebuild +++ b/net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild @@ -104,6 +104,10 @@ S="${WORKDIR}"/NetworkManager-${PV} # Not implemented yet. RESTRICT="test" +PATCHES=( + "${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch" +) + python_check_deps() { if use introspection; then has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return |