Some of Andi's patches have been upstreamed, so we don't need to apply them ourselves any more.main
Alyssa Ross
3 years ago
parent
8c692a36b9
commit
28e55bce8c
@ -1,31 +0,0 @@ |
||||
From 0ac75fbbf771dfbb368087f19b2ed61356f9367d Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Rammhold <andreas@rammhold.de>
|
||||
Date: Mon, 26 Jul 2021 16:57:43 +0200
|
||||
Subject: [PATCH 19/22] core: respect install_sysconfdir_samples in meson file
|
||||
|
||||
The refactoring done in e11a25cadbe caused the configuration files to be
|
||||
installed into the pkgsysconfdir regardless of the state of the
|
||||
install_sysconfdir_samples boolean that indicated whether or not the
|
||||
sample files should be installed.
|
||||
---
|
||||
src/core/meson.build | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/core/meson.build b/src/core/meson.build
|
||||
index f0d2c6f642..4ff7e00e36 100644
|
||||
--- a/src/core/meson.build
|
||||
+++ b/src/core/meson.build
|
||||
@@ -187,6 +187,10 @@ foreach item : in_files
|
||||
file = item[0]
|
||||
dir = item[1]
|
||||
|
||||
+ if not install_sysconfdir_samples and dir == pkgsysconfdir
|
||||
+ continue
|
||||
+ endif
|
||||
+
|
||||
custom_target(
|
||||
file,
|
||||
input : file + '.in',
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,29 +0,0 @@ |
||||
From c12879d75c5ba7cd982993a815fc6540ae50a941 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Rammhold <andreas@rammhold.de>
|
||||
Date: Mon, 26 Jul 2021 17:20:34 +0200
|
||||
Subject: [PATCH 20/22] login: respect install_sysconfdir_samples in meson file
|
||||
|
||||
The refactoring done in c900d89faa0 caused the configuration files to be
|
||||
installed into the pkgsysconfdir regardless of the state of the
|
||||
install_sysconfdir_samples boolean that indicates whether or not the
|
||||
sample files should be installed.
|
||||
---
|
||||
src/login/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/login/meson.build b/src/login/meson.build
|
||||
index 8c20e6be65..b637adc9a2 100644
|
||||
--- a/src/login/meson.build
|
||||
+++ b/src/login/meson.build
|
||||
@@ -67,7 +67,7 @@ pam_systemd_c = files('pam_systemd.c')
|
||||
|
||||
enable_logind = conf.get('ENABLE_LOGIND') == 1
|
||||
in_files = [
|
||||
- ['logind.conf', pkgsysconfdir, enable_logind],
|
||||
+ ['logind.conf', pkgsysconfdir, enable_logind and install_sysconfdir_samples],
|
||||
['70-uaccess.rules', udevrulesdir, enable_logind and conf.get('HAVE_ACL') == 1],
|
||||
['71-seat.rules', udevrulesdir, enable_logind],
|
||||
['73-seat-late.rules', udevrulesdir, enable_logind],
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,33 +0,0 @@ |
||||
From 04eef1fb8e2a52277e051eb7980e96f9acc0afaa Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Mon, 23 Aug 2021 06:16:48 +0900
|
||||
Subject: [PATCH 22/22] path-util: make find_executable() work without /proc
|
||||
mounted
|
||||
|
||||
Follow-up for 888f65ace6296ed61285d31db846babf1c11885e.
|
||||
|
||||
Hopefully fixes #20514.
|
||||
---
|
||||
src/basic/path-util.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
|
||||
index e5afb5f5f5..13d71ed1b6 100644
|
||||
--- a/src/basic/path-util.c
|
||||
+++ b/src/basic/path-util.c
|
||||
@@ -628,7 +628,11 @@ static int check_x_access(const char *path, int *ret_fd) {
|
||||
return r;
|
||||
|
||||
r = access_fd(fd, X_OK);
|
||||
- if (r < 0)
|
||||
+ if (r == -ENOSYS) {
|
||||
+ /* /proc is not mounted. Fallback to access(). */
|
||||
+ if (access(path, X_OK) < 0)
|
||||
+ return -errno;
|
||||
+ } else if (r < 0)
|
||||
return r;
|
||||
|
||||
if (ret_fd)
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Loading…
Reference in new issue