| Message ID | 20230525200602.3277592-2-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] CI: move FVP license auto-accept to fvp.yml | expand |
diff --git a/ci/base.yml b/ci/base.yml index 26fbb602..92fa7074 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -30,7 +30,6 @@ local_conf_header: setup: | PACKAGE_CLASSES = "package_ipk" PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" - EXTRA_IMAGE_FEATURES:append = " debug-tweaks" PACKAGECONFIG:append:pn-perf = " coresight" INHERIT += "rm_work" DISTRO_FEATURES:remove = "ptest" diff --git a/ci/testimage.yml b/ci/testimage.yml index d7de7d06..b4b5599b 100644 --- a/ci/testimage.yml +++ b/ci/testimage.yml @@ -3,6 +3,7 @@ header: local_conf_header: testimage: | + EXTRA_IMAGE_FEATURES:append = " debug-tweaks" IMAGE_CLASSES += "testimage" TESTIMAGE_AUTO = "1" kvm: | diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index c13c86c0..4794028a 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -17,7 +17,6 @@ PREFERRED_VERSION_linux-yocto ?= "6.1%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" IMAGE_CLASSES += "wic_nopt" -IMAGE_FEATURES += "debug-tweaks" IMAGE_FSTYPES:forcevariable = "cpio.gz squashfs wic wic.nopt" SERIAL_CONSOLES = "115200;ttyAMA0" diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb index 46427b74..884d4b3b 100644 --- a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb @@ -15,8 +15,6 @@ inherit core-image inherit image-buildinfo -IMAGE_FEATURES += "debug-tweaks" - #package management is not supported in corstone1000 IMAGE_FEATURES:remove = "package-management"
debug-tweaks is useful in testing and internal usage, but is a massive security hole (as it allow password-less root login). Remove the default enablement on machine files and in kas base yml. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ci/base.yml | 1 - ci/testimage.yml | 1 + meta-arm-bsp/conf/machine/corstone500.conf | 1 - meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb | 2 -- 4 files changed, 1 insertion(+), 4 deletions(-)