From f626aa26ed356487707df05713cefd66a8d3efc7 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 24 Nov 2024 16:50:36 -0500 Subject: 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 --- templates/machine/am62xx-evm/20_local.conf.inc | 3 +++ templates/machine/am62xx-evm/50_local.conf.inc | 3 --- templates/machine/aws-ec2-arm64/20_local.conf.inc | 21 +++++++++++++++++++++ templates/machine/aws-ec2-arm64/50_local.conf.inc | 21 --------------------- templates/machine/aws-ec2-x86-64/20_local.conf.inc | 21 +++++++++++++++++++++ templates/machine/aws-ec2-x86-64/50_local.conf.inc | 21 --------------------- templates/machine/bbe/20_local.conf.inc | 2 ++ templates/machine/bbe/50_local.conf.inc | 2 -- templates/machine/beaglebone-ai64/20_local.conf.inc | 3 +++ templates/machine/beaglebone-ai64/50_local.conf.inc | 3 --- templates/machine/beaglebone/20_local.conf.inc | 3 +++ templates/machine/beaglebone/50_local.conf.inc | 3 --- templates/machine/beagleplay/20_local.conf.inc | 3 +++ templates/machine/beagleplay/50_local.conf.inc | 3 --- templates/machine/cubox-i/20_local.conf.inc | 4 ++++ templates/machine/cubox-i/50_local.conf.inc | 4 ---- templates/machine/ebisu/20_local.conf.inc | 3 +++ templates/machine/ebisu/50_local.conf.inc | 3 --- templates/machine/generic-arm64/20_local.conf.inc | 2 ++ templates/machine/generic-arm64/50_local.conf.inc | 2 -- templates/machine/h3-salvator-x/20_local.conf.inc | 4 ++++ templates/machine/h3-salvator-x/50_local.conf.inc | 4 ---- templates/machine/h3ulcb-kf/20_local.conf.inc | 7 +++++++ templates/machine/h3ulcb-kf/50_local.conf.inc | 7 ------- templates/machine/h3ulcb-nogfx/20_local.conf.inc | 3 +++ templates/machine/h3ulcb-nogfx/50_local.conf.inc | 3 --- templates/machine/h3ulcb/20_local.conf.inc | 4 ++++ templates/machine/h3ulcb/50_local.conf.inc | 4 ---- .../machine/imx6qdlsabreauto/20_local.conf.inc | 4 ++++ .../machine/imx6qdlsabreauto/50_local.conf.inc | 4 ---- templates/machine/imx8mq-evk-viv/20_local.conf.inc | 3 +++ templates/machine/imx8mq-evk-viv/50_local.conf.inc | 3 --- templates/machine/imx8mq-evk/20_local.conf.inc | 3 +++ templates/machine/imx8mq-evk/50_local.conf.inc | 3 --- templates/machine/j721e-evm/20_local.conf.inc | 3 +++ templates/machine/j721e-evm/50_local.conf.inc | 3 --- .../jetson-agx-orin-devkit/20_local.conf.inc | 2 ++ .../jetson-agx-orin-devkit/50_local.conf.inc | 2 -- templates/machine/m3-salvator-x/20_local.conf.inc | 4 ++++ templates/machine/m3-salvator-x/50_local.conf.inc | 4 ---- templates/machine/m3ulcb-kf/20_local.conf.inc | 6 ++++++ templates/machine/m3ulcb-kf/50_local.conf.inc | 6 ------ templates/machine/m3ulcb-nogfx/20_local.conf.inc | 3 +++ templates/machine/m3ulcb-nogfx/50_local.conf.inc | 3 --- templates/machine/m3ulcb/20_local.conf.inc | 3 +++ templates/machine/m3ulcb/50_local.conf.inc | 3 --- templates/machine/nanopc-t6/20_local.conf.inc | 3 +++ templates/machine/nanopc-t6/50_local.conf.inc | 3 --- templates/machine/qemuarm/20_local.conf.inc | 3 +++ templates/machine/qemuarm/50_local.conf.inc | 3 --- templates/machine/qemuarm64/20_local.conf.inc | 3 +++ templates/machine/qemuarm64/50_local.conf.inc | 3 --- templates/machine/qemuriscv64/20_local.conf.inc | 3 +++ templates/machine/qemuriscv64/50_local.conf.inc | 3 --- templates/machine/qemux86-64/20_local.conf.inc | 3 +++ templates/machine/qemux86-64/50_local.conf.inc | 3 --- templates/machine/raspberrypi4/20_local.conf.inc | 4 ++++ templates/machine/raspberrypi4/50_local.conf.inc | 4 ---- templates/machine/raspberrypi5/20_local.conf.inc | 4 ++++ templates/machine/raspberrypi5/50_local.conf.inc | 4 ---- templates/machine/s4sk/20_local.conf.inc | 4 ++++ templates/machine/s4sk/50_local.conf.inc | 4 ---- templates/machine/unmatched/20_local.conf.inc | 4 ++++ templates/machine/unmatched/50_local.conf.inc | 4 ---- templates/machine/virtio-aarch64/20_local.conf.inc | 3 +++ templates/machine/virtio-aarch64/50_local.conf.inc | 3 --- templates/machine/visionfive2/20_local.conf.inc | 4 ++++ templates/machine/visionfive2/50_local.conf.inc | 4 ---- 68 files changed, 152 insertions(+), 152 deletions(-) create mode 100644 templates/machine/am62xx-evm/20_local.conf.inc delete mode 100644 templates/machine/am62xx-evm/50_local.conf.inc create mode 100644 templates/machine/aws-ec2-arm64/20_local.conf.inc delete mode 100644 templates/machine/aws-ec2-arm64/50_local.conf.inc create mode 100644 templates/machine/aws-ec2-x86-64/20_local.conf.inc delete mode 100644 templates/machine/aws-ec2-x86-64/50_local.conf.inc create mode 100644 templates/machine/bbe/20_local.conf.inc delete mode 100644 templates/machine/bbe/50_local.conf.inc create mode 100644 templates/machine/beaglebone-ai64/20_local.conf.inc delete mode 100644 templates/machine/beaglebone-ai64/50_local.conf.inc create mode 100644 templates/machine/beaglebone/20_local.conf.inc delete mode 100644 templates/machine/beaglebone/50_local.conf.inc create mode 100644 templates/machine/beagleplay/20_local.conf.inc delete mode 100644 templates/machine/beagleplay/50_local.conf.inc create mode 100644 templates/machine/cubox-i/20_local.conf.inc delete mode 100644 templates/machine/cubox-i/50_local.conf.inc create mode 100644 templates/machine/ebisu/20_local.conf.inc delete mode 100644 templates/machine/ebisu/50_local.conf.inc create mode 100644 templates/machine/generic-arm64/20_local.conf.inc delete mode 100644 templates/machine/generic-arm64/50_local.conf.inc create mode 100644 templates/machine/h3-salvator-x/20_local.conf.inc delete mode 100644 templates/machine/h3-salvator-x/50_local.conf.inc create mode 100644 templates/machine/h3ulcb-kf/20_local.conf.inc delete mode 100644 templates/machine/h3ulcb-kf/50_local.conf.inc create mode 100644 templates/machine/h3ulcb-nogfx/20_local.conf.inc delete mode 100644 templates/machine/h3ulcb-nogfx/50_local.conf.inc create mode 100644 templates/machine/h3ulcb/20_local.conf.inc delete mode 100644 templates/machine/h3ulcb/50_local.conf.inc create mode 100644 templates/machine/imx6qdlsabreauto/20_local.conf.inc delete mode 100644 templates/machine/imx6qdlsabreauto/50_local.conf.inc create mode 100644 templates/machine/imx8mq-evk-viv/20_local.conf.inc delete mode 100644 templates/machine/imx8mq-evk-viv/50_local.conf.inc create mode 100644 templates/machine/imx8mq-evk/20_local.conf.inc delete mode 100644 templates/machine/imx8mq-evk/50_local.conf.inc create mode 100644 templates/machine/j721e-evm/20_local.conf.inc delete mode 100644 templates/machine/j721e-evm/50_local.conf.inc create mode 100644 templates/machine/jetson-agx-orin-devkit/20_local.conf.inc delete mode 100644 templates/machine/jetson-agx-orin-devkit/50_local.conf.inc create mode 100644 templates/machine/m3-salvator-x/20_local.conf.inc delete mode 100644 templates/machine/m3-salvator-x/50_local.conf.inc create mode 100644 templates/machine/m3ulcb-kf/20_local.conf.inc delete mode 100644 templates/machine/m3ulcb-kf/50_local.conf.inc create mode 100644 templates/machine/m3ulcb-nogfx/20_local.conf.inc delete mode 100644 templates/machine/m3ulcb-nogfx/50_local.conf.inc create mode 100644 templates/machine/m3ulcb/20_local.conf.inc delete mode 100644 templates/machine/m3ulcb/50_local.conf.inc create mode 100644 templates/machine/nanopc-t6/20_local.conf.inc delete mode 100644 templates/machine/nanopc-t6/50_local.conf.inc create mode 100644 templates/machine/qemuarm/20_local.conf.inc delete mode 100644 templates/machine/qemuarm/50_local.conf.inc create mode 100644 templates/machine/qemuarm64/20_local.conf.inc delete mode 100644 templates/machine/qemuarm64/50_local.conf.inc create mode 100644 templates/machine/qemuriscv64/20_local.conf.inc delete mode 100644 templates/machine/qemuriscv64/50_local.conf.inc create mode 100644 templates/machine/qemux86-64/20_local.conf.inc delete mode 100644 templates/machine/qemux86-64/50_local.conf.inc create mode 100644 templates/machine/raspberrypi4/20_local.conf.inc delete mode 100644 templates/machine/raspberrypi4/50_local.conf.inc create mode 100644 templates/machine/raspberrypi5/20_local.conf.inc delete mode 100644 templates/machine/raspberrypi5/50_local.conf.inc create mode 100644 templates/machine/s4sk/20_local.conf.inc delete mode 100644 templates/machine/s4sk/50_local.conf.inc create mode 100644 templates/machine/unmatched/20_local.conf.inc delete mode 100644 templates/machine/unmatched/50_local.conf.inc create mode 100644 templates/machine/virtio-aarch64/20_local.conf.inc delete mode 100644 templates/machine/virtio-aarch64/50_local.conf.inc create mode 100644 templates/machine/visionfive2/20_local.conf.inc delete mode 100644 templates/machine/visionfive2/50_local.conf.inc diff --git a/templates/machine/am62xx-evm/20_local.conf.inc b/templates/machine/am62xx-evm/20_local.conf.inc new file mode 100644 index 000000000..782d11a76 --- /dev/null +++ b/templates/machine/am62xx-evm/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "am62xx-evm" +#see meta-agl/meta-agl-bsp/conf/include/agl_am62xx-evm.inc +require conf/include/agl_am62xx-evm.inc diff --git a/templates/machine/am62xx-evm/50_local.conf.inc b/templates/machine/am62xx-evm/50_local.conf.inc deleted file mode 100644 index 782d11a76..000000000 --- a/templates/machine/am62xx-evm/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "am62xx-evm" -#see meta-agl/meta-agl-bsp/conf/include/agl_am62xx-evm.inc -require conf/include/agl_am62xx-evm.inc diff --git a/templates/machine/aws-ec2-arm64/20_local.conf.inc b/templates/machine/aws-ec2-arm64/20_local.conf.inc new file mode 100644 index 000000000..ca20e0bf2 --- /dev/null +++ b/templates/machine/aws-ec2-arm64/20_local.conf.inc @@ -0,0 +1,21 @@ +MACHINE = "aws-ec2-arm64" + +VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" +IMAGE_INSTALL:append = " cloud-init" +DISTRO_FEATURES:append = " virtualization" + + +# can we shuffle this out so CI still works +INHERIT += "extrausers" +# Hardening: Locking the root password. Creating the user without password for ssh key-based login only +EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user" + +EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh" + +# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs +EXTRA_IMAGE_FEATURES:remove = "debug-tweaks" + +AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd" + +# workaround bug in cloud-init leading to empty cloud-init-systemd package +PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init" diff --git a/templates/machine/aws-ec2-arm64/50_local.conf.inc b/templates/machine/aws-ec2-arm64/50_local.conf.inc deleted file mode 100644 index ca20e0bf2..000000000 --- a/templates/machine/aws-ec2-arm64/50_local.conf.inc +++ /dev/null @@ -1,21 +0,0 @@ -MACHINE = "aws-ec2-arm64" - -VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" -IMAGE_INSTALL:append = " cloud-init" -DISTRO_FEATURES:append = " virtualization" - - -# can we shuffle this out so CI still works -INHERIT += "extrausers" -# Hardening: Locking the root password. Creating the user without password for ssh key-based login only -EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user" - -EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh" - -# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs -EXTRA_IMAGE_FEATURES:remove = "debug-tweaks" - -AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd" - -# workaround bug in cloud-init leading to empty cloud-init-systemd package -PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init" diff --git a/templates/machine/aws-ec2-x86-64/20_local.conf.inc b/templates/machine/aws-ec2-x86-64/20_local.conf.inc new file mode 100644 index 000000000..58b4b087d --- /dev/null +++ b/templates/machine/aws-ec2-x86-64/20_local.conf.inc @@ -0,0 +1,21 @@ +MACHINE = "aws-ec2-x86-64" + +VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" +IMAGE_INSTALL:append = " cloud-init" +DISTRO_FEATURES:append = " virtualization" + + +# can we shuffle this out so CI still works +INHERIT += "extrausers" +# Hardening: Locking the root password. Creating the user without password for ssh key-based login only +EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user" + +EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh" + +# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs +EXTRA_IMAGE_FEATURES:remove = "debug-tweaks" + +AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd" + +# workaround bug in cloud-init leading to empty cloud-init-systemd package +PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init" diff --git a/templates/machine/aws-ec2-x86-64/50_local.conf.inc b/templates/machine/aws-ec2-x86-64/50_local.conf.inc deleted file mode 100644 index 58b4b087d..000000000 --- a/templates/machine/aws-ec2-x86-64/50_local.conf.inc +++ /dev/null @@ -1,21 +0,0 @@ -MACHINE = "aws-ec2-x86-64" - -VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" -IMAGE_INSTALL:append = " cloud-init" -DISTRO_FEATURES:append = " virtualization" - - -# can we shuffle this out so CI still works -INHERIT += "extrausers" -# Hardening: Locking the root password. Creating the user without password for ssh key-based login only -EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user" - -EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh" - -# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs -EXTRA_IMAGE_FEATURES:remove = "debug-tweaks" - -AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd" - -# workaround bug in cloud-init leading to empty cloud-init-systemd package -PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init" diff --git a/templates/machine/bbe/20_local.conf.inc b/templates/machine/bbe/20_local.conf.inc new file mode 100644 index 000000000..7f378e5cb --- /dev/null +++ b/templates/machine/bbe/20_local.conf.inc @@ -0,0 +1,2 @@ +MACHINE = "bbe" +require conf/include/agl_bbe.inc diff --git a/templates/machine/bbe/50_local.conf.inc b/templates/machine/bbe/50_local.conf.inc deleted file mode 100644 index 7f378e5cb..000000000 --- a/templates/machine/bbe/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE = "bbe" -require conf/include/agl_bbe.inc diff --git a/templates/machine/beaglebone-ai64/20_local.conf.inc b/templates/machine/beaglebone-ai64/20_local.conf.inc new file mode 100644 index 000000000..80d4aac97 --- /dev/null +++ b/templates/machine/beaglebone-ai64/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "beaglebone-ai64" +#see meta-agl/meta-agl-bsp/conf/include/agl_beaglebone-ai64.inc +require conf/include/agl_beaglebone-ai64.inc diff --git a/templates/machine/beaglebone-ai64/50_local.conf.inc b/templates/machine/beaglebone-ai64/50_local.conf.inc deleted file mode 100644 index 80d4aac97..000000000 --- a/templates/machine/beaglebone-ai64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "beaglebone-ai64" -#see meta-agl/meta-agl-bsp/conf/include/agl_beaglebone-ai64.inc -require conf/include/agl_beaglebone-ai64.inc diff --git a/templates/machine/beaglebone/20_local.conf.inc b/templates/machine/beaglebone/20_local.conf.inc new file mode 100644 index 000000000..54edffefd --- /dev/null +++ b/templates/machine/beaglebone/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "beaglebone" +#see meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc +require conf/include/agl_beaglebone.inc diff --git a/templates/machine/beaglebone/50_local.conf.inc b/templates/machine/beaglebone/50_local.conf.inc deleted file mode 100644 index 54edffefd..000000000 --- a/templates/machine/beaglebone/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "beaglebone" -#see meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc -require conf/include/agl_beaglebone.inc diff --git a/templates/machine/beagleplay/20_local.conf.inc b/templates/machine/beagleplay/20_local.conf.inc new file mode 100644 index 000000000..334f81819 --- /dev/null +++ b/templates/machine/beagleplay/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "beagleplay" +#see meta-agl/meta-agl-bsp/conf/include/agl_beagleplay.inc +require conf/include/agl_beagleplay.inc diff --git a/templates/machine/beagleplay/50_local.conf.inc b/templates/machine/beagleplay/50_local.conf.inc deleted file mode 100644 index 334f81819..000000000 --- a/templates/machine/beagleplay/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "beagleplay" -#see meta-agl/meta-agl-bsp/conf/include/agl_beagleplay.inc -require conf/include/agl_beagleplay.inc diff --git a/templates/machine/cubox-i/20_local.conf.inc b/templates/machine/cubox-i/20_local.conf.inc new file mode 100644 index 000000000..b0835bf6e --- /dev/null +++ b/templates/machine/cubox-i/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "cubox-i" +#see meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc +require conf/include/agl_cubox-i.inc + diff --git a/templates/machine/cubox-i/50_local.conf.inc b/templates/machine/cubox-i/50_local.conf.inc deleted file mode 100644 index b0835bf6e..000000000 --- a/templates/machine/cubox-i/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "cubox-i" -#see meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc -require conf/include/agl_cubox-i.inc - diff --git a/templates/machine/ebisu/20_local.conf.inc b/templates/machine/ebisu/20_local.conf.inc new file mode 100644 index 000000000..c62dec4ae --- /dev/null +++ b/templates/machine/ebisu/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "ebisu" +#see meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc +require conf/include/agl_ebisu.inc diff --git a/templates/machine/ebisu/50_local.conf.inc b/templates/machine/ebisu/50_local.conf.inc deleted file mode 100644 index c62dec4ae..000000000 --- a/templates/machine/ebisu/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "ebisu" -#see meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc -require conf/include/agl_ebisu.inc diff --git a/templates/machine/generic-arm64/20_local.conf.inc b/templates/machine/generic-arm64/20_local.conf.inc new file mode 100644 index 000000000..3918af8dd --- /dev/null +++ b/templates/machine/generic-arm64/20_local.conf.inc @@ -0,0 +1,2 @@ +MACHINE = "generic-arm64" + diff --git a/templates/machine/generic-arm64/50_local.conf.inc b/templates/machine/generic-arm64/50_local.conf.inc deleted file mode 100644 index 3918af8dd..000000000 --- a/templates/machine/generic-arm64/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE = "generic-arm64" - diff --git a/templates/machine/h3-salvator-x/20_local.conf.inc b/templates/machine/h3-salvator-x/20_local.conf.inc new file mode 100644 index 000000000..05cca9743 --- /dev/null +++ b/templates/machine/h3-salvator-x/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "salvator-x" +#see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc +require conf/include/agl_h3-salvator-x.inc + diff --git a/templates/machine/h3-salvator-x/50_local.conf.inc b/templates/machine/h3-salvator-x/50_local.conf.inc deleted file mode 100644 index 05cca9743..000000000 --- a/templates/machine/h3-salvator-x/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "salvator-x" -#see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc -require conf/include/agl_h3-salvator-x.inc - diff --git a/templates/machine/h3ulcb-kf/20_local.conf.inc b/templates/machine/h3ulcb-kf/20_local.conf.inc new file mode 100644 index 000000000..43e117372 --- /dev/null +++ b/templates/machine/h3ulcb-kf/20_local.conf.inc @@ -0,0 +1,7 @@ +MACHINE = "h3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc +require conf/include/agl_h3ulcb.inc + +#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +require conf/include/rcar-gen3-adas.inc + diff --git a/templates/machine/h3ulcb-kf/50_local.conf.inc b/templates/machine/h3ulcb-kf/50_local.conf.inc deleted file mode 100644 index 43e117372..000000000 --- a/templates/machine/h3ulcb-kf/50_local.conf.inc +++ /dev/null @@ -1,7 +0,0 @@ -MACHINE = "h3ulcb" -#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc -require conf/include/agl_h3ulcb.inc - -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc - diff --git a/templates/machine/h3ulcb-nogfx/20_local.conf.inc b/templates/machine/h3ulcb-nogfx/20_local.conf.inc new file mode 100644 index 000000000..2f7cd6b35 --- /dev/null +++ b/templates/machine/h3ulcb-nogfx/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "h3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc +require conf/include/agl_h3ulcb-nogfx.inc diff --git a/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/50_local.conf.inc deleted file mode 100644 index 2f7cd6b35..000000000 --- a/templates/machine/h3ulcb-nogfx/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "h3ulcb" -#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc -require conf/include/agl_h3ulcb-nogfx.inc diff --git a/templates/machine/h3ulcb/20_local.conf.inc b/templates/machine/h3ulcb/20_local.conf.inc new file mode 100644 index 000000000..4bb2a8219 --- /dev/null +++ b/templates/machine/h3ulcb/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "h3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc +require conf/include/agl_h3ulcb.inc + diff --git a/templates/machine/h3ulcb/50_local.conf.inc b/templates/machine/h3ulcb/50_local.conf.inc deleted file mode 100644 index 4bb2a8219..000000000 --- a/templates/machine/h3ulcb/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "h3ulcb" -#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc -require conf/include/agl_h3ulcb.inc - diff --git a/templates/machine/imx6qdlsabreauto/20_local.conf.inc b/templates/machine/imx6qdlsabreauto/20_local.conf.inc new file mode 100644 index 000000000..58e3c7d02 --- /dev/null +++ b/templates/machine/imx6qdlsabreauto/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "imx6qdlsabreauto" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc +require conf/include/agl_imx6qdlsabreauto.inc + diff --git a/templates/machine/imx6qdlsabreauto/50_local.conf.inc b/templates/machine/imx6qdlsabreauto/50_local.conf.inc deleted file mode 100644 index 58e3c7d02..000000000 --- a/templates/machine/imx6qdlsabreauto/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "imx6qdlsabreauto" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc -require conf/include/agl_imx6qdlsabreauto.inc - diff --git a/templates/machine/imx8mq-evk-viv/20_local.conf.inc b/templates/machine/imx8mq-evk-viv/20_local.conf.inc new file mode 100644 index 000000000..7504c1120 --- /dev/null +++ b/templates/machine/imx8mq-evk-viv/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "imx8mq-evk" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc +require conf/include/agl_imx8mq-evk-viv.inc diff --git a/templates/machine/imx8mq-evk-viv/50_local.conf.inc b/templates/machine/imx8mq-evk-viv/50_local.conf.inc deleted file mode 100644 index 7504c1120..000000000 --- a/templates/machine/imx8mq-evk-viv/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "imx8mq-evk" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc -require conf/include/agl_imx8mq-evk-viv.inc diff --git a/templates/machine/imx8mq-evk/20_local.conf.inc b/templates/machine/imx8mq-evk/20_local.conf.inc new file mode 100644 index 000000000..8a178e28b --- /dev/null +++ b/templates/machine/imx8mq-evk/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "imx8mq-evk" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc +require conf/include/agl_imx8mq-evk.inc diff --git a/templates/machine/imx8mq-evk/50_local.conf.inc b/templates/machine/imx8mq-evk/50_local.conf.inc deleted file mode 100644 index 8a178e28b..000000000 --- a/templates/machine/imx8mq-evk/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "imx8mq-evk" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc -require conf/include/agl_imx8mq-evk.inc diff --git a/templates/machine/j721e-evm/20_local.conf.inc b/templates/machine/j721e-evm/20_local.conf.inc new file mode 100644 index 000000000..917ca73a7 --- /dev/null +++ b/templates/machine/j721e-evm/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "j721e-evm" +#see meta-agl/meta-agl-bsp/conf/include/agl_j721e-evm.inc +require conf/include/agl_j721e-evm.inc diff --git a/templates/machine/j721e-evm/50_local.conf.inc b/templates/machine/j721e-evm/50_local.conf.inc deleted file mode 100644 index 917ca73a7..000000000 --- a/templates/machine/j721e-evm/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "j721e-evm" -#see meta-agl/meta-agl-bsp/conf/include/agl_j721e-evm.inc -require conf/include/agl_j721e-evm.inc diff --git a/templates/machine/jetson-agx-orin-devkit/20_local.conf.inc b/templates/machine/jetson-agx-orin-devkit/20_local.conf.inc new file mode 100644 index 000000000..c04fcd76a --- /dev/null +++ b/templates/machine/jetson-agx-orin-devkit/20_local.conf.inc @@ -0,0 +1,2 @@ +MACHINE = "jetson-agx-orin-devkit" +require conf/include/agl_jetson-agx-orin-devkit.inc diff --git a/templates/machine/jetson-agx-orin-devkit/50_local.conf.inc b/templates/machine/jetson-agx-orin-devkit/50_local.conf.inc deleted file mode 100644 index c04fcd76a..000000000 --- a/templates/machine/jetson-agx-orin-devkit/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE = "jetson-agx-orin-devkit" -require conf/include/agl_jetson-agx-orin-devkit.inc diff --git a/templates/machine/m3-salvator-x/20_local.conf.inc b/templates/machine/m3-salvator-x/20_local.conf.inc new file mode 100644 index 000000000..82766fd5e --- /dev/null +++ b/templates/machine/m3-salvator-x/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "salvator-x" +#see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc +require conf/include/agl_m3-salvator-x.inc + diff --git a/templates/machine/m3-salvator-x/50_local.conf.inc b/templates/machine/m3-salvator-x/50_local.conf.inc deleted file mode 100644 index 82766fd5e..000000000 --- a/templates/machine/m3-salvator-x/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "salvator-x" -#see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc -require conf/include/agl_m3-salvator-x.inc - diff --git a/templates/machine/m3ulcb-kf/20_local.conf.inc b/templates/machine/m3ulcb-kf/20_local.conf.inc new file mode 100644 index 000000000..e2fe41a8a --- /dev/null +++ b/templates/machine/m3ulcb-kf/20_local.conf.inc @@ -0,0 +1,6 @@ +MACHINE = "m3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc +require conf/include/agl_m3ulcb.inc + +#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +require conf/include/rcar-gen3-adas.inc diff --git a/templates/machine/m3ulcb-kf/50_local.conf.inc b/templates/machine/m3ulcb-kf/50_local.conf.inc deleted file mode 100644 index e2fe41a8a..000000000 --- a/templates/machine/m3ulcb-kf/50_local.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -MACHINE = "m3ulcb" -#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc -require conf/include/agl_m3ulcb.inc - -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc diff --git a/templates/machine/m3ulcb-nogfx/20_local.conf.inc b/templates/machine/m3ulcb-nogfx/20_local.conf.inc new file mode 100644 index 000000000..521dedb46 --- /dev/null +++ b/templates/machine/m3ulcb-nogfx/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "m3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +require conf/include/agl_m3ulcb-nogfx.inc diff --git a/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/templates/machine/m3ulcb-nogfx/50_local.conf.inc deleted file mode 100644 index 521dedb46..000000000 --- a/templates/machine/m3ulcb-nogfx/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "m3ulcb" -#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc -require conf/include/agl_m3ulcb-nogfx.inc diff --git a/templates/machine/m3ulcb/20_local.conf.inc b/templates/machine/m3ulcb/20_local.conf.inc new file mode 100644 index 000000000..c75bc5311 --- /dev/null +++ b/templates/machine/m3ulcb/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "m3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc +require conf/include/agl_m3ulcb.inc diff --git a/templates/machine/m3ulcb/50_local.conf.inc b/templates/machine/m3ulcb/50_local.conf.inc deleted file mode 100644 index c75bc5311..000000000 --- a/templates/machine/m3ulcb/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "m3ulcb" -#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc -require conf/include/agl_m3ulcb.inc diff --git a/templates/machine/nanopc-t6/20_local.conf.inc b/templates/machine/nanopc-t6/20_local.conf.inc new file mode 100644 index 000000000..aa95de143 --- /dev/null +++ b/templates/machine/nanopc-t6/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "rockchip-rk3588-nanopc-t6" + +require conf/include/agl_rk3588.inc diff --git a/templates/machine/nanopc-t6/50_local.conf.inc b/templates/machine/nanopc-t6/50_local.conf.inc deleted file mode 100644 index aa95de143..000000000 --- a/templates/machine/nanopc-t6/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "rockchip-rk3588-nanopc-t6" - -require conf/include/agl_rk3588.inc diff --git a/templates/machine/qemuarm/20_local.conf.inc b/templates/machine/qemuarm/20_local.conf.inc new file mode 100644 index 000000000..84204fb8c --- /dev/null +++ b/templates/machine/qemuarm/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "qemuarm" +#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc +require conf/include/agl_qemuarm.inc diff --git a/templates/machine/qemuarm/50_local.conf.inc b/templates/machine/qemuarm/50_local.conf.inc deleted file mode 100644 index 84204fb8c..000000000 --- a/templates/machine/qemuarm/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "qemuarm" -#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc -require conf/include/agl_qemuarm.inc diff --git a/templates/machine/qemuarm64/20_local.conf.inc b/templates/machine/qemuarm64/20_local.conf.inc new file mode 100644 index 000000000..65605b530 --- /dev/null +++ b/templates/machine/qemuarm64/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "qemuarm64" +#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc +require conf/include/agl_qemuarm64.inc diff --git a/templates/machine/qemuarm64/50_local.conf.inc b/templates/machine/qemuarm64/50_local.conf.inc deleted file mode 100644 index 65605b530..000000000 --- a/templates/machine/qemuarm64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "qemuarm64" -#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc -require conf/include/agl_qemuarm64.inc diff --git a/templates/machine/qemuriscv64/20_local.conf.inc b/templates/machine/qemuriscv64/20_local.conf.inc new file mode 100644 index 000000000..5eba64f0d --- /dev/null +++ b/templates/machine/qemuriscv64/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "qemuriscv64" +#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc +require conf/include/agl_qemuriscv64.inc diff --git a/templates/machine/qemuriscv64/50_local.conf.inc b/templates/machine/qemuriscv64/50_local.conf.inc deleted file mode 100644 index 5eba64f0d..000000000 --- a/templates/machine/qemuriscv64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "qemuriscv64" -#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc -require conf/include/agl_qemuriscv64.inc diff --git a/templates/machine/qemux86-64/20_local.conf.inc b/templates/machine/qemux86-64/20_local.conf.inc new file mode 100644 index 000000000..497a3467d --- /dev/null +++ b/templates/machine/qemux86-64/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "qemux86-64" +#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc +require conf/include/agl_qemux86-64.inc diff --git a/templates/machine/qemux86-64/50_local.conf.inc b/templates/machine/qemux86-64/50_local.conf.inc deleted file mode 100644 index 497a3467d..000000000 --- a/templates/machine/qemux86-64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "qemux86-64" -#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc -require conf/include/agl_qemux86-64.inc diff --git a/templates/machine/raspberrypi4/20_local.conf.inc b/templates/machine/raspberrypi4/20_local.conf.inc new file mode 100644 index 000000000..e12f4a4a3 --- /dev/null +++ b/templates/machine/raspberrypi4/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "raspberrypi4-64" + +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +require conf/include/agl_raspberrypi4.inc diff --git a/templates/machine/raspberrypi4/50_local.conf.inc b/templates/machine/raspberrypi4/50_local.conf.inc deleted file mode 100644 index e12f4a4a3..000000000 --- a/templates/machine/raspberrypi4/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "raspberrypi4-64" - -#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc -require conf/include/agl_raspberrypi4.inc diff --git a/templates/machine/raspberrypi5/20_local.conf.inc b/templates/machine/raspberrypi5/20_local.conf.inc new file mode 100644 index 000000000..9ee2644ab --- /dev/null +++ b/templates/machine/raspberrypi5/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "raspberrypi5" + +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi5.inc +require conf/include/agl_raspberrypi5.inc diff --git a/templates/machine/raspberrypi5/50_local.conf.inc b/templates/machine/raspberrypi5/50_local.conf.inc deleted file mode 100644 index 9ee2644ab..000000000 --- a/templates/machine/raspberrypi5/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "raspberrypi5" - -#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi5.inc -require conf/include/agl_raspberrypi5.inc diff --git a/templates/machine/s4sk/20_local.conf.inc b/templates/machine/s4sk/20_local.conf.inc new file mode 100644 index 000000000..b804b3845 --- /dev/null +++ b/templates/machine/s4sk/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "s4sk" +#see meta-agl/meta-agl-bsp/conf/include/agl_s4sk.inc +require conf/include/agl_s4sk.inc + diff --git a/templates/machine/s4sk/50_local.conf.inc b/templates/machine/s4sk/50_local.conf.inc deleted file mode 100644 index b804b3845..000000000 --- a/templates/machine/s4sk/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "s4sk" -#see meta-agl/meta-agl-bsp/conf/include/agl_s4sk.inc -require conf/include/agl_s4sk.inc - diff --git a/templates/machine/unmatched/20_local.conf.inc b/templates/machine/unmatched/20_local.conf.inc new file mode 100644 index 000000000..c4d2b3ae5 --- /dev/null +++ b/templates/machine/unmatched/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "unmatched" + +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +require conf/include/agl_unmatched.inc diff --git a/templates/machine/unmatched/50_local.conf.inc b/templates/machine/unmatched/50_local.conf.inc deleted file mode 100644 index c4d2b3ae5..000000000 --- a/templates/machine/unmatched/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "unmatched" - -#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc -require conf/include/agl_unmatched.inc diff --git a/templates/machine/virtio-aarch64/20_local.conf.inc b/templates/machine/virtio-aarch64/20_local.conf.inc new file mode 100644 index 000000000..3328d6ab8 --- /dev/null +++ b/templates/machine/virtio-aarch64/20_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "virtio-aarch64" +# see meta-agl/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc +require conf/include/agl_virtio-aarch64.inc diff --git a/templates/machine/virtio-aarch64/50_local.conf.inc b/templates/machine/virtio-aarch64/50_local.conf.inc deleted file mode 100644 index 3328d6ab8..000000000 --- a/templates/machine/virtio-aarch64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "virtio-aarch64" -# see meta-agl/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc -require conf/include/agl_virtio-aarch64.inc diff --git a/templates/machine/visionfive2/20_local.conf.inc b/templates/machine/visionfive2/20_local.conf.inc new file mode 100644 index 000000000..9e7af0b81 --- /dev/null +++ b/templates/machine/visionfive2/20_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "visionfive2" + +#see meta-agl/meta-agl-bsp/conf/include/agl_unmatched.inc +require conf/include/agl_visionfive2.inc diff --git a/templates/machine/visionfive2/50_local.conf.inc b/templates/machine/visionfive2/50_local.conf.inc deleted file mode 100644 index 9e7af0b81..000000000 --- a/templates/machine/visionfive2/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "visionfive2" - -#see meta-agl/meta-agl-bsp/conf/include/agl_unmatched.inc -require conf/include/agl_visionfive2.inc -- cgit