From patchwork Thu Aug 17 16:41:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 110327 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2431485obb; Thu, 17 Aug 2017 09:41:23 -0700 (PDT) X-Received: by 10.84.224.77 with SMTP id a13mr6379553plt.43.1502988083192; Thu, 17 Aug 2017 09:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502988083; cv=none; d=google.com; s=arc-20160816; b=AS8iPLY4eXN8J8RCkFbZxiC4oqF/Tv4Xsw98UHEeK6d1MnZH38IAfNWb3tDkYKLzAZ q0v7k7kTQfPqr0Ro5KZfIKcE4lHaUveF8P1TSCu8dBuu1SasypXJdm/7709zv/Z1spZ6 BdPHKO1qUApuUy35i6hHiLImEKuznuKpxaO+O4/7RoiAslrdolXmcta2K+UFRVKSs4+v TugvbS++UF4Injzor2tkmmz0dvqgpptiVxHftRrwMAbiR/TIdS5fv/xyo6/IR0/xYGhG 0lSTVnLsAGTeAV8YsoXY0mkx1ZjYMczEHrvvW7c0Ly7OBpMmdUPMYYzPuVEUdc3INMV9 LwPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=1mBvdOlM3LYmk4Yk3zzvZkzbhuJalE2EhO7zAhV+/R0=; b=Yg9K7zPVhq1M+Jjy4Kg6Z7z7Ypop3G6gcEzLSjCirsqYrBAAzLMJnBJR8HH5y70EQT a0G4dlch7S/bwXykXn6NfKjjKK22VH7eepWLrvaE40V5q1iKYzSLVXpvHjCeLBCD9iYU xzapFLj9H5iJGGGnRmrZDQiG02D8KfOIvMXsGRIpOXRDnmZiXyvXIutWXIhaqoQVPZk+ zi+VWjJrsZSDZ09UI9Xp57CN/iEVpIVNgccJjN3qsluEfkSvjqjA2KIxlkk/o6yDBJK8 /9Ny494qNFMPyBIEo8aWeo97Hj/mjX7LYYeC0pCw+zUxQT4iUl6xUqCePTB85NOjLFwI MdZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UoFDRMJV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q5si2209001pga.412.2017.08.17.09.41.22; Thu, 17 Aug 2017 09:41:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UoFDRMJV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 15B9E78568; Thu, 17 Aug 2017 16:41:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id C35017844A for ; Thu, 17 Aug 2017 16:41:18 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id y192so10695712pgd.1 for ; Thu, 17 Aug 2017 09:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=aNxgzWJaeqt5aA7ZOTMR/eZ2hmuIJe4x+6BEVptgeGw=; b=UoFDRMJV94X98fQCayAcMwzCSvB0diTbXpureMbHBb/tdr7T4toRxae4ew+QX5ySe8 xgh5ZirTnWo6GP08TA99463/Jz/UNsZdTI5czzLIcg1DLmpuar+wp8Eiwo71BZSA1TaL ajjh8RB40SXfCPzIgR38Qr2nG4sOVn6vmzGuW36uZa5t7G8f9BiZ0YnW86Cd0TIW1yCp hOW8Ku7LYb3S7gEGv+xR9+UA3V8Jt3HEDpjrJ2GuXS00x/idfaQR8NHY++NVXGOrs8lS 0bP44m2P+KBJv/N+DIpiiA1G464+kEwsMUU6RzLdOnwj23OvMB1fnUUzrB7Zw1a7fhDR EOTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aNxgzWJaeqt5aA7ZOTMR/eZ2hmuIJe4x+6BEVptgeGw=; b=RoXTLxThERHnJAFUcvSe3kQf48jqMx0It48xfaPkZkX269PlL6OTVg3+iOpM2Aliek xvwrpwAEzQhR5ai+6DVrxAUiD0ooHcJH/N6nIy5nyg8t5HUoJwSCeYemNIeFAWb4NLBS fHAFSwEuSedwqJT0peO8W4TIRc5g9q2WxyYUzcAp9w8LSVsZZC55CRA6iAKCmVqT1V+B kgrbJClRyPBy4aoA8tbtEHYzNsApLFP7cy+ZtbptA1bDSyRNaOHnu8UDUxAAk05S7TUb ZiK8hbz0bHWZJIL9kAw1pTCn6quNOLK8GhaulxnBMLAL9ICXEK/AoPLjhsakj76INIc/ +AsA== X-Gm-Message-State: AHYfb5jS4dYMRl7AOR6d7FyHvv+jYh9QGpmDPisDxkh9sO5vGQDPuI3c 0M5Z3+F0HZeK30gL X-Received: by 10.101.73.72 with SMTP id q8mr5635427pgs.219.1502988079744; Thu, 17 Aug 2017 09:41:19 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::8319]) by smtp.gmail.com with ESMTPSA id f15sm6201616pgu.90.2017.08.17.09.41.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 09:41:18 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Thu, 17 Aug 2017 09:41:08 -0700 Message-Id: <20170817164108.43467-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [OE-core] [PATCH] systemd-boot: Move adjacent to systemd X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 --- ...pper-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%) -- 2.14.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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} \