add media-sound/sacd-extract package; bump net-misc/netplan version 0.106; bump sys-kernel/hardened-kernel version 6.1.13
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
AUX 0001-buildsystem-meson-fixes.patch 4669 BLAKE2B bda3c0fbc3fde706dba7d39dd9e3fa00a86ea98fc03a65d03870a364ac4d9b326089939559a5db37b16c427b9cb07d715ee6577d33330a2583ac6e23de2ff90f SHA512 87d6c01b2e733946416fed8e464d196ed9865a4b2919b54e854bbd55628a6a5343beb23f8bde31b64e2bb4b1ac9db108890cbf292821ad64ec839dbf4221d903
|
||||
AUX netplan-deps.patch 925 BLAKE2B 618abad9835920c22d77c8c909f762521a28566d421b378df473b2f2255a77a23647b95e89f7c82e954d4c337ad84ae97672f2dd313c8b4ef7a7e5f416af76c3 SHA512 fca0a7b062a2a4f89d3c103253dd9b1f4c71b1a7c8caa6b3c49ac2f2b2fe76d648ac512793467f6bd79aa6d1eb31c3d61c2d9ef77b617545e19650267c9dce6f
|
||||
DIST netplan-0.105.tar.gz 329150 BLAKE2B 6c4e5034239aeff0ff733e7a05ec5676e4250d89f4cb57630f51b135c1fe9647d5b3b5d873c82fc926ef6256af86fe3ba5fec3d13643d809bdeb9b2c36d1f59a SHA512 9dde73a3cf2cb25b8ca26fa73104f0109d96162d1e094137e4e6d005998aa3d9c61df2f810b416a979aed4c7f110ef79ccc0de976d4588b144d2752a9ef0ebcb
|
||||
EBUILD netplan-0.105-r1.ebuild 971 BLAKE2B 7497a310024f568efb3440f8204e62c7b58e1db01a1fa0955ebd85fff7371d3fc8d548ea5044d5c9d2f69d7a62c99058add2f5df3a3bea4b4e2e04a0bbc9163d SHA512 1d7e0a4da24adf8e5ce584ccca4c066e3d5cc8dbb4fa028c470eaca6ecb770fd3215ed0735e5a50154106c983399c6658b0e9c9b9b1289c710757b8b3358edd5
|
||||
DIST netplan-0.106.tar.gz 364280 BLAKE2B 7752470df1751faf36349a401bcdc30aa0a5cf27d08bc48a0953dcd950cd3f8386b5c3487bd9a3aeeeb74eca40f7fdb4fc7cb675bb89c9ae67d965d339f21921 SHA512 9f3c28770d5071d3df3664a885b37a0712c8f28240bc354d0b4f1d21afdb280791ceddfc323089287d57143d46a13748e7c09d7ecc098601a988b7a98f11c84f
|
||||
EBUILD netplan-0.106.ebuild 916 BLAKE2B f5494a5792bbcd8b3030c70d634c1c5a12acb940c575b64917cd6f3d7deedfbd5031d5d3d07980e60ed525b2980cf70ddc96c64d58437969314c0c998d3f2edd SHA512 7626c84ebf1de032e60448e9698c20e9cdcb64f6ce41d9404530873f77302d169f4ede99c172207514c2b2d5aa1054982b8071a8aaf6ddde2e5476ba31c7acf5
|
||||
|
||||
@@ -1,139 +0,0 @@
|
||||
From 89948ed72b80c2671981ce6bb995dccbb5e389b6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= <slyon@ubuntu.com>
|
||||
Date: Wed, 24 Aug 2022 12:34:51 +0200
|
||||
Subject: [PATCH] buildsystem: meson fixes
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- install all files
|
||||
- POSIX shell compatibility in generators
|
||||
- use custom_targets for generators
|
||||
- fix dbus install directory
|
||||
|
||||
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
||||
---
|
||||
dbus/meson.build | 12 +++++++++++-
|
||||
features_h_generator.sh | 6 ++++--
|
||||
features_py_generator.sh | 6 ++++--
|
||||
meson.build | 5 -----
|
||||
netplan/meson.build | 15 +++++++++++++--
|
||||
5 files changed, 32 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/dbus/meson.build b/dbus/meson.build
|
||||
index 68a6ce39208d..fc34e2c2cbf7 100644
|
||||
--- a/dbus/meson.build
|
||||
+++ b/dbus/meson.build
|
||||
@@ -1,6 +1,16 @@
|
||||
+features_h = custom_target(
|
||||
+ build_always_stale: true,
|
||||
+ output: '_features.h',
|
||||
+ input: join_paths(meson.project_source_root(), 'features_h_generator.sh'),
|
||||
+ command: ['sh', '-c', '@INPUT@'],
|
||||
+ install: false,
|
||||
+ capture: true,
|
||||
+)
|
||||
+
|
||||
executable(
|
||||
'netplan-dbus',
|
||||
'../src/dbus.c',
|
||||
+ features_h,
|
||||
include_directories: inc,
|
||||
link_with: libnetplan,
|
||||
dependencies: [libsystemd, glib, gio, yaml, uuid],
|
||||
@@ -9,7 +19,7 @@ executable(
|
||||
|
||||
install_data(
|
||||
'io.netplan.Netplan.conf',
|
||||
- install_dir: join_paths(get_option('datadir'), 'dbus-1', 'systemd.d'))
|
||||
+ install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d'))
|
||||
|
||||
conf_data = configuration_data()
|
||||
conf_data.set('ROOTLIBEXECDIR', join_paths(get_option('prefix'), get_option('libexecdir')))
|
||||
diff --git a/features_h_generator.sh b/features_h_generator.sh
|
||||
index ed9c3cc78cab..d38771515a2d 100755
|
||||
--- a/features_h_generator.sh
|
||||
+++ b/features_h_generator.sh
|
||||
@@ -1,6 +1,8 @@
|
||||
#!/bin/sh
|
||||
-OUTPUT=src/_features.h
|
||||
-INPUT=src/[^_]*.[hc]
|
||||
+BASE=$(dirname $0)
|
||||
+OUTPUT=$BASE/src/_features.h
|
||||
+INPUT=$BASE/src/[!_]*.[hc]
|
||||
printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $OUTPUT
|
||||
awk 'match ($0, /netplan-feature:.*/ ) { $0=substr($0, RSTART, RLENGTH); print "\""$2"\"," }' $INPUT >> $OUTPUT
|
||||
echo "NULL, };" >> $OUTPUT
|
||||
+cat $OUTPUT
|
||||
diff --git a/features_py_generator.sh b/features_py_generator.sh
|
||||
index ecb42af47e75..bbbe3a4e3e30 100755
|
||||
--- a/features_py_generator.sh
|
||||
+++ b/features_py_generator.sh
|
||||
@@ -1,7 +1,9 @@
|
||||
#!/bin/sh
|
||||
-OUTPUT=netplan/_features.py
|
||||
-INPUT=src/[^_]*.[hc]
|
||||
+BASE=$(dirname $0)
|
||||
+OUTPUT=$BASE/netplan/_features.py
|
||||
+INPUT=$BASE/src/[!_]*.[hc]
|
||||
echo "# Generated file" > $OUTPUT
|
||||
echo "NETPLAN_FEATURE_FLAGS = [" >> $OUTPUT
|
||||
awk 'match ($0, /netplan-feature:.*/ ) { $0=substr($0, RSTART, RLENGTH); print " \""$2"\"," }' $INPUT >> $OUTPUT
|
||||
echo "]" >> $OUTPUT
|
||||
+cat $OUTPUT
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3ab07765b38e..7f48cb4f244a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -32,11 +32,6 @@ add_project_arguments(
|
||||
'-D_XOPEN_SOURCE=700',
|
||||
language: 'c')
|
||||
|
||||
-message('Generating the _features.[py|h] code')
|
||||
-#XXX: this is ugly as it produces artifacts in the source directory
|
||||
-run_command('features_h_generator.sh', check: true)
|
||||
-run_command('features_py_generator.sh', check: true)
|
||||
-
|
||||
inc = include_directories('include')
|
||||
subdir('include')
|
||||
subdir('src')
|
||||
diff --git a/netplan/meson.build b/netplan/meson.build
|
||||
index 1313cb40ebad..07a13e2cc484 100644
|
||||
--- a/netplan/meson.build
|
||||
+++ b/netplan/meson.build
|
||||
@@ -4,10 +4,21 @@ install_symlink(
|
||||
pointing_to: '../share/netplan/netplan.script',
|
||||
install_dir: get_option('sbindir'))
|
||||
|
||||
+netplan_module = join_paths(get_option('datadir'), meson.project_name(), 'netplan')
|
||||
+features_py = custom_target(
|
||||
+ build_always_stale: true,
|
||||
+ output: '_features.py',
|
||||
+ input: join_paths(meson.project_source_root(), 'features_py_generator.sh'),
|
||||
+ command: ['sh', '-c', '@INPUT@'],
|
||||
+ install: true,
|
||||
+ install_dir: netplan_module,
|
||||
+ capture: true,
|
||||
+)
|
||||
+
|
||||
netplan_sources = files(
|
||||
'__init__.py',
|
||||
- '_features.py',
|
||||
'configmanager.py',
|
||||
+ 'libnetplan.py',
|
||||
'terminal.py')
|
||||
|
||||
cli_sources = files(
|
||||
@@ -26,9 +37,9 @@ commands_sources = files(
|
||||
'cli/commands/ip.py',
|
||||
'cli/commands/migrate.py',
|
||||
'cli/commands/set.py',
|
||||
+ 'cli/commands/sriov_rebind.py',
|
||||
'cli/commands/try_command.py')
|
||||
|
||||
-netplan_module = join_paths(get_option('datadir'), meson.project_name(), 'netplan')
|
||||
install_data(netplan_sources, install_dir: netplan_module)
|
||||
install_data(cli_sources, install_dir: join_paths(netplan_module, 'cli'))
|
||||
install_data(commands_sources, install_dir: join_paths(netplan_module, 'cli', 'commands'))
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -26,7 +26,7 @@ DEPEND=">=dev-libs/glib-2.64.3
|
||||
"
|
||||
|
||||
BDEPEND="${DEPEND}
|
||||
dev-python/nose
|
||||
dev-python/pytest
|
||||
dev-python/pycodestyle
|
||||
dev-python/pyflakes
|
||||
"
|
||||
@@ -37,6 +37,5 @@ RDEPEND=">=dev-python/netifaces-0.10.9
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-buildsystem-meson-fixes.patch"
|
||||
"${FILESDIR}/netplan-deps.patch"
|
||||
)
|
||||
Reference in New Issue
Block a user