[meta-intel] [PATCH 2/2] conf/machine/intel-*: move core-image-minimal-initramfs PACKAGE_INSTALL

[California Sullivan]

A machine configuration file wasn't the correct place to put this in the
first place. It should be in a bbappend, which we now have.

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 common/recipes-core/images/core-image-minimal-initramfs.bbappend | 3 +++
 conf/machine/intel-core2-32.conf                                 | 2 --
 conf/machine/intel-corei7-64.conf                                | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/recipes-core/images/core-image-minimal-initramfs.bbappend b/common/recipes-core/images/core-image-minimal-initramfs.bbappend
index 1611beb..4ddca37 100644
--- a/common/recipes-core/images/core-image-minimal-initramfs.bbappend
+++ b/common/recipes-core/images/core-image-minimal-initramfs.bbappend
@@ -1,3 +1,6 @@
 # Use initramfs-framework instead of initramfs-live*
 PACKAGE_INSTALL_remove_intel-x86-common = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi"
 PACKAGE_INSTALL_append_intel-x86-common = " initramfs-framework-base initramfs-module-udev initramfs-module-setup-live initramfs-module-install-efi"
+
+# Add i915 graphics firmware
+PACKAGE_INSTALL_append_intel-x86-common = " linux-firmware-i915"
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index bc2c764..abe6f90 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -30,8 +30,6 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
 APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
 
-PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
-
 IMAGE_FSTYPES += "wic"
 WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
 do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index d88be2d..a8097fc 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -31,8 +31,6 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
 APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
-PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
-
 IMAGE_FSTYPES += "wic"
 WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
 do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-- 
2.9.5