diff options
| author | Jussi Laako <jussi.laako@linux.intel.com> | 2017-03-20 15:08:02 +0200 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2017-03-21 19:03:03 -0700 |
| commit | 66637d28a779c8fc5b838a5f94f11806a4f553bc (patch) | |
| tree | 53dff1fce7e8ced06e01b06b7c573dba83f95e2b /conf | |
| parent | 37d46e1319d336195fb2b638412c9910fdd1668d (diff) | |
| download | meta-intel-66637d28a779c8fc5b838a5f94f11806a4f553bc.tar.gz meta-intel-66637d28a779c8fc5b838a5f94f11806a4f553bc.tar.bz2 meta-intel-66637d28a779c8fc5b838a5f94f11806a4f553bc.zip | |
Include recommended packges for all Intel machines
Moves common MACHINE_EXTRA_RRECOMMENDS to a common include file and
add thermald to MACHINE_EXTRA_RRECOMMENDS.
Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/meta-intel.inc | 3 | ||||
| -rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 | ||||
| -rw-r--r-- | conf/machine/intel-quark.conf | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 04bd5534..38d856fd 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -29,6 +29,9 @@ XSERVER_X86_ASPEED_AST = "xf86-video-ast \ # include the user space intel microcode loading support in the generated images. MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" +# recommended extra packages common to all intel machines +MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware thermald" + # for the early boot time kernel microcode loading support, # 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)}" diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index c5cfb9c0..c15f72b6 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -14,8 +14,6 @@ MACHINE_FEATURES += "intel-ucode" MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware" - MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" XSERVER ?= "${XSERVER_X86_BASE} \ diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 43e7c1ab..1e5de49e 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -14,7 +14,7 @@ MACHINE_FEATURES += "intel-ucode" MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware lms8" +MACHINE_EXTRA_RRECOMMENDS += "lms8" XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf index 6e3bb30d..17e8c52f 100644 --- a/conf/machine/intel-quark.conf +++ b/conf/machine/intel-quark.conf @@ -13,8 +13,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" MACHINE_FEATURES = "efi usb" MACHINE_FEATURES += "intel-ucode" -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" - SERIAL_CONSOLE = "115200 ttyS1" APPEND += "rootwait console=ttyS1,115200 console=tty0" |