Fix compatibility with kirkstone branchHEADmasterkirkstonehonister

- add 'kirkstone' to LAYERSERIES_COMPAT;
- adjust the expectations of the new 'empty-dirs' QA check added in
  [1], since we explictly populate '/media' (note that this change
  seems to have been backported to the honister branch too, so it's
  not specific to kirkstone);

[1] https://github.com/openembedded/openembedded-core/commit/a454fda9c3

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

2 files changed, 7 insertions, 1 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index de377f2..aef6eba 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "readonly-rootfs-overlay"
 BBFILE_PATTERN_readonly-rootfs-overlay = "^${LAYERDIR}/"
 BBFILE_PRIORITY_readonly-rootfs-overlay = "6"
 
-LAYERSERIES_COMPAT_readonly-rootfs-overlay = "honister"
+LAYERSERIES_COMPAT_readonly-rootfs-overlay = "honister kirkstone"
diff --git a/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc b/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc
index fcfefcf..eeb7f2d 100644
--- a/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc
+++ b/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc
@@ -14,5 +14,11 @@ do_install() {
 
 FILES:${PN} += " /init /media/rfs"
 
+QA_EMPTY_DIRS:remove = "/media"
+QA_EMPTY_DIRS:append = " \
+    /media/rfs/ro \
+    /media/rfs/rw \
+"
+
 # Due to kernel dependency
 PACKAGE_ARCH = "${MACHINE_ARCH}"