From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 4B562E00D05; Tue, 13 Dec 2016 14:57:06 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, * medium trust * [134.134.136.31 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id D0957E00D00; Tue, 13 Dec 2016 14:57:04 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP; 13 Dec 2016 14:57:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,342,1477983600"; d="scan'208";a="911889165" Received: from unknown (HELO localhost.localdomain) ([10.7.197.100]) by orsmga003.jf.intel.com with ESMTP; 13 Dec 2016 14:57:03 -0800 From: Todor Minchev To: meta-intel@yoctoproject.org Date: Tue, 13 Dec 2016 14:56:49 -0800 Message-Id: <20161213225649.80589-1-todor.minchev@linux.intel.com> X-Mailer: git-send-email 2.11.0 Cc: yocto@yoctoproject.org, Todor Minchev Subject: [meta-inte][rmc][PATCH v2 1/1] rmc: add support for alternative EFI bootloaders X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 22:57:06 -0000 RMC was previously configured to work only with the systemd-boot EFI bootloader. With this commit we can specify alternative bootloaders by setting the RMC_BOOTLOADER variable in local.conf. If RMC_BOOTLOADER is not set systemd-boot will be used by default. Signed-off-by: Todor Minchev --- Remove references to grub-efi and gummiboot from V1. classes/{rmc-systemd-boot.bbclass => rmc-boot.bbclass} | 5 +++-- conf/machine/include/meta-intel.inc | 2 +- documentation/rmc/README | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) rename classes/{rmc-systemd-boot.bbclass => rmc-boot.bbclass} (73%) diff --git a/classes/rmc-systemd-boot.bbclass b/classes/rmc-boot.bbclass similarity index 73% rename from classes/rmc-systemd-boot.bbclass rename to classes/rmc-boot.bbclass index ad2cf10..a1f2093 100644 --- a/classes/rmc-systemd-boot.bbclass +++ b/classes/rmc-boot.bbclass @@ -1,9 +1,10 @@ -# rmc-systemd-boot bbclass +# rmc-boot bbclass # Deploy central RMC database file to ESP IMAGE_INSTALL_append = " rmc" +RMC_BOOTLOADER ?= "systemd-boot" -inherit systemd-boot +inherit ${RMC_BOOTLOADER} do_bootimg[depends] += "${MLPREFIX}rmc-db:do_deploy" diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index c7555ce..fd0a792 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -32,7 +32,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURE # merge the microcode data in the final initrd image. INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" -EFI_PROVIDER ?= "rmc-systemd-boot" +EFI_PROVIDER ?= "rmc-boot" # Add general MACHINEOVERRIDE for meta-intel MACHINEOVERRIDES =. "intel-x86-common:" diff --git a/documentation/rmc/README b/documentation/rmc/README index 2427ffd..dbee6b6 100644 --- a/documentation/rmc/README +++ b/documentation/rmc/README @@ -165,14 +165,24 @@ steps still can override results from this hook for boot entries and KBOOTPARAM. Enable RMC Feature -------------------------------------------------------------------------------- -To Enable RMC feature in build, add the below lines in a conf file: +To enable the RMC feature please add the following variables to your local.conf. + DISTRO_FEATURES_append = " rmc" -EFI_PROVIDER = "rmc-systemd-boot" +EFI_PROVIDER = "rmc-boot" + +The default EFI bootloader used with RMC is systemd-boot. To change the default +bootloader please overwrite the RMC_BOOTLOADER variable in your local.conf Note: Image could be still bootable if you only have either of two lines, but RMC feature won't be fully functional. +To install only the RMC client with the systemd-boot bootloader without +including a default RMC database file, add the following lines to your +local.conf: + +EFI_PROVIDER = "systemd-boot" +IMAGE_INSTALL_append = " rmc" Examples @@ -190,7 +200,7 @@ EXAMPLE 1: Support a new board type: (1) enable the feature and do a build to get a live-boot image by adding these lines in conf/local.conf: DISTRO_FEATURES_append = " rmc" - EFI_PROVIDER = "rmc-systemd-boot" + EFI_PROVIDER = "rmc-boot" (2) flash the image to a USB stick and boot it on your board -- 2.11.0