From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mail.openembedded.org (Postfix) with ESMTP id EFEFB60043 for ; Wed, 10 Jan 2018 01:00:02 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2018 17:00:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,337,1511856000"; d="scan'208";a="18833396" Received: from clsulliv.jf.intel.com ([10.7.201.36]) by orsmga003.jf.intel.com with ESMTP; 09 Jan 2018 17:00:03 -0800 To: openembedded-core@lists.openembedded.org References: <20171219221234.21699-1-california.l.sullivan@intel.com> From: Cal Sullivan Message-ID: <8686fa07-e2a8-1080-e646-7380437e7338@intel.com> Date: Tue, 9 Jan 2018 17:00:03 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171219221234.21699-1-california.l.sullivan@intel.com> Subject: Re: [PATCH] core-image-minimal-initramfs: use initramfs-framework for initialization 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: , X-List-Received-Date: Wed, 10 Jan 2018 01:00:03 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Anything wrong with this? Haven't seen it hit any mut branches. Thanks, Cal On 12/19/2017 02:12 PM, California Sullivan wrote: > initramfs-framework is more modular and expandable. This change was > proposed in commit 28fc6ba761ed4a47efa7c43e7f7dff5e2fe72b5e > "core-image-minimal-initramfs: use initramfs-framework by default" but > reverted due to the selftests runqemu.RunqemuTests.test_boot_machine_iso > and runqemu.RunqemuTests.test_boot_deploy_hddimg failing. Since then, > the kinks have been worked out, and missing functionality that had been > missed (non-EFI installation module) has been added. > > Since the PACKAGE_INSTALL variable was getting so long with all these > individual modules getting added, I also introduced a new > INITRAMFS_SCRIPTS variable to the core-image-minimal-initramfs recipe. > This variable makes the recipe look much cleaner, and also allows easier > replacement or additions to the scripts. > > Fixes [YOCTO #10987]. > > Signed-off-by: California Sullivan > --- > meta/recipes-core/images/core-image-minimal-initramfs.bb | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb > index 5794a25952a..a9ba91bd310 100644 > --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > @@ -3,7 +3,15 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ > the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ > first 'init' program more efficiently." > > -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" > +INITRAMFS_SCRIPTS ?= "\ > + initramfs-framework-base \ > + initramfs-module-setup-live \ > + initramfs-module-udev \ > + initramfs-module-install \ > + initramfs-module-install-efi \ > + " > + > +PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" > > # Do not pollute the initrd image with rootfs features > IMAGE_FEATURES = ""