From 9658bb34892e7853b1408cbcc7b47bf62d3995a1 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Thu, 10 Aug 2017 16:57:51 -0700 Subject: conf/machine/intel-*: move core-image-minimal-initramfs PACKAGE_INSTALL 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 --- 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 1611beb7..4ddca375 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 bc2c7640..abe6f901 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 d88be2db..a8097fc3 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" -- cgit v1.2.3-54-g00ecf