diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch index 12f6ace93d..fad69a51af 100644 --- a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch +++ b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch | |||
@@ -1,31 +1,22 @@ | |||
1 | From fa5e137fbd2fb081ae897575377d718ee8cb6349 Mon Sep 17 00:00:00 2001 | 1 | From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 20 Dec 2015 04:20:28 +0000 | 3 | Date: Wed, 9 Nov 2016 19:32:14 -0800 |
4 | Subject: [PATCH 07/36] use lnr wrapper instead of looking for --relative | 4 | Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative |
5 | option for ln | 5 | option for ln |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [OE-Specific] | 7 | Upstream-Status: Inappropriate [OE-Specific] |
8 | 8 | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
10 | --- | 10 | --- |
11 | Makefile.am | 6 +++--- | 11 | Makefile.am | 2 +- |
12 | configure.ac | 2 -- | 12 | configure.ac | 2 -- |
13 | 2 files changed, 3 insertions(+), 5 deletions(-) | 13 | 2 files changed, 1 insertion(+), 3 deletions(-) |
14 | 14 | ||
15 | diff --git a/Makefile.am b/Makefile.am | 15 | diff --git a/Makefile.am b/Makefile.am |
16 | index 629740f..82b6553 100644 | 16 | index 29ed1dd..02f4017 100644 |
17 | --- a/Makefile.am | 17 | --- a/Makefile.am |
18 | +++ b/Makefile.am | 18 | +++ b/Makefile.am |
19 | @@ -243,7 +243,7 @@ define move-to-rootlibdir | 19 | @@ -320,7 +320,7 @@ define install-relative-aliases |
20 | $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ | ||
21 | so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ | ||
22 | rm -f $(DESTDIR)$(libdir)/$$libname && \ | ||
23 | - $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ | ||
24 | + lnr $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ | ||
25 | mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ | ||
26 | fi | ||
27 | endef | ||
28 | @@ -317,7 +317,7 @@ define install-relative-aliases | ||
29 | while [ -n "$$1" ]; do \ | 20 | while [ -n "$$1" ]; do \ |
30 | $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ | 21 | $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ |
31 | rm -f $(DESTDIR)$$dir/$$2 && \ | 22 | rm -f $(DESTDIR)$$dir/$$2 && \ |
@@ -34,20 +25,11 @@ index 629740f..82b6553 100644 | |||
34 | shift 2 || exit $$?; \ | 25 | shift 2 || exit $$?; \ |
35 | done | 26 | done |
36 | endef | 27 | endef |
37 | @@ -2781,7 +2781,7 @@ systemd_dbus1_generator_LDADD = \ | ||
38 | dbus1-generator-install-hook: | ||
39 | $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) | ||
40 | $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator | ||
41 | - $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator | ||
42 | + $(AM_V_LN)lnr $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator | ||
43 | |||
44 | dbus1-generator-uninstall-hook: | ||
45 | rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator | ||
46 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
47 | index 0239fd0..c5ab9d0 100644 | 29 | index 7c4b5a2..b10c952 100644 |
48 | --- a/configure.ac | 30 | --- a/configure.ac |
49 | +++ b/configure.ac | 31 | +++ b/configure.ac |
50 | @@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) | 32 | @@ -108,8 +108,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) |
51 | AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) | 33 | AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) |
52 | AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) | 34 | AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) |
53 | 35 | ||
@@ -57,5 +39,5 @@ index 0239fd0..c5ab9d0 100644 | |||
57 | 39 | ||
58 | AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate) | 40 | AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate) |
59 | -- | 41 | -- |
60 | 1.8.3.1 | 42 | 2.10.2 |
61 | 43 | ||