diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch b/meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch deleted file mode 100644 index 5234c59a78..0000000000 --- a/meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From 05dffe67919ffc72be5c017bc6cf82f164b2e8f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Emil Renner Berthing <systemd@esmil.dk> | ||
3 | Date: Mon, 23 Oct 2017 11:42:03 -0700 | ||
4 | Subject: [PATCH 07/12] check for missing canonicalize_file_name | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | configure.ac | 2 ++ | ||
11 | src/basic/missing.h | 1 + | ||
12 | src/basic/missing_syscall.h | 6 ++++++ | ||
13 | 3 files changed, 9 insertions(+) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index cd035a971..3674190fb 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -333,6 +333,7 @@ AC_CHECK_DECLS([ | ||
20 | renameat2, | ||
21 | kcmp, | ||
22 | keyctl, | ||
23 | + canonicalize_file_name, | ||
24 | LO_FLAGS_PARTSCAN, | ||
25 | copy_file_range, | ||
26 | explicit_bzero], | ||
27 | @@ -343,6 +344,7 @@ AC_CHECK_DECLS([ | ||
28 | #include <fcntl.h> | ||
29 | #include <sched.h> | ||
30 | #include <string.h> | ||
31 | +#include <stdlib.h> | ||
32 | #include <linux/loop.h> | ||
33 | ]]) | ||
34 | |||
35 | diff --git a/src/basic/missing.h b/src/basic/missing.h | ||
36 | index 671f341c6..8ae4964e1 100644 | ||
37 | --- a/src/basic/missing.h | ||
38 | +++ b/src/basic/missing.h | ||
39 | @@ -1246,3 +1246,4 @@ struct ethtool_link_settings { | ||
40 | #endif | ||
41 | |||
42 | #include "missing_syscall.h" | ||
43 | + | ||
44 | diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h | ||
45 | index 898116c7b..4d44ee4fa 100644 | ||
46 | --- a/src/basic/missing_syscall.h | ||
47 | +++ b/src/basic/missing_syscall.h | ||
48 | @@ -28,6 +28,12 @@ static inline int pivot_root(const char *new_root, const char *put_old) { | ||
49 | } | ||
50 | #endif | ||
51 | |||
52 | +#if !HAVE_DECL_CANONICALIZE_FILE_NAME | ||
53 | +static inline char *canonicalize_file_name(const char *path) { | ||
54 | + return realpath(path, NULL); | ||
55 | +} | ||
56 | +#endif | ||
57 | + | ||
58 | /* ======================================================================= */ | ||
59 | |||
60 | #if !HAVE_DECL_MEMFD_CREATE | ||
61 | -- | ||
62 | 2.14.2 | ||
63 | |||