meta-phosphor: migrate aspeed-layer to dynamic-layers

The proper way to add extensions to another layer is with
BBFILES_DYNAMIC rather than adding to BBFILES based on
BBFILE_COLLECTIONS.  Move aspeed-layer to a dynamic-layers subdirectory
and hook into layer.conf using BBFILES_DYNAMIC.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I26e5093d469ce0a57c0b93bcc6b3383dd7bcf264

16 files changed, 5 insertions, 0 deletions

diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index 7e510ea504..787b36dc52 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -19,3 +19,8 @@ BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
 # Add layer-specific bb files too
 BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
                for layer in BBFILE_COLLECTIONS.split())}"
+
+BBFILES_DYNAMIC += " \
+    aspeed-layer:${LAYERDIR}/dynamic-layers/aspeed-layer/recipes-*/*/*.bb \
+    aspeed-layer:${LAYERDIR}/dynamic-layers/aspeed-layer/recipes-*/*/*.bbappend \
+"
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0001-aspeed-Disable-unnecessary-features.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0001-aspeed-Disable-unnecessary-features.patch
index 3ba91f5d6e..3ba91f5d6e 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0001-aspeed-Disable-unnecessary-features.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0001-aspeed-Disable-unnecessary-features.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch
index ee115e8e28..ee115e8e28 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch
index 2de2d82345..2de2d82345 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch
index d04156712c..d04156712c 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch
index 2c8dee0195..2c8dee0195 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch
index 7712f4d1bb..7712f4d1bb 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0005-config-ast-common-Fall-back-to-secondary-flash-on-fa.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0005-config-ast-common-Fall-back-to-secondary-flash-on-fa.patch
index c54b734758..c54b734758 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0005-config-ast-common-Fall-back-to-secondary-flash-on-fa.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0005-config-ast-common-Fall-back-to-secondary-flash-on-fa.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0006-aspeed-Enable-SPI-master-mode-by-default.patch b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0006-aspeed-Enable-SPI-master-mode-by-default.patch
index bdb9a0c8f0..bdb9a0c8f0 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0006-aspeed-Enable-SPI-master-mode-by-default.patch
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/files/0006-aspeed-Enable-SPI-master-mode-by-default.patch
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
index 0e18a7c1d2..0e18a7c1d2 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc
index 5a0b7e66f2..5a0b7e66f2 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index 6ae4b1b3ba..6ae4b1b3ba 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
index 452ef7eccf..452ef7eccf 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
diff --git a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook
index 3f5a974b95..3f5a974b95 100755
--- a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook
diff --git a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend
index 1061a9271f..1061a9271f 100644
--- a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend
diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
index 33d930cb30..33d930cb30 100644
--- a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
+++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb