summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-08-10 23:57:51 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-08-23 22:16:35 (GMT)
commit9658bb34892e7853b1408cbcc7b47bf62d3995a1 (patch)
tree2c2bbb4bf3ea508a95d686c70418d1087dc9d3f0 /conf
parentf9e95940fb8c5769113a53d2494185b389299926 (diff)
downloadmeta-intel-9658bb34892e7853b1408cbcc7b47bf62d3995a1.tar.gz
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 <california.l.sullivan@intel.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/intel-core2-32.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
2 files changed, 0 insertions, 4 deletions
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"
30SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0" 30SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
31APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" 31APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
32 32
33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
34
35IMAGE_FSTYPES += "wic" 33IMAGE_FSTYPES += "wic"
36WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" 34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
37do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 35do_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"
31SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" 31SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
32APPEND += "rootwait console=ttyS0,115200 console=tty0" 32APPEND += "rootwait console=ttyS0,115200 console=tty0"
33 33
34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
35
36IMAGE_FSTYPES += "wic" 34IMAGE_FSTYPES += "wic"
37WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" 35WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 36do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"