aboutsummaryrefslogtreecommitdiffstats
path: root/templates/machine
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-19 09:31:58 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-24 08:46:08 +0000
commit0adfa9a2ed1a9838c4170de3ef2fc6356b6dde65 (patch)
treec944cf51d9958ef599b92e098fd7504b4a8b45d6 /templates/machine
parentda4470cdcba9e90ca7a3dbdf418869ebb341feb9 (diff)
Remove meta-intel in favour of qemux86-64 as combined target
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 <jsmoeller@linuxfoundation.org> Change-Id: I65aab61680d982ccfb1d9146bead591a6cfd1dd3 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24792 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
Diffstat (limited to 'templates/machine')
l---------templates/machine/intel-corei7-641
-rw-r--r--templates/machine/intel-corei7-64/50_bblayers.conf.inc1
-rw-r--r--templates/machine/intel-corei7-64/50_local.conf.inc3
-rw-r--r--templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md9
4 files changed, 1 insertions, 13 deletions
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) <dominig.arfoll@fridu.net>, Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>
----
-
-### Machine intel-corei7-64
-
-*Description is missing - please complete file meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md*
-