From 0adfa9a2ed1a9838c4170de3ef2fc6356b6dde65 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Fri, 19 Jun 2020 09:31:58 +0200 Subject: Remove meta-intel in favour of qemux86-64 as combined target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the qemux86-64 target will build bootable media for x86 targets (virtual and physical). Thus we do not need another config anymore. For compatibility, do a symlink intel-corei7-64 -> qemux86-64 when selecting the machine. Bug-AGL: SPEC-2931 Signed-off-by: Jan-Simon Möller Change-Id: I65aab61680d982ccfb1d9146bead591a6cfd1dd3 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24792 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Matt Ranostay --- meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 31 ---------------------- templates/machine/intel-corei7-64 | 1 + .../machine/intel-corei7-64/50_bblayers.conf.inc | 1 - .../machine/intel-corei7-64/50_local.conf.inc | 3 --- .../README_machine_intel-corei7-64.md | 9 ------- 5 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta-agl-bsp/conf/include/agl_intel-corei7-64.inc create mode 120000 templates/machine/intel-corei7-64 delete mode 100644 templates/machine/intel-corei7-64/50_bblayers.conf.inc delete mode 100644 templates/machine/intel-corei7-64/50_local.conf.inc delete mode 100644 templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc deleted file mode 100644 index 1dd7d0f00..000000000 --- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ /dev/null @@ -1,31 +0,0 @@ -# Enable Libvaapi for HW accelerated video support -# -IMAGE_INSTALL_append = " \ - libva \ - intel-vaapi-driver \ - gstreamer1.0-vaapi" - -INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" - -# Modify this file under meta-agl-bsp/meta-intel/wic to change the -# kernel command line, including to change the screen resolution. -WKS_FILE = "systemd-intel-corei7-64-bootdisk.wks" - -PREFERRED_VERSION_linux-intel ?= "4.19%" -PREFERRED_VERSION_linux-intel-rt ?= "4.19%" - -SERIAL_CONSOLES_remove = "115200;ttyS2" - -# -# To avoid corrupt boot screen by systemd message, you can use serial -# console separated from VGA console or disable all boot messages by -# kernel command line. -# -# Configuration for serial console -QB_KERNEL_CMDLINE_APPEND_append = " console=ttyS0,115200n8" -# -# All boot message will be off -QB_KERNEL_CMDLINE_APPEND_append = " quiet" -# -# Force the virtio video device as 'vmware' doesn't always work -QB_OPT_APPEND_append = " -vga virtio" diff --git a/templates/machine/intel-corei7-64 b/templates/machine/intel-corei7-64 new file mode 120000 index 000000000..9d4684394 --- /dev/null +++ b/templates/machine/intel-corei7-64 @@ -0,0 +1 @@ +qemux86-64 \ No newline at end of file diff --git a/templates/machine/intel-corei7-64/50_bblayers.conf.inc b/templates/machine/intel-corei7-64/50_bblayers.conf.inc deleted file mode 100644 index 8fd7af533..000000000 --- a/templates/machine/intel-corei7-64/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-intel" diff --git a/templates/machine/intel-corei7-64/50_local.conf.inc b/templates/machine/intel-corei7-64/50_local.conf.inc deleted file mode 100644 index 48d26c567..000000000 --- a/templates/machine/intel-corei7-64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "intel-corei7-64" -#see meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc -require conf/include/agl_intel-corei7-64.inc diff --git a/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md b/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md deleted file mode 100644 index 5cab9e8f0..000000000 --- a/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine intel-corei7-64 -authors: Dominig ar Foll (Intel Open Source) , Jan-Simon Moeller , Jan-Simon Möller , Ronan Le Martret , Stephane Desneux ---- - -### Machine intel-corei7-64 - -*Description is missing - please complete file meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md* - -- cgit 1.2.3-korg