From e70f843b4fb5ee27d46543165a89d56c2ec5ee2e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 17 Aug 2017 09:41:08 -0700 Subject: [PATCH] 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 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...instead-of-looking-for-relative-opti.patch | 40 ------------------- .../systemd/systemd-boot_234.bb} | 6 ++- 2 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch rename meta/{recipes-bsp/systemd-boot/systemd-boot_232.bb => recipes-core/systemd/systemd-boot_234.bb} (85%) 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 @@ -From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 9 Nov 2016 19:32:14 -0800 -Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative - option for ln - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj ---- - Makefile.am | 2 +- - configure.ac | 2 -- - 2 files changed, 1 insertion(+), 3 deletions(-) - -Index: git/Makefile.am -=================================================================== ---- git.orig/Makefile.am -+++ git/Makefile.am -@@ -320,7 +320,7 @@ define install-relative-aliases - while [ -n "$$1" ]; do \ - $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ - rm -f $(DESTDIR)$$dir/$$2 && \ -- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \ -+ lnr $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \ - shift 2 || exit $$?; \ - done - endef -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr - AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) - --AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) -- - M4_DEFINES= - - 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 similarity index 85% rename from meta/recipes-bsp/systemd-boot/systemd-boot_232.bb rename to 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 @@ -require recipes-core/systemd/systemd.inc +require systemd.inc +FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -SRC_URI += "file://0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch" +SRC_URI += "file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch" inherit autotools pkgconfig gettext inherit deploy +export EFI_CC="${CC}" # Man pages are packaged through the main systemd recipe EXTRA_OECONF = " --enable-gnuefi \ --with-efi-includedir=${STAGING_INCDIR} \ -- 2.40.1