From bbb4918e770a536784f8e5573737f0afade4fdb2 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 7 Jun 2021 16:54:19 -0400 Subject: [PATCH] meta-agl-drm-lease: Improve usability Changes: - Switch to using AGL_FEATURES instead of just directly modifying IMAGE_INSTALL in the feature template. - Move rcar3 kernel recipe bbappend to a dynamic-layer addition so the layer is usable on other platforms. Bug-AGL: SPEC-3955 Signed-off-by: Scott Murray Change-Id: Ie109cc3606d68d354aae9d902a60ef82272244bf --- meta-agl-drm-lease/conf/include/agl-drm-lease.inc | 2 +- meta-agl-drm-lease/conf/layer.conf | 5 +++++ .../files/0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch | 0 .../linux-renesas/files/0002-drm-rcar-du-support-render-node.patch | 0 .../recipes-kernel/linux-renesas/linux-renesas_%.bbappend | 0 5 files changed, 6 insertions(+), 1 deletion(-) rename meta-agl-drm-lease/{ => dynamic-layers/meta-rcar-gen3}/recipes-kernel/linux-renesas/files/0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch (100%) rename meta-agl-drm-lease/{ => dynamic-layers/meta-rcar-gen3}/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch (100%) rename meta-agl-drm-lease/{ => dynamic-layers/meta-rcar-gen3}/recipes-kernel/linux-renesas/linux-renesas_%.bbappend (100%) diff --git a/meta-agl-drm-lease/conf/include/agl-drm-lease.inc b/meta-agl-drm-lease/conf/include/agl-drm-lease.inc index 5ec51c55..bdf55628 100644 --- a/meta-agl-drm-lease/conf/include/agl-drm-lease.inc +++ b/meta-agl-drm-lease/conf/include/agl-drm-lease.inc @@ -1 +1 @@ -IMAGE_INSTALL_append = " drm-lease-manager" +AGL_FEATURES += "agl-drm-lease" diff --git a/meta-agl-drm-lease/conf/layer.conf b/meta-agl-drm-lease/conf/layer.conf index a319a99f..d34d3928 100644 --- a/meta-agl-drm-lease/conf/layer.conf +++ b/meta-agl-drm-lease/conf/layer.conf @@ -8,6 +8,11 @@ BBFILE_COLLECTIONS += "agl-drm-lease" BBFILE_PATTERN_agl-drm-lease = "^${LAYERDIR}/" BBFILE_PRIORITY_agl-drm-lease = "80" +BBFILES_DYNAMIC += " \ + rcar-gen3:${LAYERDIR}/dynamic-layers/meta-rcar-gen3/*/*/*.bb \ + rcar-gen3:${LAYERDIR}/dynamic-layers/meta-rcar-gen3/*/*/*.bbappend \ +" + # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_agl-drm-lease = "1" diff --git a/meta-agl-drm-lease/recipes-kernel/linux-renesas/files/0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch similarity index 100% rename from meta-agl-drm-lease/recipes-kernel/linux-renesas/files/0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch rename to meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch diff --git a/meta-agl-drm-lease/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch similarity index 100% rename from meta-agl-drm-lease/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch rename to meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch diff --git a/meta-agl-drm-lease/recipes-kernel/linux-renesas/linux-renesas_%.bbappend b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend similarity index 100% rename from meta-agl-drm-lease/recipes-kernel/linux-renesas/linux-renesas_%.bbappend rename to meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend -- 2.16.6