From: Scott Murray Date: Sun, 24 Nov 2024 21:50:36 +0000 (-0500) Subject: Update machine local.conf fragment numbering X-Git-Tag: 18.91.0~1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=f626aa26ed356487707df05713cefd66a8d3efc7;p=AGL%2Fmeta-agl.git 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30545 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- diff --git a/templates/machine/am62xx-evm/50_local.conf.inc b/templates/machine/am62xx-evm/20_local.conf.inc similarity index 100% rename from templates/machine/am62xx-evm/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/aws-ec2-arm64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/aws-ec2-x86-64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/bbe/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/beaglebone-ai64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/beaglebone/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/beagleplay/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/cubox-i/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/ebisu/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/generic-arm64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/h3-salvator-x/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/h3ulcb-kf/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/h3ulcb-nogfx/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/h3ulcb/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/imx6qdlsabreauto/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/imx8mq-evk-viv/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/imx8mq-evk/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/j721e-evm/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/jetson-agx-orin-devkit/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/m3-salvator-x/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/m3ulcb-kf/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/m3ulcb-nogfx/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/m3ulcb/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/nanopc-t6/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/qemuarm/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/qemuarm64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/qemuriscv64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/qemux86-64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/raspberrypi4/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/raspberrypi5/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/s4sk/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/unmatched/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/virtio-aarch64/50_local.conf.inc rename to 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 similarity index 100% rename from templates/machine/visionfive2/50_local.conf.inc rename to templates/machine/visionfive2/20_local.conf.inc