Update package version to 259
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: udev
|
name: udev
|
||||||
description: Userspace device file manager
|
description: Userspace device file manager
|
||||||
version: "258.2"
|
version: "259"
|
||||||
revision: 4
|
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
|
||||||
architecture: any
|
architecture: any
|
||||||
@@ -24,7 +24,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: 05208e76bf1f9b369b1a8159e6631ef67c82f2d27c21e931962026a79bf4ba64
|
checksum: a84123692d1add7f9c48fd11cdf5f901393008c2d2ade667c18f25a20bf1290d
|
||||||
split_packages:
|
split_packages:
|
||||||
- name: udev
|
- name: udev
|
||||||
depends:
|
depends:
|
||||||
|
|||||||
@@ -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]>
|
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
|
Subject: [PATCH 1/1] artix standalone install
|
||||||
|
|
||||||
---
|
---
|
||||||
factory/templates/meson.build | 2 ++
|
factory/templates/meson.build | 2 ++
|
||||||
meson.build | 22 +++++++++++++----
|
meson.build | 22 ++++++++++++++----
|
||||||
rules.d/meson.build | 3 +--
|
rules.d/meson.build | 3 +--
|
||||||
shell-completion/bash/meson.build | 39 ++-----------------------------
|
shell-completion/bash/meson.build | 38 +------------------------------
|
||||||
shell-completion/zsh/meson.build | 31 ++----------------------
|
shell-completion/zsh/meson.build | 29 +----------------------
|
||||||
src/core/meson.build | 5 ----
|
src/core/meson.build | 4 ----
|
||||||
src/hwdb/meson.build | 2 +-
|
src/hwdb/meson.build | 2 +-
|
||||||
src/libudev/meson.build | 9 ++++++-
|
src/libudev/meson.build | 9 +++++++-
|
||||||
src/sysusers/meson.build | 3 ++-
|
src/sysusers/meson.build | 3 ++-
|
||||||
src/tmpfiles/meson.build | 3 ++-
|
src/tmpfiles/meson.build | 3 ++-
|
||||||
src/udev/meson.build | 8 +++----
|
src/udev/meson.build | 8 +++----
|
||||||
@@ -19,11 +19,11 @@ Subject: [PATCH 1/1] artix standalone install
|
|||||||
sysusers.d/meson.build | 4 ++--
|
sysusers.d/meson.build | 4 ++--
|
||||||
test/meson.build | 6 ++---
|
test/meson.build | 6 ++---
|
||||||
tmpfiles.d/legacy.conf.in | 3 ---
|
tmpfiles.d/legacy.conf.in | 3 ---
|
||||||
tmpfiles.d/meson.build | 9 +++----
|
tmpfiles.d/meson.build | 9 +++-----
|
||||||
16 files changed, 51 insertions(+), 100 deletions(-)
|
16 files changed, 49 insertions(+), 98 deletions(-)
|
||||||
|
|
||||||
diff --git a/factory/templates/meson.build b/factory/templates/meson.build
|
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
|
--- a/factory/templates/meson.build
|
||||||
+++ b/factory/templates/meson.build
|
+++ b/factory/templates/meson.build
|
||||||
@@ -7,6 +7,7 @@ custom_target(
|
@@ -7,6 +7,7 @@ custom_target(
|
||||||
@@ -34,17 +34,19 @@ index 3db9f255b9..e54c0c3f3b 100644
|
|||||||
install_dir : factory_etc_dir)
|
install_dir : factory_etc_dir)
|
||||||
|
|
||||||
custom_target(
|
custom_target(
|
||||||
@@ -14,4 +15,5 @@ custom_target(
|
@@ -14,6 +15,7 @@ custom_target(
|
||||||
output : 'vconsole.conf',
|
output : 'vconsole.conf',
|
||||||
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
|
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
|
||||||
install : true,
|
install : true,
|
||||||
+ install_tag : 'etmpfiles',
|
+ install_tag : 'etmpfiles',
|
||||||
install_dir : factory_etc_dir)
|
install_dir : factory_etc_dir)
|
||||||
|
|
||||||
|
if conf.get('ENABLE_NSS') == 1
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index 238b935372..2014e1e8ee 100644
|
index 4746146a98..fd2b335ce5 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/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')
|
datadir = prefixdir / get_option('datadir')
|
||||||
localstatedir = '/' / get_option('localstatedir')
|
localstatedir = '/' / get_option('localstatedir')
|
||||||
|
|
||||||
@@ -53,7 +55,7 @@ index 238b935372..2014e1e8ee 100644
|
|||||||
libexecdir_to_bin = '../../bin/'
|
libexecdir_to_bin = '../../bin/'
|
||||||
pkglibdir = libdir / 'systemd'
|
pkglibdir = libdir / 'systemd'
|
||||||
|
|
||||||
@@ -2769,7 +2769,6 @@ subdir('shell-completion/zsh')
|
@@ -2837,7 +2837,6 @@ subdir('shell-completion/zsh')
|
||||||
subdir('sysctl.d')
|
subdir('sysctl.d')
|
||||||
subdir('sysusers.d')
|
subdir('sysusers.d')
|
||||||
subdir('tmpfiles.d')
|
subdir('tmpfiles.d')
|
||||||
@@ -61,7 +63,7 @@ index 238b935372..2014e1e8ee 100644
|
|||||||
|
|
||||||
install_subdir('factory/etc',
|
install_subdir('factory/etc',
|
||||||
install_dir : factorydir)
|
install_dir : factorydir)
|
||||||
@@ -2791,6 +2790,21 @@ install_data('LICENSE.GPL2',
|
@@ -2859,6 +2858,21 @@ install_data('LICENSE.GPL2',
|
||||||
install_subdir('LICENSES',
|
install_subdir('LICENSES',
|
||||||
install_dir : docdir)
|
install_dir : docdir)
|
||||||
|
|
||||||
@@ -83,7 +85,7 @@ index 238b935372..2014e1e8ee 100644
|
|||||||
install_emptydir(systemdstatedir)
|
install_emptydir(systemdstatedir)
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
@@ -2946,10 +2960,10 @@ udev_targets = []
|
@@ -3025,10 +3039,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
|
||||||
@@ -95,9 +97,9 @@ index 238b935372..2014e1e8ee 100644
|
|||||||
+ alias_target('hwdb', auto_suspend_rules, executables_by_name.get('udev-hwdb'))
|
+ alias_target('hwdb', auto_suspend_rules, executables_by_name.get('udev-hwdb'))
|
||||||
endif
|
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
|
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
|
--- a/rules.d/meson.build
|
||||||
+++ b/rules.d/meson.build
|
+++ b/rules.d/meson.build
|
||||||
@@ -2,7 +2,7 @@
|
@@ -2,7 +2,7 @@
|
||||||
@@ -109,7 +111,7 @@ index 933a84859a..8e190a834a 100644
|
|||||||
|
|
||||||
rules = [
|
rules = [
|
||||||
[files('60-autosuspend.rules',
|
[files('60-autosuspend.rules',
|
||||||
@@ -63,7 +63,6 @@ rules_in = [
|
@@ -65,7 +65,6 @@ rules_in = [
|
||||||
['50-udev-default.rules'],
|
['50-udev-default.rules'],
|
||||||
['60-persistent-storage.rules'],
|
['60-persistent-storage.rules'],
|
||||||
['64-btrfs.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],
|
['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 6a547a5e69..67ef541aae 100644
|
index 178986e171..9492becac9 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
|
||||||
@@ -17,47 +17,12 @@ custom_target(
|
@@ -20,48 +20,12 @@ custom_target(
|
||||||
install : bashcompletiondir != 'no',
|
|
||||||
install_dir : bashcompletiondir)
|
install_dir : bashcompletiondir)
|
||||||
|
|
||||||
-items = [['busctl', ''],
|
foreach item : [
|
||||||
- ['journalctl', ''],
|
- ['bootctl', ''],
|
||||||
- ['systemd-analyze', ''],
|
- ['busctl', ''],
|
||||||
- ['systemd-cat', ''],
|
- ['coredumpctl', 'ENABLE_COREDUMP'],
|
||||||
- ['systemd-cgls', ''],
|
- ['homectl', 'ENABLE_HOMED'],
|
||||||
- ['systemd-cgtop', ''],
|
- ['hostnamectl', 'ENABLE_HOSTNAMED'],
|
||||||
- ['systemd-creds', ''],
|
- ['importctl', 'ENABLE_IMPORTD'],
|
||||||
- ['systemd-delta', ''],
|
- ['journalctl', ''],
|
||||||
- ['systemd-detect-virt', ''],
|
- ['kernel-install', 'ENABLE_KERNEL_INSTALL'],
|
||||||
- ['systemd-id128', ''],
|
- ['localectl', 'ENABLE_LOCALED'],
|
||||||
- ['systemd-nspawn', 'ENABLE_NSPAWN'],
|
- ['loginctl', 'ENABLE_LOGIND'],
|
||||||
- ['systemd-path', ''],
|
- ['machinectl', 'ENABLE_MACHINED'],
|
||||||
- ['systemd-run', ''],
|
- ['networkctl', 'ENABLE_NETWORKD'],
|
||||||
- ['systemd-vpick', ''],
|
- ['oomctl', 'ENABLE_OOMD'],
|
||||||
- ['udevadm', ''],
|
- ['portablectl', 'ENABLE_PORTABLED'],
|
||||||
- ['bootctl', ''],
|
- ['resolvectl', 'ENABLE_RESOLVE'],
|
||||||
- ['run0', ''],
|
- ['run0', ''],
|
||||||
- ['coredumpctl', 'ENABLE_COREDUMP'],
|
- ['systemd-analyze', ''],
|
||||||
- ['homectl', 'ENABLE_HOMED'],
|
- ['systemd-cat', ''],
|
||||||
- ['hostnamectl', 'ENABLE_HOSTNAMED'],
|
- ['systemd-cgls', ''],
|
||||||
- ['importctl', 'ENABLE_IMPORTD'],
|
- ['systemd-cgtop', ''],
|
||||||
- ['kernel-install', 'ENABLE_KERNEL_INSTALL'],
|
- ['systemd-confext', 'ENABLE_SYSEXT'],
|
||||||
- ['localectl', 'ENABLE_LOCALED'],
|
- ['systemd-creds', ''],
|
||||||
- ['loginctl', 'ENABLE_LOGIND'],
|
- ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'],
|
||||||
- ['machinectl', 'ENABLE_MACHINED'],
|
- ['systemd-delta', ''],
|
||||||
- ['networkctl', 'ENABLE_NETWORKD'],
|
- ['systemd-detect-virt', ''],
|
||||||
- ['oomctl', 'ENABLE_OOMD'],
|
- ['systemd-dissect', 'HAVE_BLKID'],
|
||||||
- ['portablectl', 'ENABLE_PORTABLED'],
|
- ['systemd-id128', ''],
|
||||||
- ['resolvectl', 'ENABLE_RESOLVE'],
|
- ['systemd-nspawn', 'ENABLE_NSPAWN'],
|
||||||
- ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'],
|
- ['systemd-path', ''],
|
||||||
- ['systemd-confext', 'ENABLE_SYSEXT'],
|
- ['systemd-resolve', 'ENABLE_RESOLVE'],
|
||||||
- ['systemd-dissect', 'HAVE_BLKID'],
|
- ['systemd-run', ''],
|
||||||
- ['systemd-resolve', 'ENABLE_RESOLVE'],
|
- ['systemd-sysext', 'ENABLE_SYSEXT'],
|
||||||
- ['systemd-sysext', 'ENABLE_SYSEXT'],
|
- ['systemd-vmspawn', 'ENABLE_VMSPAWN'],
|
||||||
- ['systemd-vmspawn', 'ENABLE_VMSPAWN'],
|
- ['systemd-vpick', ''],
|
||||||
- ['timedatectl', 'ENABLE_TIMEDATED'],
|
- ['timedatectl', 'ENABLE_TIMEDATED'],
|
||||||
- ['userdbctl', 'ENABLE_USERDB']]
|
['udevadm', ''],
|
||||||
+items = [['udevadm', '']]
|
- ['userdbctl', 'ENABLE_USERDB'],
|
||||||
|
- ['varlinkctl', ''],
|
||||||
|
]
|
||||||
|
|
||||||
foreach item : items
|
if item[1] == '' or conf.get(item[1]) == 1
|
||||||
if bashcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
|
|
||||||
install_data(item[0],
|
install_data(item[0],
|
||||||
+ install_tag : 'udev',
|
+ install_tag : 'udev',
|
||||||
install_dir : bashcompletiondir)
|
install_dir : bashcompletiondir)
|
||||||
endif
|
endif
|
||||||
endforeach
|
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 4de28388ce..63ad624af5 100644
|
index 221c30627f..e4cf6c45dd 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
|
||||||
@@ -12,39 +12,12 @@ custom_target(
|
@@ -15,39 +15,12 @@ custom_target(
|
||||||
install : zshcompletiondir != 'no',
|
|
||||||
install_dir : zshcompletiondir)
|
install_dir : zshcompletiondir)
|
||||||
|
|
||||||
-items = [['_busctl', ''],
|
foreach item : [
|
||||||
- ['_journalctl', ''],
|
- ['_bootctl', ''],
|
||||||
- ['_systemd-analyze', ''],
|
- ['_busctl', ''],
|
||||||
- ['_systemd-delta', ''],
|
- ['_coredumpctl', 'ENABLE_COREDUMP'],
|
||||||
- ['_systemd-nspawn', ''],
|
- ['_hostnamectl', 'ENABLE_HOSTNAMED'],
|
||||||
- ['_systemd', ''],
|
- ['_journalctl', ''],
|
||||||
- ['_systemd-path', ''],
|
- ['_kernel-install', 'ENABLE_KERNEL_INSTALL'],
|
||||||
- ['_systemd-run', ''],
|
- ['_localectl', 'ENABLE_LOCALED'],
|
||||||
- ['_run0', ''],
|
- ['_loginctl', 'ENABLE_LOGIND'],
|
||||||
- ['_udevadm', ''],
|
- ['_machinectl', 'ENABLE_MACHINED'],
|
||||||
- ['_varlinkctl', ''],
|
- ['_networkctl', 'ENABLE_NETWORKD'],
|
||||||
- ['_kernel-install', 'ENABLE_KERNEL_INSTALL'],
|
- ['_oomctl', 'ENABLE_OOMD'],
|
||||||
- ['_sd_bus_address', ''],
|
- ['_resolvectl', 'ENABLE_RESOLVE'],
|
||||||
- ['_sd_hosts_or_user_at_host', ''],
|
- ['_run0', ''],
|
||||||
- ['_sd_outputmodes', ''],
|
- ['_sd_bus_address', ''],
|
||||||
- ['_sd_unit_files', ''],
|
- ['_sd_hosts_or_user_at_host', ''],
|
||||||
- ['_sd_machines', ''],
|
- ['_sd_machines', ''],
|
||||||
- ['_bootctl', ''],
|
- ['_sd_outputmodes', ''],
|
||||||
- ['_coredumpctl', 'ENABLE_COREDUMP'],
|
- ['_sd_unit_files', ''],
|
||||||
- ['_hostnamectl', 'ENABLE_HOSTNAMED'],
|
- ['_systemd', ''],
|
||||||
- ['_localectl', 'ENABLE_LOCALED'],
|
- ['_systemd-analyze', ''],
|
||||||
- ['_loginctl', 'ENABLE_LOGIND'],
|
- ['_systemd-delta', ''],
|
||||||
- ['_machinectl', 'ENABLE_MACHINED'],
|
- ['_systemd-inhibit', 'ENABLE_LOGIND'],
|
||||||
- ['_networkctl', 'ENABLE_NETWORKD'],
|
- ['_systemd-nspawn', ''],
|
||||||
- ['_oomctl', 'ENABLE_OOMD'],
|
- ['_systemd-path', ''],
|
||||||
- ['_systemd-inhibit', 'ENABLE_LOGIND'],
|
- ['_systemd-run', ''],
|
||||||
- ['_resolvectl', 'ENABLE_RESOLVE'],
|
- ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],
|
||||||
- ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],
|
- ['_timedatectl', 'ENABLE_TIMEDATED'],
|
||||||
- ['_timedatectl', 'ENABLE_TIMEDATED']]
|
['_udevadm', ''],
|
||||||
+items = [['_udevadm', '']]
|
- ['_varlinkctl', ''],
|
||||||
|
]
|
||||||
|
|
||||||
foreach item : items
|
if item[1] == '' or conf.get(item[1]) == 1
|
||||||
if zshcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
|
|
||||||
install_data(item[0],
|
install_data(item[0],
|
||||||
+ install_tag : 'udev',
|
+ install_tag : 'udev',
|
||||||
install_dir : zshcompletiondir)
|
install_dir : zshcompletiondir)
|
||||||
endif
|
endif
|
||||||
endforeach
|
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 8bb0054c14..7ef92ca00b 100644
|
index 657574019c..51658e4506 100644
|
||||||
--- a/src/core/meson.build
|
--- a/src/core/meson.build
|
||||||
+++ b/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')
|
install_dir : sysconfdir / 'xdg/systemd')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -229,10 +230,9 @@ index 8bb0054c14..7ef92ca00b 100644
|
|||||||
-install_symlink('init',
|
-install_symlink('init',
|
||||||
- pointing_to : '../lib/systemd/systemd',
|
- pointing_to : '../lib/systemd/systemd',
|
||||||
- install_dir : sbindir)
|
- install_dir : sbindir)
|
||||||
-
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
core_test_template = test_template + {
|
|
||||||
diff --git a/src/hwdb/meson.build b/src/hwdb/meson.build
|
diff --git a/src/hwdb/meson.build b/src/hwdb/meson.build
|
||||||
index 57ace3ad44..96c0b185d0 100644
|
index 57ace3ad44..96c0b185d0 100644
|
||||||
--- a/src/hwdb/meson.build
|
--- a/src/hwdb/meson.build
|
||||||
@@ -272,11 +272,11 @@ index eb9dda79ae..e45d25c71b 100644
|
|||||||
+ install_tag : 'libudev-devel',
|
+ install_tag : 'libudev-devel',
|
||||||
install_dir : pkgconfiglibdir)
|
install_dir : pkgconfiglibdir)
|
||||||
diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build
|
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
|
--- a/src/sysusers/meson.build
|
||||||
+++ b/src/sysusers/meson.build
|
+++ b/src/sysusers/meson.build
|
||||||
@@ -12,10 +12,11 @@ executables += [
|
@@ -12,10 +12,11 @@ executables += [
|
||||||
'dependencies' : libaudit,
|
'dependencies' : libaudit_cflags,
|
||||||
},
|
},
|
||||||
executable_template + {
|
executable_template + {
|
||||||
- 'name' : 'systemd-sysusers.standalone',
|
- 'name' : 'systemd-sysusers.standalone',
|
||||||
@@ -289,11 +289,11 @@ index e2e82889e7..2c184f8350 100644
|
|||||||
libc_wrapper_static,
|
libc_wrapper_static,
|
||||||
libbasic_static,
|
libbasic_static,
|
||||||
diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
|
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
|
--- a/src/tmpfiles/meson.build
|
||||||
+++ b/src/tmpfiles/meson.build
|
+++ b/src/tmpfiles/meson.build
|
||||||
@@ -20,10 +20,11 @@ executables += [
|
@@ -20,10 +20,11 @@ executables += [
|
||||||
'dependencies' : libacl,
|
'dependencies' : libacl_cflags,
|
||||||
},
|
},
|
||||||
executable_template + {
|
executable_template + {
|
||||||
- 'name' : 'systemd-tmpfiles.standalone',
|
- 'name' : 'systemd-tmpfiles.standalone',
|
||||||
@@ -306,10 +306,10 @@ index a973d16f5c..195b0f7456 100644
|
|||||||
libc_wrapper_static,
|
libc_wrapper_static,
|
||||||
libbasic_static,
|
libbasic_static,
|
||||||
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 908bec8b1d..d6fa6529d8 100644
|
index 7df5b3de85..26d69ef8e9 100644
|
||||||
--- a/src/udev/meson.build
|
--- a/src/udev/meson.build
|
||||||
+++ b/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')
|
install_tag : 'udev')
|
||||||
|
|
||||||
if install_sysconfdir_samples
|
if install_sysconfdir_samples
|
||||||
@@ -276,7 +276,7 @@ udev_pc = custom_target(
|
@@ -273,7 +273,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',
|
||||||
@@ -332,10 +332,10 @@ index 908bec8b1d..d6fa6529d8 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 fd16654127..5cbbd8a8f5 100644
|
index ab3106334b..4680b66cdc 100644
|
||||||
--- a/src/udev/udevd.c
|
--- a/src/udev/udevd.c
|
||||||
+++ b/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) {
|
if (arg_daemonize) {
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
|
|
||||||
@@ -345,7 +345,7 @@ index fd16654127..5cbbd8a8f5 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/sysusers.d/meson.build b/sysusers.d/meson.build
|
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
|
--- a/sysusers.d/meson.build
|
||||||
+++ b/sysusers.d/meson.build
|
+++ b/sysusers.d/meson.build
|
||||||
@@ -7,12 +7,11 @@ files = [['README', true],
|
@@ -7,12 +7,11 @@ files = [['README', true],
|
||||||
@@ -353,7 +353,7 @@ index 84fadfe3f7..22dfd09c05 100644
|
|||||||
foreach tuple : files
|
foreach tuple : files
|
||||||
if enable_sysusers and tuple[1]
|
if enable_sysusers and tuple[1]
|
||||||
- install_data(tuple[0], install_dir : sysusersdir)
|
- 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
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
@@ -370,10 +370,10 @@ index 84fadfe3f7..22dfd09c05 100644
|
|||||||
install_dir : sysusersdir)
|
install_dir : sysusersdir)
|
||||||
endforeach
|
endforeach
|
||||||
diff --git a/test/meson.build b/test/meson.build
|
diff --git a/test/meson.build b/test/meson.build
|
||||||
index 4cdd2f4303..7af045afb2 100644
|
index 7e8c3296ab..8dfa7afcae 100644
|
||||||
--- a/test/meson.build
|
--- a/test/meson.build
|
||||||
+++ b/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')
|
suite : 'sysusers')
|
||||||
|
|
||||||
if have_standalone_binaries
|
if have_standalone_binaries
|
||||||
@@ -382,7 +382,7 @@ index 4cdd2f4303..7af045afb2 100644
|
|||||||
test('test-sysusers.standalone',
|
test('test-sysusers.standalone',
|
||||||
test_sysusers_sh,
|
test_sysusers_sh,
|
||||||
# https://github.com/mesonbuild/meson/issues/2681
|
# 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
|
if want_tests != 'false' and conf.get('ENABLE_HWDB') == 1
|
||||||
@@ -391,7 +391,7 @@ index 4cdd2f4303..7af045afb2 100644
|
|||||||
test('hwdb-test',
|
test('hwdb-test',
|
||||||
files('hwdb-test.sh'),
|
files('hwdb-test.sh'),
|
||||||
suite : 'dist',
|
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')
|
suite : 'tmpfiles')
|
||||||
|
|
||||||
if have_standalone_binaries
|
if have_standalone_binaries
|
||||||
@@ -471,5 +471,5 @@ index 203eb7bb55..0c689008e9 100644
|
|||||||
+ install_emptydir(sysconfdir / 'tmpfiles.d', install_tag : 'etmpfiles')
|
+ install_emptydir(sysconfdir / 'tmpfiles.d', install_tag : 'etmpfiles')
|
||||||
endif
|
endif
|
||||||
--
|
--
|
||||||
2.51.2
|
2.52.0
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
# This function is used for putting downloaded files to the correct location or applying patches
|
# This function is used for putting downloaded files to the correct location or applying patches
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "$BPM_SOURCE"
|
cd "$BPM_SOURCE"
|
||||||
|
# Patch from Artix to make installation easier
|
||||||
patch -Np1 -i "$BPM_WORKDIR"/artix-standalone-install.patch
|
patch -Np1 -i "$BPM_WORKDIR"/artix-standalone-install.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user