summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-17 09:41:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 23:46:37 +0100
commitc0a7913bfe784f011b50b172cfe37c2002888043 (patch)
tree8d319311e15cab508a044459e5d8d6c6f5593007
parent6cf439d4c26f2dea021528dc4159955b73bcb3dd (diff)
downloadpoky-c0a7913bfe784f011b50b172cfe37c2002888043.tar.gz
systemd-boot: Move adjacent to systemd
We always forget to upgrade it when systemd is upgraded, keeping it next to systemd will be an easy reminder to upgrade this recipe along with systemd Define EFI_CC, so far it has been using detection mechanism which worked with gcc but falls back to native gcc when using non-gcc compiler as default system compiler e.g. clang (From OE-Core rev: e70f843b4fb5ee27d46543165a89d56c2ec5ee2e) Signed-off-by: Khem Raj <raj.khem@gmail.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.patch40
-rw-r--r--meta/recipes-core/systemd/systemd-boot_234.bb (renamed from meta/recipes-bsp/systemd-boot/systemd-boot_232.bb)6
2 files changed, 4 insertions, 42 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
deleted file mode 100644
index bc92db7468..0000000000
--- a/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Nov 2016 19:32:14 -0800
4Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative
5 option for ln
6
7Upstream-Status: Inappropriate [OE-Specific]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Makefile.am | 2 +-
12 configure.ac | 2 --
13 2 files changed, 1 insertion(+), 3 deletions(-)
14
15Index: git/Makefile.am
16===================================================================
17--- git.orig/Makefile.am
18+++ git/Makefile.am
19@@ -320,7 +320,7 @@ define install-relative-aliases
20 while [ -n "$$1" ]; do \
21 $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
22 rm -f $(DESTDIR)$$dir/$$2 && \
23- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
24+ lnr $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
25 shift 2 || exit $$?; \
26 done
27 endef
28Index: git/configure.ac
29===================================================================
30--- git.orig/configure.ac
31+++ git/configure.ac
32@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
33 AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
34 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
35
36-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
37-
38 M4_DEFINES=
39
40 AC_CHECK_TOOL(OBJCOPY, objcopy)
diff --git a/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb b/meta/recipes-core/systemd/systemd-boot_234.bb
index 0471ce246b..ed55e537eb 100644
--- a/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
+++ b/meta/recipes-core/systemd/systemd-boot_234.bb
@@ -1,12 +1,14 @@
1require recipes-core/systemd/systemd.inc 1require systemd.inc
2FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
2 3
3DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" 4DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
4 5
5SRC_URI += "file://0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch" 6SRC_URI += "file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch"
6 7
7inherit autotools pkgconfig gettext 8inherit autotools pkgconfig gettext
8inherit deploy 9inherit deploy
9 10
11export EFI_CC="${CC}"
10# Man pages are packaged through the main systemd recipe 12# Man pages are packaged through the main systemd recipe
11EXTRA_OECONF = " --enable-gnuefi \ 13EXTRA_OECONF = " --enable-gnuefi \
12 --with-efi-includedir=${STAGING_INCDIR} \ 14 --with-efi-includedir=${STAGING_INCDIR} \