summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp')
-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-bsp/systemd-boot/systemd-boot_232.bb39
2 files changed, 0 insertions, 79 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-bsp/systemd-boot/systemd-boot_232.bb
deleted file mode 100644
index 0471ce246b..0000000000
--- a/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
+++ /dev/null
@@ -1,39 +0,0 @@
1require recipes-core/systemd/systemd.inc
2
3DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
4
5SRC_URI += "file://0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch"
6
7inherit autotools pkgconfig gettext
8inherit deploy
9
10# Man pages are packaged through the main systemd recipe
11EXTRA_OECONF = " --enable-gnuefi \
12 --with-efi-includedir=${STAGING_INCDIR} \
13 --with-efi-ldsdir=${STAGING_LIBDIR} \
14 --with-efi-libdir=${STAGING_LIBDIR} \
15 --disable-manpages \
16 "
17
18# Imported from the old gummiboot recipe
19TUNE_CCARGS_remove = "-mfpmath=sse"
20COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
21
22do_compile() {
23 SYSTEMD_BOOT_EFI_ARCH="ia32"
24 if [ "${TARGET_ARCH}" = "x86_64" ]; then
25 SYSTEMD_BOOT_EFI_ARCH="x64"
26 fi
27
28 oe_runmake systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi
29}
30
31do_install() {
32 # Bypass systemd installation with a NOP
33 :
34}
35
36do_deploy () {
37 install ${B}/systemd-boot*.efi ${DEPLOYDIR}
38}
39addtask deploy before do_build after do_compile