50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
|
From 49b0ac071ceeef64e460ef2c5ac9bf361e787b7a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Miroshnichenko <alex@millerson.name>
|
||
|
|
Date: Thu, 25 May 2023 09:51:52 +0300
|
||
|
|
Subject: [PATCH] build: add Gentoo compat
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
||
|
|
---
|
||
|
|
meson.build | 8 ++++----
|
||
|
|
src/meson.build | 2 +-
|
||
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 50bd1b5b192e..615893ddaa08 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -20,11 +20,11 @@ completions = dependency('bash-completion')
|
||
|
|
systemd_generator_dir = systemd.get_variable(pkgconfig: 'systemdsystemgeneratordir')
|
||
|
|
bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', default_value: '/etc/bash_completion.d')
|
||
|
|
|
||
|
|
-# Order: Fedora/Mageia/openSUSE || Debian/Ubuntu
|
||
|
|
-pyflakes = find_program('pyflakes-3', 'pyflakes3', required: false)
|
||
|
|
+# Order: Fedora/Mageia/openSUSE || Debian/Ubuntu || Gentoo
|
||
|
|
+pyflakes = find_program('pyflakes-3', 'pyflakes3', 'pyflakes', required: false)
|
||
|
|
pycodestyle = find_program('pycodestyle-3', 'pycodestyle', 'pep8', required: false)
|
||
|
|
-pytest = find_program('pytest-3', 'pytest3') # also requires the pytest-cov plugin
|
||
|
|
-pycoverage = find_program('python3-coverage')
|
||
|
|
+pytest = find_program('pytest-3', 'pytest3', 'pytest') # also requires the pytest-cov plugin
|
||
|
|
+pycoverage = find_program('python3-coverage', 'coverage')
|
||
|
|
pandoc = find_program('pandoc', required: false)
|
||
|
|
find = find_program('find')
|
||
|
|
|
||
|
|
diff --git a/src/meson.build b/src/meson.build
|
||
|
|
index b44649cf89c2..262c65e18482 100644
|
||
|
|
--- a/src/meson.build
|
||
|
|
+++ b/src/meson.build
|
||
|
|
@@ -36,7 +36,7 @@ executable(
|
||
|
|
install: true)
|
||
|
|
install_symlink(
|
||
|
|
'netplan',
|
||
|
|
- pointing_to: join_paths('..', '..', '..') + join_paths(get_option('prefix'), libexec_netplan, 'generate'),
|
||
|
|
+ pointing_to: join_paths('..', '..', '..', '..') + join_paths(get_option('prefix'), libexec_netplan, 'generate'),
|
||
|
|
install_dir: systemd_generator_dir)
|
||
|
|
# Install this symlink for legacy reasons, see netplan/cli/utils.py: get_generator_path()
|
||
|
|
install_symlink(
|
||
|
|
--
|
||
|
|
2.39.2
|
||
|
|
|