summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-11-24 16:50:36 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-11-25 11:23:11 +0000
commitf626aa26ed356487707df05713cefd66a8d3efc7 (patch)
tree512cd6c52befb8fe31cd208bacc24eb7a9421ae2
parentb966ab7f6cbb1c4b0f7bedd35b92499435e1f50d (diff)
Update machine local.conf fragment numbering
Lower numbering of the local.conf fragments in the machine templates so they will be guaranteed to be before feature added fragments as opposed to mixed in with them. This allows referring to MACHINE in feature fragments in a stable fashion, and makes the generated local.conf a bit more readable. Bug-AGL: SPEC-5306 Change-Id: I193027dfeadda20fee1f74f925d980378ea076f5 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30545 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account
-rw-r--r--templates/machine/am62xx-evm/20_local.conf.inc (renamed from templates/machine/am62xx-evm/50_local.conf.inc)0
-rw-r--r--templates/machine/aws-ec2-arm64/20_local.conf.inc (renamed from templates/machine/aws-ec2-arm64/50_local.conf.inc)0
-rw-r--r--templates/machine/aws-ec2-x86-64/20_local.conf.inc (renamed from templates/machine/aws-ec2-x86-64/50_local.conf.inc)0
-rw-r--r--templates/machine/bbe/20_local.conf.inc (renamed from templates/machine/bbe/50_local.conf.inc)0
-rw-r--r--templates/machine/beaglebone-ai64/20_local.conf.inc (renamed from templates/machine/beaglebone-ai64/50_local.conf.inc)0
-rw-r--r--templates/machine/beaglebone/20_local.conf.inc (renamed from templates/machine/beaglebone/50_local.conf.inc)0
-rw-r--r--templates/machine/beagleplay/20_local.conf.inc (renamed from templates/machine/beagleplay/50_local.conf.inc)0
-rw-r--r--templates/machine/cubox-i/20_local.conf.inc (renamed from templates/machine/cubox-i/50_local.conf.inc)0
-rw-r--r--templates/machine/ebisu/20_local.conf.inc (renamed from templates/machine/ebisu/50_local.conf.inc)0
-rw-r--r--templates/machine/generic-arm64/20_local.conf.inc (renamed from templates/machine/generic-arm64/50_local.conf.inc)0
-rw-r--r--templates/machine/h3-salvator-x/20_local.conf.inc (renamed from templates/machine/h3-salvator-x/50_local.conf.inc)0
-rw-r--r--templates/machine/h3ulcb-kf/20_local.conf.inc (renamed from templates/machine/h3ulcb-kf/50_local.conf.inc)0
-rw-r--r--templates/machine/h3ulcb-nogfx/20_local.conf.inc (renamed from templates/machine/h3ulcb-nogfx/50_local.conf.inc)0
-rw-r--r--templates/machine/h3ulcb/20_local.conf.inc (renamed from templates/machine/h3ulcb/50_local.conf.inc)0
-rw-r--r--templates/machine/imx6qdlsabreauto/20_local.conf.inc (renamed from templates/machine/imx6qdlsabreauto/50_local.conf.inc)0
-rw-r--r--templates/machine/imx8mq-evk-viv/20_local.conf.inc (renamed from templates/machine/imx8mq-evk-viv/50_local.conf.inc)0
-rw-r--r--templates/machine/imx8mq-evk/20_local.conf.inc (renamed from templates/machine/imx8mq-evk/50_local.conf.inc)0
-rw-r--r--templates/machine/j721e-evm/20_local.conf.inc (renamed from templates/machine/j721e-evm/50_local.conf.inc)0
-rw-r--r--templates/machine/jetson-agx-orin-devkit/20_local.conf.inc (renamed from templates/machine/jetson-agx-orin-devkit/50_local.conf.inc)0
-rw-r--r--templates/machine/m3-salvator-x/20_local.conf.inc (renamed from templates/machine/m3-salvator-x/50_local.conf.inc)0
-rw-r--r--templates/machine/m3ulcb-kf/20_local.conf.inc (renamed from templates/machine/m3ulcb-kf/50_local.conf.inc)0
-rw-r--r--templates/machine/m3ulcb-nogfx/20_local.conf.inc (renamed from templates/machine/m3ulcb-nogfx/50_local.conf.inc)0
-rw-r--r--templates/machine/m3ulcb/20_local.conf.inc (renamed from templates/machine/m3ulcb/50_local.conf.inc)0
-rw-r--r--templates/machine/nanopc-t6/20_local.conf.inc (renamed from templates/machine/nanopc-t6/50_local.conf.inc)0
-rw-r--r--templates/machine/qemuarm/20_local.conf.inc (renamed from templates/machine/qemuarm/50_local.conf.inc)0
-rw-r--r--templates/machine/qemuarm64/20_local.conf.inc (renamed from templates/machine/qemuarm64/50_local.conf.inc)0
-rw-r--r--templates/machine/qemuriscv64/20_local.conf.inc (renamed from templates/machine/qemuriscv64/50_local.conf.inc)0
-rw-r--r--templates/machine/qemux86-64/20_local.conf.inc (renamed from templates/machine/qemux86-64/50_local.conf.inc)0
-rw-r--r--templates/machine/raspberrypi4/20_local.conf.inc (renamed from templates/machine/raspberrypi4/50_local.conf.inc)0
-rw-r--r--templates/machine/raspberrypi5/20_local.conf.inc (renamed from templates/machine/raspberrypi5/50_local.conf.inc)0
-rw-r--r--templates/machine/s4sk/20_local.conf.inc (renamed from templates/machine/s4sk/50_local.conf.inc)0
-rw-r--r--templates/machine/unmatched/20_local.conf.inc (renamed from templates/machine/unmatched/50_local.conf.inc)0
-rw-r--r--templates/machine/virtio-aarch64/20_local.conf.inc (renamed from templates/machine/virtio-aarch64/50_local.conf.inc)0
-rw-r--r--templates/machine/visionfive2/20_local.conf.inc (renamed from templates/machine/visionfive2/50_local.conf.inc)0
34 files changed, 0 insertions, 0 deletions
diff --git a/templates/machine/am62xx-evm/50_local.conf.inc b/templates/machine/am62xx-evm/20_local.conf.inc
index 782d11a76..782d11a76 100644
--- a/templates/machine/am62xx-evm/50_local.conf.inc
+++ b/templates/machine/am62xx-evm/20_local.conf.inc
diff --git a/templates/machine/aws-ec2-arm64/50_local.conf.inc b/templates/machine/aws-ec2-arm64/20_local.conf.inc
index ca20e0bf2..ca20e0bf2 100644
--- a/templates/machine/aws-ec2-arm64/50_local.conf.inc
+++ b/templates/machine/aws-ec2-arm64/20_local.conf.inc
diff --git a/templates/machine/aws-ec2-x86-64/50_local.conf.inc b/templates/machine/aws-ec2-x86-64/20_local.conf.inc
index 58b4b087d..58b4b087d 100644
--- a/templates/machine/aws-ec2-x86-64/50_local.conf.inc
+++ b/templates/machine/aws-ec2-x86-64/20_local.conf.inc
diff --git a/templates/machine/bbe/50_local.conf.inc b/templates/machine/bbe/20_local.conf.inc
index 7f378e5cb..7f378e5cb 100644
--- a/templates/machine/bbe/50_local.conf.inc
+++ b/templates/machine/bbe/20_local.conf.inc
diff --git a/templates/machine/beaglebone-ai64/50_local.conf.inc b/templates/machine/beaglebone-ai64/20_local.conf.inc
index 80d4aac97..80d4aac97 100644
--- a/templates/machine/beaglebone-ai64/50_local.conf.inc
+++ b/templates/machine/beaglebone-ai64/20_local.conf.inc
diff --git a/templates/machine/beaglebone/50_local.conf.inc b/templates/machine/beaglebone/20_local.conf.inc
index 54edffefd..54edffefd 100644
--- a/templates/machine/beaglebone/50_local.conf.inc
+++ b/templates/machine/beaglebone/20_local.conf.inc
diff --git a/templates/machine/beagleplay/50_local.conf.inc b/templates/machine/beagleplay/20_local.conf.inc
index 334f81819..334f81819 100644
--- a/templates/machine/beagleplay/50_local.conf.inc
+++ b/templates/machine/beagleplay/20_local.conf.inc
diff --git a/templates/machine/cubox-i/50_local.conf.inc b/templates/machine/cubox-i/20_local.conf.inc
index b0835bf6e..b0835bf6e 100644
--- a/templates/machine/cubox-i/50_local.conf.inc
+++ b/templates/machine/cubox-i/20_local.conf.inc
diff --git a/templates/machine/ebisu/50_local.conf.inc b/templates/machine/ebisu/20_local.conf.inc
index c62dec4ae..c62dec4ae 100644
--- a/templates/machine/ebisu/50_local.conf.inc
+++ b/templates/machine/ebisu/20_local.conf.inc
diff --git a/templates/machine/generic-arm64/50_local.conf.inc b/templates/machine/generic-arm64/20_local.conf.inc
index 3918af8dd..3918af8dd 100644
--- a/templates/machine/generic-arm64/50_local.conf.inc
+++ b/templates/machine/generic-arm64/20_local.conf.inc
diff --git a/templates/machine/h3-salvator-x/50_local.conf.inc b/templates/machine/h3-salvator-x/20_local.conf.inc
index 05cca9743..05cca9743 100644
--- a/templates/machine/h3-salvator-x/50_local.conf.inc
+++ b/templates/machine/h3-salvator-x/20_local.conf.inc
diff --git a/templates/machine/h3ulcb-kf/50_local.conf.inc b/templates/machine/h3ulcb-kf/20_local.conf.inc
index 43e117372..43e117372 100644
--- a/templates/machine/h3ulcb-kf/50_local.conf.inc
+++ b/templates/machine/h3ulcb-kf/20_local.conf.inc
diff --git a/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/20_local.conf.inc
index 2f7cd6b35..2f7cd6b35 100644
--- a/templates/machine/h3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/20_local.conf.inc
diff --git a/templates/machine/h3ulcb/50_local.conf.inc b/templates/machine/h3ulcb/20_local.conf.inc
index 4bb2a8219..4bb2a8219 100644
--- a/templates/machine/h3ulcb/50_local.conf.inc
+++ b/templates/machine/h3ulcb/20_local.conf.inc
diff --git a/templates/machine/imx6qdlsabreauto/50_local.conf.inc b/templates/machine/imx6qdlsabreauto/20_local.conf.inc
index 58e3c7d02..58e3c7d02 100644
--- a/templates/machine/imx6qdlsabreauto/50_local.conf.inc
+++ b/templates/machine/imx6qdlsabreauto/20_local.conf.inc
diff --git a/templates/machine/imx8mq-evk-viv/50_local.conf.inc b/templates/machine/imx8mq-evk-viv/20_local.conf.inc
index 7504c1120..7504c1120 100644
--- a/templates/machine/imx8mq-evk-viv/50_local.conf.inc
+++ b/templates/machine/imx8mq-evk-viv/20_local.conf.inc
diff --git a/templates/machine/imx8mq-evk/50_local.conf.inc b/templates/machine/imx8mq-evk/20_local.conf.inc
index 8a178e28b..8a178e28b 100644
--- a/templates/machine/imx8mq-evk/50_local.conf.inc
+++ b/templates/machine/imx8mq-evk/20_local.conf.inc
diff --git a/templates/machine/j721e-evm/50_local.conf.inc b/templates/machine/j721e-evm/20_local.conf.inc
index 917ca73a7..917ca73a7 100644
--- a/templates/machine/j721e-evm/50_local.conf.inc
+++ b/templates/machine/j721e-evm/20_local.conf.inc
diff --git a/templates/machine/jetson-agx-orin-devkit/50_local.conf.inc b/templates/machine/jetson-agx-orin-devkit/20_local.conf.inc
index c04fcd76a..c04fcd76a 100644
--- a/templates/machine/jetson-agx-orin-devkit/50_local.conf.inc
+++ b/templates/machine/jetson-agx-orin-devkit/20_local.conf.inc
diff --git a/templates/machine/m3-salvator-x/50_local.conf.inc b/templates/machine/m3-salvator-x/20_local.conf.inc
index 82766fd5e..82766fd5e 100644
--- a/templates/machine/m3-salvator-x/50_local.conf.inc
+++ b/templates/machine/m3-salvator-x/20_local.conf.inc
diff --git a/templates/machine/m3ulcb-kf/50_local.conf.inc b/templates/machine/m3ulcb-kf/20_local.conf.inc
index e2fe41a8a..e2fe41a8a 100644
--- a/templates/machine/m3ulcb-kf/50_local.conf.inc
+++ b/templates/machine/m3ulcb-kf/20_local.conf.inc
diff --git a/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/templates/machine/m3ulcb-nogfx/20_local.conf.inc
index 521dedb46..521dedb46 100644
--- a/templates/machine/m3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/20_local.conf.inc
diff --git a/templates/machine/m3ulcb/50_local.conf.inc b/templates/machine/m3ulcb/20_local.conf.inc
index c75bc5311..c75bc5311 100644
--- a/templates/machine/m3ulcb/50_local.conf.inc
+++ b/templates/machine/m3ulcb/20_local.conf.inc
diff --git a/templates/machine/nanopc-t6/50_local.conf.inc b/templates/machine/nanopc-t6/20_local.conf.inc
index aa95de143..aa95de143 100644
--- a/templates/machine/nanopc-t6/50_local.conf.inc
+++ b/templates/machine/nanopc-t6/20_local.conf.inc
diff --git a/templates/machine/qemuarm/50_local.conf.inc b/templates/machine/qemuarm/20_local.conf.inc
index 84204fb8c..84204fb8c 100644
--- a/templates/machine/qemuarm/50_local.conf.inc
+++ b/templates/machine/qemuarm/20_local.conf.inc
diff --git a/templates/machine/qemuarm64/50_local.conf.inc b/templates/machine/qemuarm64/20_local.conf.inc
index 65605b530..65605b530 100644
--- a/templates/machine/qemuarm64/50_local.conf.inc
+++ b/templates/machine/qemuarm64/20_local.conf.inc
diff --git a/templates/machine/qemuriscv64/50_local.conf.inc b/templates/machine/qemuriscv64/20_local.conf.inc
index 5eba64f0d..5eba64f0d 100644
--- a/templates/machine/qemuriscv64/50_local.conf.inc
+++ b/templates/machine/qemuriscv64/20_local.conf.inc
diff --git a/templates/machine/qemux86-64/50_local.conf.inc b/templates/machine/qemux86-64/20_local.conf.inc
index 497a3467d..497a3467d 100644
--- a/templates/machine/qemux86-64/50_local.conf.inc
+++ b/templates/machine/qemux86-64/20_local.conf.inc
diff --git a/templates/machine/raspberrypi4/50_local.conf.inc b/templates/machine/raspberrypi4/20_local.conf.inc
index e12f4a4a3..e12f4a4a3 100644
--- a/templates/machine/raspberrypi4/50_local.conf.inc
+++ b/templates/machine/raspberrypi4/20_local.conf.inc
diff --git a/templates/machine/raspberrypi5/50_local.conf.inc b/templates/machine/raspberrypi5/20_local.conf.inc
index 9ee2644ab..9ee2644ab 100644
--- a/templates/machine/raspberrypi5/50_local.conf.inc
+++ b/templates/machine/raspberrypi5/20_local.conf.inc
diff --git a/templates/machine/s4sk/50_local.conf.inc b/templates/machine/s4sk/20_local.conf.inc
index b804b3845..b804b3845 100644
--- a/templates/machine/s4sk/50_local.conf.inc
+++ b/templates/machine/s4sk/20_local.conf.inc
diff --git a/templates/machine/unmatched/50_local.conf.inc b/templates/machine/unmatched/20_local.conf.inc
index c4d2b3ae5..c4d2b3ae5 100644
--- a/templates/machine/unmatched/50_local.conf.inc
+++ b/templates/machine/unmatched/20_local.conf.inc
diff --git a/templates/machine/virtio-aarch64/50_local.conf.inc b/templates/machine/virtio-aarch64/20_local.conf.inc
index 3328d6ab8..3328d6ab8 100644
--- a/templates/machine/virtio-aarch64/50_local.conf.inc
+++ b/templates/machine/virtio-aarch64/20_local.conf.inc
diff --git a/templates/machine/visionfive2/50_local.conf.inc b/templates/machine/visionfive2/20_local.conf.inc
index 9e7af0b81..9e7af0b81 100644
--- a/templates/machine/visionfive2/50_local.conf.inc
+++ b/templates/machine/visionfive2/20_local.conf.inc