summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-07-26 22:42:29 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-01 11:47:12 +0100
commit6d2987cc866b0a9b981d36df2891ec5625be07b5 (patch)
tree5502f027d4935b23b56d8e7e5ed132153484c66c
parent215687eb55a04b5b727f882f6fd245154fde7eff (diff)
downloadpoky-6d2987cc866b0a9b981d36df2891ec5625be07b5.tar.gz
systemd-boot: use lnr instead of ln --relative
Use lnr instead of "ln --relative" as systemd does to avoid needing coreutils 8.16. The patch is from systemd recipe and is rebased so it can be applied for systemd-boot. (From OE-Core rev: 7acc8c456fee53bf637fe08e492dd5466998c585) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch61
-rw-r--r--meta/recipes-bsp/systemd-boot/systemd-boot.bb2
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
new file mode 100644
index 0000000000..103d2861e8
--- /dev/null
+++ b/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
@@ -0,0 +1,61 @@
1From 9dcd2c80347493f73800d8c1cb539f1daef14394 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Tue, 26 Jul 2016 03:54:42 -0400
4Subject: [PATCH] use lnr wrapper instead of looking for --relative option for ln
5
6Upstream-Status: Inappropriate [OE-Specific]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10---
11 Makefile.am | 6 +++---
12 configure.ac | 2 --
13 2 files changed, 3 insertions(+), 5 deletions(-)
14
15diff --git a/Makefile.am b/Makefile.am
16index 305099a..f08d023 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -247,7 +247,7 @@ define move-to-rootlibdir
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@@ -321,7 +321,7 @@ define install-relative-aliases
29 while [ -n "$$1" ]; do \
30 $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
31 rm -f $(DESTDIR)$$dir/$$2 && \
32- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
33+ lnr $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
34 shift 2 || exit $$?; \
35 done
36 endef
37@@ -2906,7 +2906,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
46diff --git a/configure.ac b/configure.ac
47index 329861a..52c6e3d 100644
48--- a/configure.ac
49+++ b/configure.ac
50@@ -110,8 +110,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])
52 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
53
54-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
55-
56 M4_DEFINES=
57
58 AC_CHECK_TOOL(OBJCOPY, objcopy)
59--
602.8.1
61
diff --git a/meta/recipes-bsp/systemd-boot/systemd-boot.bb b/meta/recipes-bsp/systemd-boot/systemd-boot.bb
index 0dc0fa3c06..5b1164ec9b 100644
--- a/meta/recipes-bsp/systemd-boot/systemd-boot.bb
+++ b/meta/recipes-bsp/systemd-boot/systemd-boot.bb
@@ -2,6 +2,8 @@ require recipes-core/systemd/systemd.inc
2 2
3DEPENDS = "intltool-native libcap util-linux gnu-efi" 3DEPENDS = "intltool-native libcap util-linux gnu-efi"
4 4
5SRC_URI += "file://0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch"
6
5inherit autotools pkgconfig gettext 7inherit autotools pkgconfig gettext
6inherit deploy 8inherit deploy
7 9