tide-linux/udev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update package version to 259

Browse Source
This commit is contained in:
EnumDev
2025-12-19 19:13:56 +02:00
parent 89979ba119
commit 7127686acd
3 changed files with 121 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-files/artix-standalone-install.patch
+117 -117
View File
@@ -1,17 +1,17 @@
From 1b6f23440c6f3e5888cce8874a388bad5a002a7c Mon Sep 17 00:00:00 2001
From 03581ccf21fca4776794cbad9c7359abb0752e7b Mon Sep 17 00:00:00 2001
From: artoo <[email protected]>
Date: Mon, 10 Nov 2025 15:19:15 +0100
Date: Thu, 18 Dec 2025 16:30:15 +0100
Subject: [PATCH 1/1] artix standalone install
---
factory/templates/meson.build | 2 ++
meson.build | 22 +++++++++++++----
meson.build | 22 ++++++++++++++----
rules.d/meson.build | 3 +--
shell-completion/bash/meson.build | 39 ++-----------------------------
shell-completion/zsh/meson.build | 31 ++----------------------
src/core/meson.build | 5 ----
shell-completion/bash/meson.build | 38 +------------------------------
shell-completion/zsh/meson.build | 29 +----------------------
src/core/meson.build | 4 ----
src/hwdb/meson.build | 2 +-
src/libudev/meson.build | 9 ++++++-
src/libudev/meson.build | 9 +++++++-
src/sysusers/meson.build | 3 ++-
src/tmpfiles/meson.build | 3 ++-
src/udev/meson.build | 8 +++----
@@ -19,11 +19,11 @@ Subject: [PATCH 1/1] artix standalone install
sysusers.d/meson.build | 4 ++--
test/meson.build | 6 ++---
tmpfiles.d/legacy.conf.in | 3 ---
tmpfiles.d/meson.build | 9 +++----
16 files changed, 51 insertions(+), 100 deletions(-)
tmpfiles.d/meson.build | 9 +++-----
16 files changed, 49 insertions(+), 98 deletions(-)
diff --git a/factory/templates/meson.build b/factory/templates/meson.build
index 3db9f255b9..e54c0c3f3b 100644
index 0f53217a48..071cfc9547 100644
--- a/factory/templates/meson.build
+++ b/factory/templates/meson.build
@@ -7,6 +7,7 @@ custom_target(
@@ -34,17 +34,19 @@ index 3db9f255b9..e54c0c3f3b 100644
install_dir : factory_etc_dir)
custom_target(
@@ -14,4 +15,5 @@ custom_target(
@@ -14,6 +15,7 @@ custom_target(
output : 'vconsole.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
install : true,
+ install_tag : 'etmpfiles',
install_dir : factory_etc_dir)
if conf.get('ENABLE_NSS') == 1
diff --git a/meson.build b/meson.build
index 238b935372..2014e1e8ee 100644
index 4746146a98..fd2b335ce5 100644
--- a/meson.build
+++ b/meson.build
@@ -132,7 +132,7 @@ includedir = prefixdir / get_option('includedir')
@@ -127,7 +127,7 @@ includedir = prefixdir / get_option('includedir')
datadir = prefixdir / get_option('datadir')
localstatedir = '/' / get_option('localstatedir')
@@ -53,7 +55,7 @@ index 238b935372..2014e1e8ee 100644
libexecdir_to_bin = '../../bin/'
pkglibdir = libdir / 'systemd'
@@ -2769,7 +2769,6 @@ subdir('shell-completion/zsh')
@@ -2837,7 +2837,6 @@ subdir('shell-completion/zsh')
subdir('sysctl.d')
subdir('sysusers.d')
subdir('tmpfiles.d')
@@ -61,7 +63,7 @@ index 238b935372..2014e1e8ee 100644
install_subdir('factory/etc',
install_dir : factorydir)
@@ -2791,6 +2790,21 @@ install_data('LICENSE.GPL2',
@@ -2859,6 +2858,21 @@ install_data('LICENSE.GPL2',
install_subdir('LICENSES',
install_dir : docdir)
@@ -83,7 +85,7 @@ index 238b935372..2014e1e8ee 100644
install_emptydir(systemdstatedir)
#####################################################################
@@ -2946,10 +2960,10 @@ udev_targets = []
@@ -3025,10 +3039,10 @@ udev_targets = []
foreach bin : udev_binaries
udev_targets += executables_by_name.get(bin, [])
endforeach
@@ -95,9 +97,9 @@ index 238b935372..2014e1e8ee 100644
+ alias_target('hwdb', auto_suspend_rules, executables_by_name.get('udev-hwdb'))
endif
alt_time_epoch = run_command('date', '-Is', '-u', '-d', '@@0@'.format(time_epoch),
alt_time_epoch = run_command('date', '-Is', '-u', '-d', f'@@time_epoch@', check : false)
diff --git a/rules.d/meson.build b/rules.d/meson.build
index 933a84859a..8e190a834a 100644
index 6029ec8768..fbc3f82aef 100644
--- a/rules.d/meson.build
+++ b/rules.d/meson.build
@@ -2,7 +2,7 @@
@@ -109,7 +111,7 @@ index 933a84859a..8e190a834a 100644
rules = [
[files('60-autosuspend.rules',
@@ -63,7 +63,6 @@ rules_in = [
@@ -65,7 +65,6 @@ rules_in = [
['50-udev-default.rules'],
['60-persistent-storage.rules'],
['64-btrfs.rules'],
@@ -118,110 +120,109 @@ index 933a84859a..8e190a834a 100644
['70-uaccess.rules', conf.get('ENABLE_LOGIND') == 1 and conf.get('HAVE_ACL') == 1],
['71-seat.rules', conf.get('ENABLE_LOGIND') == 1],
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index 6a547a5e69..67ef541aae 100644
index 178986e171..9492becac9 100644
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -17,47 +17,12 @@ custom_target(
install : bashcompletiondir != 'no',
@@ -20,48 +20,12 @@ custom_target(
install_dir : bashcompletiondir)
-items = [['busctl', ''],
- ['journalctl', ''],
- ['systemd-analyze', ''],
- ['systemd-cat', ''],
- ['systemd-cgls', ''],
- ['systemd-cgtop', ''],
- ['systemd-creds', ''],
- ['systemd-delta', ''],
- ['systemd-detect-virt', ''],
- ['systemd-id128', ''],
- ['systemd-nspawn', 'ENABLE_NSPAWN'],
- ['systemd-path', ''],
- ['systemd-run', ''],
- ['systemd-vpick', ''],
- ['udevadm', ''],
- ['bootctl', ''],
- ['run0', ''],
- ['coredumpctl', 'ENABLE_COREDUMP'],
- ['homectl', 'ENABLE_HOMED'],
- ['hostnamectl', 'ENABLE_HOSTNAMED'],
- ['importctl', 'ENABLE_IMPORTD'],
- ['kernel-install', 'ENABLE_KERNEL_INSTALL'],
- ['localectl', 'ENABLE_LOCALED'],
- ['loginctl', 'ENABLE_LOGIND'],
- ['machinectl', 'ENABLE_MACHINED'],
- ['networkctl', 'ENABLE_NETWORKD'],
- ['oomctl', 'ENABLE_OOMD'],
- ['portablectl', 'ENABLE_PORTABLED'],
- ['resolvectl', 'ENABLE_RESOLVE'],
- ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'],
- ['systemd-confext', 'ENABLE_SYSEXT'],
- ['systemd-dissect', 'HAVE_BLKID'],
- ['systemd-resolve', 'ENABLE_RESOLVE'],
- ['systemd-sysext', 'ENABLE_SYSEXT'],
- ['systemd-vmspawn', 'ENABLE_VMSPAWN'],
- ['timedatectl', 'ENABLE_TIMEDATED'],
- ['userdbctl', 'ENABLE_USERDB']]
+items = [['udevadm', '']]
foreach item : [
- ['bootctl', ''],
- ['busctl', ''],
- ['coredumpctl', 'ENABLE_COREDUMP'],
- ['homectl', 'ENABLE_HOMED'],
- ['hostnamectl', 'ENABLE_HOSTNAMED'],
- ['importctl', 'ENABLE_IMPORTD'],
- ['journalctl', ''],
- ['kernel-install', 'ENABLE_KERNEL_INSTALL'],
- ['localectl', 'ENABLE_LOCALED'],
- ['loginctl', 'ENABLE_LOGIND'],
- ['machinectl', 'ENABLE_MACHINED'],
- ['networkctl', 'ENABLE_NETWORKD'],
- ['oomctl', 'ENABLE_OOMD'],
- ['portablectl', 'ENABLE_PORTABLED'],
- ['resolvectl', 'ENABLE_RESOLVE'],
- ['run0', ''],
- ['systemd-analyze', ''],
- ['systemd-cat', ''],
- ['systemd-cgls', ''],
- ['systemd-cgtop', ''],
- ['systemd-confext', 'ENABLE_SYSEXT'],
- ['systemd-creds', ''],
- ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'],
- ['systemd-delta', ''],
- ['systemd-detect-virt', ''],
- ['systemd-dissect', 'HAVE_BLKID'],
- ['systemd-id128', ''],
- ['systemd-nspawn', 'ENABLE_NSPAWN'],
- ['systemd-path', ''],
- ['systemd-resolve', 'ENABLE_RESOLVE'],
- ['systemd-run', ''],
- ['systemd-sysext', 'ENABLE_SYSEXT'],
- ['systemd-vmspawn', 'ENABLE_VMSPAWN'],
- ['systemd-vpick', ''],
- ['timedatectl', 'ENABLE_TIMEDATED'],
['udevadm', ''],
- ['userdbctl', 'ENABLE_USERDB'],
- ['varlinkctl', ''],
]
foreach item : items
if bashcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
if item[1] == '' or conf.get(item[1]) == 1
install_data(item[0],
+ install_tag : 'udev',
install_dir : bashcompletiondir)
endif
endforeach
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index 4de28388ce..63ad624af5 100644
index 221c30627f..e4cf6c45dd 100644
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -12,39 +12,12 @@ custom_target(
install : zshcompletiondir != 'no',
@@ -15,39 +15,12 @@ custom_target(
install_dir : zshcompletiondir)
-items = [['_busctl', ''],
- ['_journalctl', ''],
- ['_systemd-analyze', ''],
- ['_systemd-delta', ''],
- ['_systemd-nspawn', ''],
- ['_systemd', ''],
- ['_systemd-path', ''],
- ['_systemd-run', ''],
- ['_run0', ''],
- ['_udevadm', ''],
- ['_varlinkctl', ''],
- ['_kernel-install', 'ENABLE_KERNEL_INSTALL'],
- ['_sd_bus_address', ''],
- ['_sd_hosts_or_user_at_host', ''],
- ['_sd_outputmodes', ''],
- ['_sd_unit_files', ''],
- ['_sd_machines', ''],
- ['_bootctl', ''],
- ['_coredumpctl', 'ENABLE_COREDUMP'],
- ['_hostnamectl', 'ENABLE_HOSTNAMED'],
- ['_localectl', 'ENABLE_LOCALED'],
- ['_loginctl', 'ENABLE_LOGIND'],
- ['_machinectl', 'ENABLE_MACHINED'],
- ['_networkctl', 'ENABLE_NETWORKD'],
- ['_oomctl', 'ENABLE_OOMD'],
- ['_systemd-inhibit', 'ENABLE_LOGIND'],
- ['_resolvectl', 'ENABLE_RESOLVE'],
- ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],
- ['_timedatectl', 'ENABLE_TIMEDATED']]
+items = [['_udevadm', '']]
foreach item : [
- ['_bootctl', ''],
- ['_busctl', ''],
- ['_coredumpctl', 'ENABLE_COREDUMP'],
- ['_hostnamectl', 'ENABLE_HOSTNAMED'],
- ['_journalctl', ''],
- ['_kernel-install', 'ENABLE_KERNEL_INSTALL'],
- ['_localectl', 'ENABLE_LOCALED'],
- ['_loginctl', 'ENABLE_LOGIND'],
- ['_machinectl', 'ENABLE_MACHINED'],
- ['_networkctl', 'ENABLE_NETWORKD'],
- ['_oomctl', 'ENABLE_OOMD'],
- ['_resolvectl', 'ENABLE_RESOLVE'],
- ['_run0', ''],
- ['_sd_bus_address', ''],
- ['_sd_hosts_or_user_at_host', ''],
- ['_sd_machines', ''],
- ['_sd_outputmodes', ''],
- ['_sd_unit_files', ''],
- ['_systemd', ''],
- ['_systemd-analyze', ''],
- ['_systemd-delta', ''],
- ['_systemd-inhibit', 'ENABLE_LOGIND'],
- ['_systemd-nspawn', ''],
- ['_systemd-path', ''],
- ['_systemd-run', ''],
- ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],
- ['_timedatectl', 'ENABLE_TIMEDATED'],
['_udevadm', ''],
- ['_varlinkctl', ''],
]
foreach item : items
if zshcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
if item[1] == '' or conf.get(item[1]) == 1
install_data(item[0],
+ install_tag : 'udev',
install_dir : zshcompletiondir)
endif
endforeach
diff --git a/src/core/meson.build b/src/core/meson.build
index 8bb0054c14..7ef92ca00b 100644
index 657574019c..51658e4506 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -288,11 +288,6 @@ if install_sysconfdir
@@ -291,10 +291,6 @@ if install_sysconfdir
install_dir : sysconfdir / 'xdg/systemd')
endif
@@ -229,10 +230,9 @@ index 8bb0054c14..7ef92ca00b 100644
-install_symlink('init',
- pointing_to : '../lib/systemd/systemd',
- install_dir : sbindir)
-
############################################################
core_test_template = test_template + {
diff --git a/src/hwdb/meson.build b/src/hwdb/meson.build
index 57ace3ad44..96c0b185d0 100644
--- a/src/hwdb/meson.build
@@ -272,11 +272,11 @@ index eb9dda79ae..e45d25c71b 100644
+ install_tag : 'libudev-devel',
install_dir : pkgconfiglibdir)
diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build
index e2e82889e7..2c184f8350 100644
index f286ce8a20..842b4080d0 100644
--- a/src/sysusers/meson.build
+++ b/src/sysusers/meson.build
@@ -12,10 +12,11 @@ executables += [
'dependencies' : libaudit,
'dependencies' : libaudit_cflags,
},
executable_template + {
- 'name' : 'systemd-sysusers.standalone',
@@ -289,11 +289,11 @@ index e2e82889e7..2c184f8350 100644
libc_wrapper_static,
libbasic_static,
diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
index a973d16f5c..195b0f7456 100644
index 9abe0a0c8e..d899d0cd64 100644
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -20,10 +20,11 @@ executables += [
'dependencies' : libacl,
'dependencies' : libacl_cflags,
},
executable_template + {
- 'name' : 'systemd-tmpfiles.standalone',
@@ -306,10 +306,10 @@ index a973d16f5c..195b0f7456 100644
libc_wrapper_static,
libbasic_static,
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 908bec8b1d..d6fa6529d8 100644
index 7df5b3de85..26d69ef8e9 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -257,9 +257,9 @@ executables += [
@@ -254,9 +254,9 @@ executables += [
},
]
@@ -322,7 +322,7 @@ index 908bec8b1d..d6fa6529d8 100644
install_tag : 'udev')
if install_sysconfdir_samples
@@ -276,7 +276,7 @@ udev_pc = custom_target(
@@ -273,7 +273,7 @@ udev_pc = custom_target(
output : 'udev.pc',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
install : pkgconfigdatadir != 'no',
@@ -332,10 +332,10 @@ index 908bec8b1d..d6fa6529d8 100644
if install_sysconfdir
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index fd16654127..5cbbd8a8f5 100644
index ab3106334b..4680b66cdc 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -55,7 +55,7 @@ int run_udevd(int argc, char *argv[]) {
@@ -65,7 +65,7 @@ int run_udevd(int argc, char *argv[]) {
if (arg_daemonize) {
pid_t pid;
@@ -345,7 +345,7 @@ index fd16654127..5cbbd8a8f5 100644
/* connect /dev/null to stdin, stdout, stderr */
if (log_get_max_level() < LOG_DEBUG) {
diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build
index 84fadfe3f7..22dfd09c05 100644
index 84fadfe3f7..72c55c7685 100644
--- a/sysusers.d/meson.build
+++ b/sysusers.d/meson.build
@@ -7,12 +7,11 @@ files = [['README', true],
@@ -353,7 +353,7 @@ index 84fadfe3f7..22dfd09c05 100644
foreach tuple : files
if enable_sysusers and tuple[1]
- install_data(tuple[0], install_dir : sysusersdir)
+ install_data(tuple[0], install_dir : sysusersdir, install_tag : 'esysusers')
+ install_data(tuple[0], install_dir : sysusersdir, install_tag : 'esysusers',)
endif
endforeach
@@ -370,10 +370,10 @@ index 84fadfe3f7..22dfd09c05 100644
install_dir : sysusersdir)
endforeach
diff --git a/test/meson.build b/test/meson.build
index 4cdd2f4303..7af045afb2 100644
index 7e8c3296ab..8dfa7afcae 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -16,7 +16,7 @@ if conf.get('ENABLE_SYSUSERS') == 1
@@ -17,7 +17,7 @@ if conf.get('ENABLE_SYSUSERS') == 1
suite : 'sysusers')
if have_standalone_binaries
@@ -382,7 +382,7 @@ index 4cdd2f4303..7af045afb2 100644
test('test-sysusers.standalone',
test_sysusers_sh,
# https://github.com/mesonbuild/meson/issues/2681
@@ -38,7 +38,7 @@ endif
@@ -40,7 +40,7 @@ endif
############################################################
if want_tests != 'false' and conf.get('ENABLE_HWDB') == 1
@@ -391,7 +391,7 @@ index 4cdd2f4303..7af045afb2 100644
test('hwdb-test',
files('hwdb-test.sh'),
suite : 'dist',
@@ -94,7 +94,7 @@ if want_tests != 'false' and conf.get('ENABLE_TMPFILES') == 1
@@ -96,7 +96,7 @@ if want_tests != 'false' and conf.get('ENABLE_TMPFILES') == 1
suite : 'tmpfiles')
if have_standalone_binaries
@@ -471,5 +471,5 @@ index 203eb7bb55..0c689008e9 100644
+ install_emptydir(sysconfdir / 'tmpfiles.d', install_tag : 'etmpfiles')
endif
--
2.51.2
2.52.0