ci: minor cleanup (#1915)

Follow-up:
#1900
#1903

Author: lumag

ci/base.yml

@@ -52,7 +52,7 @@ local_conf_header:
     IMAGE_FSTYPES += "qcomflash"
   extra: |
     DISTRO_FEATURES:append = " efi pam pni-names"
-    EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login"
+    EXTRA_IMAGE_FEATURES += "allow-empty-password empty-root-password allow-root-login"
     IMAGE_ROOTFS_EXTRA_SPACE = "307200"
     WATCHDOG_RUNTIME_SEC:pn-systemd = "30"
 

ci/ci.yml

@@ -8,5 +8,5 @@ header:
 local_conf_header:
   ci: |
     BB_SIGNATURE_HANDLER = "OEBasicHash"
-    INHERIT:remove = "rm_work"
     FIRMWARE_COMPRESSION:qcom-armv8a = "zst"
+    INHERIT:remove = "rm_work"