Update package version to 261.1
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: udev
|
name: udev
|
||||||
description: Userspace device file manager
|
description: Userspace device file manager
|
||||||
version: "260.2"
|
version: "261.1"
|
||||||
revision: 2
|
revision: 1
|
||||||
url: https://github.com/systemd/systemd
|
url: https://github.com/systemd/systemd
|
||||||
license: GPL-2.0-or-later,LGPL-2.1-or-later
|
license: GPL-2.0-or-later,LGPL-2.1-or-later
|
||||||
maintainers:
|
maintainers:
|
||||||
@@ -26,7 +26,7 @@ downloads:
|
|||||||
- url: https://github.com/systemd/systemd/archive/v${BPM_PKG_VERSION}/systemd-${BPM_PKG_VERSION}.tar.gz
|
- url: https://github.com/systemd/systemd/archive/v${BPM_PKG_VERSION}/systemd-${BPM_PKG_VERSION}.tar.gz
|
||||||
extract_to: ${BPM_SOURCE}
|
extract_to: ${BPM_SOURCE}
|
||||||
extract_strip_components: 1
|
extract_strip_components: 1
|
||||||
checksum: 71a9ed11cf773478b0d7a16cd96e39ca3c3939ab37ed9a8ee814c31ea9b4f2b5
|
checksum: f9b9da1103d1714703503d1746971ccbeeae945663ef3ede3b7348169b5df064
|
||||||
split_packages:
|
split_packages:
|
||||||
- name: udev
|
- name: udev
|
||||||
depends:
|
depends:
|
||||||
|
|||||||
@@ -1,24 +1,24 @@
|
|||||||
From 572fc6efb5ea952569f11efd185250584afbe038 Mon Sep 17 00:00:00 2001
|
From 8fe1b550905c906afa6e8ffd0e1bb93e661763c4 Mon Sep 17 00:00:00 2001
|
||||||
From: artoo <[email protected]>
|
From: artoo <[email protected]>
|
||||||
Date: Wed, 27 May 2026 15:17:52 +0200
|
Date: Sat, 20 Jun 2026 12:47:27 +0200
|
||||||
Subject: [PATCH 1/1] udev standalone install
|
Subject: [PATCH] udev standalone install
|
||||||
|
|
||||||
---
|
---
|
||||||
meson.build | 13 +++++++---
|
meson.build | 13 ++++++----
|
||||||
meson_options.txt | 3 +++
|
meson_options.txt | 3 +++
|
||||||
rules.d/meson.build | 4 +--
|
rules.d/meson.build | 4 ++--
|
||||||
shell-completion/bash/meson.build | 41 ++-----------------------------
|
shell-completion/bash/meson.build | 40 -------------------------------
|
||||||
shell-completion/zsh/meson.build | 34 ++-----------------------
|
shell-completion/zsh/meson.build | 33 -------------------------
|
||||||
src/core/meson.build | 5 ----
|
src/core/meson.build | 5 ----
|
||||||
src/hwdb/meson.build | 2 +-
|
src/hwdb/meson.build | 2 +-
|
||||||
src/libudev/meson.build | 9 ++++++-
|
src/libudev/meson.build | 9 ++++++-
|
||||||
src/udev/meson.build | 8 +++---
|
src/udev/meson.build | 8 +++----
|
||||||
src/udev/udevd.c | 2 +-
|
src/udev/udevd.c | 2 +-
|
||||||
test/meson.build | 2 +-
|
test/meson.build | 2 +-
|
||||||
11 files changed, 33 insertions(+), 90 deletions(-)
|
11 files changed, 29 insertions(+), 92 deletions(-)
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index e98a62d9bc..ba519b7494 100644
|
index ff11c0c10c..172bd1dc96 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/meson.build
|
+++ b/meson.build
|
||||||
@@ -96,6 +96,7 @@ conf.set10('HAVE_SPLIT_BIN', split_bin,
|
@@ -96,6 +96,7 @@ conf.set10('HAVE_SPLIT_BIN', split_bin,
|
||||||
@@ -38,7 +38,7 @@ index e98a62d9bc..ba519b7494 100644
|
|||||||
libexecdir_to_bin = '../../bin/'
|
libexecdir_to_bin = '../../bin/'
|
||||||
pkglibdir = libdir / 'systemd'
|
pkglibdir = libdir / 'systemd'
|
||||||
|
|
||||||
@@ -2806,7 +2807,6 @@ subdir('shell-completion/zsh')
|
@@ -2465,7 +2466,6 @@ subdir('shell-completion/zsh')
|
||||||
subdir('sysctl.d')
|
subdir('sysctl.d')
|
||||||
subdir('sysusers.d')
|
subdir('sysusers.d')
|
||||||
subdir('tmpfiles.d')
|
subdir('tmpfiles.d')
|
||||||
@@ -46,7 +46,7 @@ index e98a62d9bc..ba519b7494 100644
|
|||||||
|
|
||||||
install_subdir('factory/etc',
|
install_subdir('factory/etc',
|
||||||
install_dir : factorydir)
|
install_dir : factorydir)
|
||||||
@@ -2828,6 +2828,11 @@ install_data('LICENSE.GPL2',
|
@@ -2487,6 +2487,11 @@ install_data('LICENSE.GPL2',
|
||||||
install_subdir('LICENSES',
|
install_subdir('LICENSES',
|
||||||
install_dir : docdir)
|
install_dir : docdir)
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ index e98a62d9bc..ba519b7494 100644
|
|||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
# Ensure that changes to the docs/ directory do not break the
|
# Ensure that changes to the docs/ directory do not break the
|
||||||
@@ -3013,10 +3018,10 @@ udev_targets = []
|
@@ -2700,10 +2705,10 @@ udev_targets = []
|
||||||
foreach bin : udev_binaries
|
foreach bin : udev_binaries
|
||||||
udev_targets += executables_by_name.get(bin, [])
|
udev_targets += executables_by_name.get(bin, [])
|
||||||
endforeach
|
endforeach
|
||||||
@@ -72,10 +72,10 @@ index e98a62d9bc..ba519b7494 100644
|
|||||||
|
|
||||||
alt_time_epoch = run_command('date', '-Is', '-u', '-d', f'@@time_epoch@', check : false)
|
alt_time_epoch = run_command('date', '-Is', '-u', '-d', f'@@time_epoch@', check : false)
|
||||||
diff --git a/meson_options.txt b/meson_options.txt
|
diff --git a/meson_options.txt b/meson_options.txt
|
||||||
index c1af7ce237..ab1f3d7ae5 100644
|
index b5856dd8f8..868048ad7c 100644
|
||||||
--- a/meson_options.txt
|
--- a/meson_options.txt
|
||||||
+++ b/meson_options.txt
|
+++ b/meson_options.txt
|
||||||
@@ -568,3 +568,6 @@ option('default-mountfsd-trusted-directories', type : 'boolean', value: false,
|
@@ -576,3 +576,6 @@ option('default-mountfsd-trusted-directories', type : 'boolean', value: false,
|
||||||
|
|
||||||
option('default-oci-registry', type : 'string', value : 'docker.io',
|
option('default-oci-registry', type : 'string', value : 'docker.io',
|
||||||
description : 'Default OCI registry name')
|
description : 'Default OCI registry name')
|
||||||
@@ -105,10 +105,10 @@ index aa469ef7a7..8c56d96b04 100644
|
|||||||
['70-uaccess.rules', conf.get('ENABLE_LOGIND') == 1 and conf.get('HAVE_ACL') == 1],
|
['70-uaccess.rules', conf.get('ENABLE_LOGIND') == 1 and conf.get('HAVE_ACL') == 1],
|
||||||
['71-seat.rules', conf.get('ENABLE_LOGIND') == 1],
|
['71-seat.rules', conf.get('ENABLE_LOGIND') == 1],
|
||||||
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
|
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
|
||||||
index 154910979e..9dc7a8bffe 100644
|
index cddf742059..0181111975 100644
|
||||||
--- a/shell-completion/bash/meson.build
|
--- a/shell-completion/bash/meson.build
|
||||||
+++ b/shell-completion/bash/meson.build
|
+++ b/shell-completion/bash/meson.build
|
||||||
@@ -20,49 +20,12 @@ custom_target(
|
@@ -20,47 +20,7 @@ custom_target(
|
||||||
install_dir : bashcompletiondir)
|
install_dir : bashcompletiondir)
|
||||||
|
|
||||||
foreach item : [
|
foreach item : [
|
||||||
@@ -128,6 +128,7 @@ index 154910979e..9dc7a8bffe 100644
|
|||||||
- ['portablectl', 'ENABLE_PORTABLED'],
|
- ['portablectl', 'ENABLE_PORTABLED'],
|
||||||
- ['resolvectl', 'ENABLE_RESOLVE'],
|
- ['resolvectl', 'ENABLE_RESOLVE'],
|
||||||
- ['run0', ''],
|
- ['run0', ''],
|
||||||
|
- ['storagectl', ''],
|
||||||
- ['systemd-analyze', ''],
|
- ['systemd-analyze', ''],
|
||||||
- ['systemd-cat', ''],
|
- ['systemd-cat', ''],
|
||||||
- ['systemd-cgls', ''],
|
- ['systemd-cgls', ''],
|
||||||
@@ -145,6 +146,7 @@ index 154910979e..9dc7a8bffe 100644
|
|||||||
- ['systemd-resolve', 'ENABLE_RESOLVE'],
|
- ['systemd-resolve', 'ENABLE_RESOLVE'],
|
||||||
- ['systemd-run', ''],
|
- ['systemd-run', ''],
|
||||||
- ['systemd-sysext', 'ENABLE_SYSEXT'],
|
- ['systemd-sysext', 'ENABLE_SYSEXT'],
|
||||||
|
- ['systemd-sysinstall', 'ENABLE_SYSINSTALL'],
|
||||||
- ['systemd-vmspawn', 'ENABLE_VMSPAWN'],
|
- ['systemd-vmspawn', 'ENABLE_VMSPAWN'],
|
||||||
- ['systemd-vpick', ''],
|
- ['systemd-vpick', ''],
|
||||||
- ['timedatectl', 'ENABLE_TIMEDATED'],
|
- ['timedatectl', 'ENABLE_TIMEDATED'],
|
||||||
@@ -154,17 +156,11 @@ index 154910979e..9dc7a8bffe 100644
|
|||||||
]
|
]
|
||||||
|
|
||||||
if item[1] == '' or conf.get(item[1]) == 1
|
if item[1] == '' or conf.get(item[1]) == 1
|
||||||
install_data(item[0],
|
|
||||||
- install_dir : bashcompletiondir)
|
|
||||||
+ install_dir : bashcompletiondir,
|
|
||||||
+ install_tag : 'udev')
|
|
||||||
endif
|
|
||||||
endforeach
|
|
||||||
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
|
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
|
||||||
index b1bff151e4..ce6e147bf0 100644
|
index f10ba7be61..5758d95479 100644
|
||||||
--- a/shell-completion/zsh/meson.build
|
--- a/shell-completion/zsh/meson.build
|
||||||
+++ b/shell-completion/zsh/meson.build
|
+++ b/shell-completion/zsh/meson.build
|
||||||
@@ -15,42 +15,12 @@ custom_target(
|
@@ -15,40 +15,7 @@ custom_target(
|
||||||
install_dir : zshcompletiondir)
|
install_dir : zshcompletiondir)
|
||||||
|
|
||||||
foreach item : [
|
foreach item : [
|
||||||
@@ -186,6 +182,7 @@ index b1bff151e4..ce6e147bf0 100644
|
|||||||
- ['_sd_machines', 'ENABLE_MACHINED'],
|
- ['_sd_machines', 'ENABLE_MACHINED'],
|
||||||
- ['_sd_outputmodes', ''],
|
- ['_sd_outputmodes', ''],
|
||||||
- ['_sd_unit_files', ''],
|
- ['_sd_unit_files', ''],
|
||||||
|
- ['_storagectl', ''],
|
||||||
- ['_systemd', ''],
|
- ['_systemd', ''],
|
||||||
- ['_systemd-analyze', ''],
|
- ['_systemd-analyze', ''],
|
||||||
- ['_systemd-delta', ''],
|
- ['_systemd-delta', ''],
|
||||||
@@ -195,6 +192,7 @@ index b1bff151e4..ce6e147bf0 100644
|
|||||||
- ['_systemd-nspawn', ''],
|
- ['_systemd-nspawn', ''],
|
||||||
- ['_systemd-path', ''],
|
- ['_systemd-path', ''],
|
||||||
- ['_systemd-run', ''],
|
- ['_systemd-run', ''],
|
||||||
|
- ['_systemd-sysinstall', 'ENABLE_SYSINSTALL'],
|
||||||
- ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],
|
- ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],
|
||||||
- ['_timedatectl', 'ENABLE_TIMEDATED'],
|
- ['_timedatectl', 'ENABLE_TIMEDATED'],
|
||||||
['_udevadm', ''],
|
['_udevadm', ''],
|
||||||
@@ -203,17 +201,11 @@ index b1bff151e4..ce6e147bf0 100644
|
|||||||
]
|
]
|
||||||
|
|
||||||
if item[1] == '' or conf.get(item[1]) == 1
|
if item[1] == '' or conf.get(item[1]) == 1
|
||||||
install_data(item[0],
|
|
||||||
- install_dir : zshcompletiondir)
|
|
||||||
+ install_dir : zshcompletiondir,
|
|
||||||
+ install_tag : 'udev')
|
|
||||||
endif
|
|
||||||
endforeach
|
|
||||||
diff --git a/src/core/meson.build b/src/core/meson.build
|
diff --git a/src/core/meson.build b/src/core/meson.build
|
||||||
index 391dc45a6b..04faeefafe 100644
|
index af50a2a4fa..c24a37b725 100644
|
||||||
--- a/src/core/meson.build
|
--- a/src/core/meson.build
|
||||||
+++ b/src/core/meson.build
|
+++ b/src/core/meson.build
|
||||||
@@ -298,11 +298,6 @@ if install_sysconfdir
|
@@ -304,11 +304,6 @@ if install_sysconfdir
|
||||||
install_dir : sysconfdir / 'xdg/systemd')
|
install_dir : sysconfdir / 'xdg/systemd')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -239,7 +231,7 @@ index 57ace3ad44..96c0b185d0 100644
|
|||||||
'conditions' : ['ENABLE_HWDB'],
|
'conditions' : ['ENABLE_HWDB'],
|
||||||
'sources' : files('hwdb.c'),
|
'sources' : files('hwdb.c'),
|
||||||
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
|
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
|
||||||
index eb9dda79ae..174dcd2a12 100644
|
index 854628aed4..ffed0018e6 100644
|
||||||
--- a/src/libudev/meson.build
|
--- a/src/libudev/meson.build
|
||||||
+++ b/src/libudev/meson.build
|
+++ b/src/libudev/meson.build
|
||||||
@@ -25,6 +25,13 @@ libudev_sym_path = libudev_dir_path / 'libudev.sym'
|
@@ -25,6 +25,13 @@ libudev_sym_path = libudev_dir_path / 'libudev.sym'
|
||||||
@@ -264,10 +256,10 @@ index eb9dda79ae..174dcd2a12 100644
|
|||||||
+ install_tag : 'libudev-devel',
|
+ install_tag : 'libudev-devel',
|
||||||
install_dir : pkgconfiglibdir)
|
install_dir : pkgconfiglibdir)
|
||||||
diff --git a/src/udev/meson.build b/src/udev/meson.build
|
diff --git a/src/udev/meson.build b/src/udev/meson.build
|
||||||
index 700a8cc8d5..d2981583ff 100644
|
index 375645e759..ea353f5600 100644
|
||||||
--- a/src/udev/meson.build
|
--- a/src/udev/meson.build
|
||||||
+++ b/src/udev/meson.build
|
+++ b/src/udev/meson.build
|
||||||
@@ -258,9 +258,9 @@ executables += [
|
@@ -256,9 +256,9 @@ executables += [
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -280,7 +272,7 @@ index 700a8cc8d5..d2981583ff 100644
|
|||||||
install_tag : 'udev')
|
install_tag : 'udev')
|
||||||
|
|
||||||
if install_sysconfdir_samples
|
if install_sysconfdir_samples
|
||||||
@@ -277,7 +277,7 @@ udev_pc = custom_target(
|
@@ -275,7 +275,7 @@ udev_pc = custom_target(
|
||||||
output : 'udev.pc',
|
output : 'udev.pc',
|
||||||
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
|
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
|
||||||
install : pkgconfigdatadir != 'no',
|
install : pkgconfigdatadir != 'no',
|
||||||
@@ -290,7 +282,7 @@ index 700a8cc8d5..d2981583ff 100644
|
|||||||
|
|
||||||
if install_sysconfdir
|
if install_sysconfdir
|
||||||
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
|
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
|
||||||
index 840febbd42..b772115d3c 100644
|
index 4cbc481c76..ca2e207ead 100644
|
||||||
--- a/src/udev/udevd.c
|
--- a/src/udev/udevd.c
|
||||||
+++ b/src/udev/udevd.c
|
+++ b/src/udev/udevd.c
|
||||||
@@ -67,7 +67,7 @@ int run_udevd(int argc, char *argv[]) {
|
@@ -67,7 +67,7 @@ int run_udevd(int argc, char *argv[]) {
|
||||||
@@ -303,7 +295,7 @@ index 840febbd42..b772115d3c 100644
|
|||||||
/* connect /dev/null to stdin, stdout, stderr */
|
/* connect /dev/null to stdin, stdout, stderr */
|
||||||
if (log_get_max_level() < LOG_DEBUG) {
|
if (log_get_max_level() < LOG_DEBUG) {
|
||||||
diff --git a/test/meson.build b/test/meson.build
|
diff --git a/test/meson.build b/test/meson.build
|
||||||
index 7bf557cc19..3e16a3bffa 100644
|
index fd3dba3a60..8284b24615 100644
|
||||||
--- a/test/meson.build
|
--- a/test/meson.build
|
||||||
+++ b/test/meson.build
|
+++ b/test/meson.build
|
||||||
@@ -40,7 +40,7 @@ endif
|
@@ -40,7 +40,7 @@ endif
|
||||||
|
|||||||
Reference in New Issue
Block a user