Compare commits
2 Commits
f5a5f174c8
...
057ce2ec49
| Author | SHA1 | Date |
|---|---|---|
 Alexander Miroshnichenko
|
057ce2ec49
|
|
|
Alexander Miroshnichenko
|
0b80585ff1
|
|
|
@ -1,3 +1,3 @@
|
|||
AUX 0001-build-add-Gentoo-compat.patch 2155 BLAKE2B cb5ccce48d293ad3a385a61ce1130698c2797d8bbcd32898df3b6217af9291ea10d58870d0d0132f5f12f3ceda13c5d71a44a9e2acb8032e28f9e6c88dd6b965 SHA512 1c4895181b234896889a0bbaf05e6aec33fba68a902aa353c2207a452184050804919e2d57279cfddf597f8b023178c283f49d60a40c2ec6d079390385f4dd16
|
||||
DIST netplan-0.106.tar.gz 364280 BLAKE2B 7752470df1751faf36349a401bcdc30aa0a5cf27d08bc48a0953dcd950cd3f8386b5c3487bd9a3aeeeb74eca40f7fdb4fc7cb675bb89c9ae67d965d339f21921 SHA512 9f3c28770d5071d3df3664a885b37a0712c8f28240bc354d0b4f1d21afdb280791ceddfc323089287d57143d46a13748e7c09d7ecc098601a988b7a98f11c84f
|
||||
EBUILD netplan-0.106.ebuild 1248 BLAKE2B a779f8054c61573a5eaebfd5c5fe411ab12f61e29a42acacecddf90c4ab35e123d73688c11e49e48865fbd1c862f55a783d6a2216265997b0a871746336899c0 SHA512 d5d0ad85d75f1ff65b4e0522645313e38ae1cf6628367391819d88f565fbdb68960f489f95a80815e85fd47a741c6a1657fcc993724fbb4ce52ec2a3c331b73a
|
||||
AUX 0001-build-add-Gentoo-compat.patch 1739 BLAKE2B 6090333af0b87774252869d83d0ab9a4f2a65f1428035ded0680281903715db20df8b76852b38c680d23bab30933fcae195fb8597cd019a4d6f5efb394f3afb1 SHA512 97bc8ea068ebae6b92adc78a3709fd3648366d67b098d1dcbac9fb3ead12781f0cee96d9032654e6818faafc320b4949161e6b40b7288db11f725ade275950e6
|
||||
DIST netplan-1.1.1.tar.gz 516669 BLAKE2B 6cbb9f39f2e62b592cee7b26889811db0bf5ba69ab0d30603306d78574e4f469a6860d52509ba9f679f724abe29e015e5b003ca7a9d40fe461e45b888917d858 SHA512 97e749d33989b4650b51fd8ca48bb6328a0c6a759055868a0c682af20f928643e1261f6e87bdaf679278f9f2c689a729bceeab8cad51f4c10a7bf26910a5d406
|
||||
EBUILD netplan-1.1.1.ebuild 1745 BLAKE2B 291b191a87b6530f5223017890b2f6439fd6ff10fbc81fbc213aaa1ab270c9c17d8799732e174f08e485fc5731252215fb973e0a38ce16145400e217f7226099 SHA512 7d25d3d4da359944a8b7178c7e9d3ce2493b6a6c9ca8d46c3befc3d58b786b88119151cb90ee036276fb4ae0a23fc3c770adb6236d781c4cf32d032c114173f8
|
||||
|
|
|
|||
|
|
@ -1,49 +1,35 @@
|
|||
From 49b0ac071ceeef64e460ef2c5ac9bf361e787b7a Mon Sep 17 00:00:00 2001
|
||||
From 88745f4ffb91b6f8f1b7a76d019faae83b8ea0a1 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Miroshnichenko <alex@millerson.name>
|
||||
Date: Thu, 25 May 2023 09:51:52 +0300
|
||||
Date: Wed, 23 Oct 2024 17:01:19 +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(-)
|
||||
meson.build | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 50bd1b5b192e..615893ddaa08 100644
|
||||
index 68c740f968a4..8abfdc2fccd5 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -20,11 +20,11 @@ completions = dependency('bash-completion')
|
||||
@@ -22,11 +22,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)
|
||||
-pyflakes = find_program('pyflakes-3', 'pyflakes3', required: get_option('testing'))
|
||||
+# 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')
|
||||
+pyflakes = find_program('pyflakes-3', 'pyflakes3', 'pyflakes', required: get_option('testing'))
|
||||
pycodestyle = find_program('pycodestyle-3', 'pycodestyle', 'pep8', required: get_option('testing'))
|
||||
-pytest = find_program('pytest-3', 'pytest3', required: get_option('testing')) # also requires the pytest-cov plugin
|
||||
-pycoverage = find_program('coverage-3', 'python3-coverage', required: get_option('testing'))
|
||||
+pytest = find_program('pytest-3', 'pytest3', 'pytest', required: get_option('testing')) # also requires the pytest-cov plugin
|
||||
+pycoverage = find_program('coverage-3', 'python3-coverage', 'coverage', required: get_option('testing'))
|
||||
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
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
# Copyright 1999-2022 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit meson
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_USE_PEP517=no
|
||||
PYTHON_COMPAT=( python3_{10..13} pypy3 )
|
||||
|
||||
inherit meson distutils-r1
|
||||
|
||||
DESCRIPTION="Backend-agnostic network configuration in YAML"
|
||||
HOMEPAGE="https://netplan.io/"
|
||||
|
|
@ -14,14 +18,12 @@ SLOT="0"
|
|||
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
IUSE="doc +systemd +bash-completion test"
|
||||
IUSE="examples +systemd +bash-completion test lto"
|
||||
REQUIRED_USE="systemd bash-completion"
|
||||
|
||||
DEPEND=">=dev-libs/glib-2.64.3
|
||||
>=dev-libs/libyaml-0.2.5
|
||||
sys-apps/systemd
|
||||
sys-apps/util-linux
|
||||
app-shells/bash-completion
|
||||
doc? ( >=app-text/pandoc-1.19.2.1-r1 )
|
||||
"
|
||||
|
||||
|
|
@ -29,6 +31,7 @@ BDEPEND="${DEPEND}
|
|||
dev-python/pytest
|
||||
dev-python/pyflakes
|
||||
dev-python/coverage
|
||||
dev-python/jaraco-text
|
||||
test? ( dev-util/cmocka
|
||||
dev-python/pycodestyle
|
||||
)
|
||||
|
|
@ -38,17 +41,40 @@ RDEPEND=">=dev-python/netifaces-0.10.9
|
|||
>=dev-libs/libyaml-0.2.5
|
||||
>=dev-python/pyyaml-5.3.1
|
||||
dev-python/rich
|
||||
sys-apps/systemd
|
||||
app-shells/bash-completion
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-build-add-Gentoo-compat.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
distutils_enable_sphinx doc
|
||||
|
||||
python_configure() {
|
||||
local emesonargs=(
|
||||
$(meson_use test unit_testing)
|
||||
$(meson_use test b_coverage)
|
||||
"${myconf[@]}"
|
||||
$(meson_use lto b_lto)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
python_install() {
|
||||
meson_src_install
|
||||
python_optimize
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use examples; then
|
||||
dodoc -r examples
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/netplan
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
5
|
||||
|
|
@ -0,0 +1 @@
|
|||
gentoo:default/linux/amd64/23.0/musl/hardened
|
||||
|
|
@ -0,0 +1 @@
|
|||
5
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
..
|
||||
gentoo:features/selinux
|
||||
|
|
@ -0,0 +1 @@
|
|||
5
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
>=app-admin/abrt-2.10
|
||||
app-admin/calamares
|
||||
app-admin/gnome-abrt
|
||||
app-admin/mkosi
|
||||
app-admin/systemdgenie
|
||||
app-eselect/eselect-gnome-shell-extensions
|
||||
app-office/wps-office
|
||||
dev-java/openjdk-bin
|
||||
>=dev-libs/libreport-2.9
|
||||
dev-python/python-systemd
|
||||
games-util/gamemode
|
||||
gnome-base/gdm
|
||||
gnome-base/gnome
|
||||
gnome-base/gnome-applets
|
||||
gnome-base/gnome-extra-apps
|
||||
gnome-base/gnome-flashback
|
||||
gnome-base/gnome-light
|
||||
gnome-base/gnome-panel
|
||||
gnome-base/gnome-shell
|
||||
gnome-extra/chrome-gnome-shell
|
||||
gnome-extra/gnome-logs
|
||||
gnome-extra/gnome-shell-extension-appindicator
|
||||
gnome-extra/gnome-shell-extension-applications-overview-tooltip
|
||||
gnome-extra/gnome-shell-extension-bing-wallpaper
|
||||
gnome-extra/gnome-shell-extension-bluetooth-quick-connect
|
||||
gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen
|
||||
gnome-extra/gnome-shell-extension-dash-to-panel
|
||||
gnome-extra/gnome-shell-extension-desktop-icons
|
||||
gnome-extra/gnome-shell-extension-gsconnect
|
||||
gnome-extra/gnome-shell-extensions
|
||||
gnome-extra/gnome-shell-extensions-topicons-plus
|
||||
gnome-extra/gnome-shell-frippery
|
||||
gnome-extra/gnome-tweaks
|
||||
gnome-extra/gnome-user-share
|
||||
gnome-extra/office-runner
|
||||
gnome-extra/pch-session
|
||||
net-firewall/firewalld
|
||||
sys-apps/dbus-broker
|
||||
sys-apps/gentoo-systemd-integration
|
||||
sys-apps/systemd
|
||||
sys-apps/systemd-readahead
|
||||
sys-block/wait-for-dri-devices-rules
|
||||
sys-kernel/installkernel-systemd-boot
|
||||
sys-process/systemd-cron
|
||||
www-misc/profile-sync-daemon
|
||||
>=www-misc/profile-sync-daemon-6
|
||||
x11-themes/zukitwo-shell
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
app-emulation/libvirt -firewalld
|
||||
gnome-base/gdm -wayland
|
||||
net-firewall/fwknop -firewalld
|
||||
www-servers/uwsgi -uwsgi_plugins_systemd_logger
|
||||
>=x11-wm/mutter-3.22 -wayland
|
||||
x11-misc/xscreensaver -gdm
|
||||
x11-misc/gpaste -gnome
|
||||
x11-terms/gnome-terminal -gnome-shell
|
||||
x11-themes/arc-theme -gnome-shell
|
||||
x11-themes/zukitwo -gnome-shell
|
||||
net-wireless/bluez -user-session
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
..
|
||||
gentoo:targets/systemd
|
||||
gentoo:features/merged-usr
|
||||
|
|
@ -0,0 +1 @@
|
|||
-systemd
|
||||
|
|
@ -0,0 +1 @@
|
|||
5
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
app-admin/mkosi
|
||||
app-admin/systemdgenie
|
||||
dev-java/openjdk-bin
|
||||
dev-python/python-systemd
|
||||
gnome-extra/gnome-logs
|
||||
gnome-extra/office-runner
|
||||
sys-apps/dbus-broker
|
||||
sys-apps/gentoo-systemd-integration
|
||||
sys-apps/systemd
|
||||
sys-apps/systemd-readahead
|
||||
sys-block/wait-for-dri-devices-rules
|
||||
sys-process/systemd-cron
|
||||
>=www-misc/profile-sync-daemon-6
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
..
|
||||
gentoo:targets/systemd
|
||||
gentoo:features/merged-usr
|
||||
|
|
@ -0,0 +1 @@
|
|||
-systemd
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
amd64 default/linux/amd64/23.0/musl/hardened/systemd exp
|
||||
amd64 default/linux/amd64/23.0/musl/hardened/selinux/systemd exp
|
||||
Loading…
Reference in New Issue