diff mbox series

[meta-swupdate-boards] raspberrypi: Drop creating semi layer and simplify layer structure

Message ID 20200401080351.3059074-1-raj.khem@gmail.com
State Accepted
Headers show
Series [meta-swupdate-boards] raspberrypi: Drop creating semi layer and simplify layer structure | expand

Commit Message

Khem Raj April 1, 2020, 8:03 a.m. UTC 
rpi-u-boot-scr is now marked properly with rpi overrides in
meta-raspberrypi

overlay recipe is quite common and is not rpi specific

Drop contruct to add BBFILES which was added to support this structure

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/layer.conf                                              | 5 +----
 .../rpi-uboot-scr/files/boot.cmd.in                          | 0
 .../rpi-uboot-scr/rpi-u-boot-scr.bbappend                    | 2 --
 .../recipes-core => recipes-core}/overlayfs/etc-overlay.bb   | 0
 .../recipes-core => recipes-core}/overlayfs/files/etc.mount  | 0
 .../overlayfs/files/overlays-etc-dirs.service                | 0
 6 files changed, 1 insertion(+), 6 deletions(-)
 rename {raspberrypi/recipes-bsp => recipes-bsp}/rpi-uboot-scr/files/boot.cmd.in (100%)
 rename {raspberrypi/recipes-bsp => recipes-bsp}/rpi-uboot-scr/rpi-u-boot-scr.bbappend (61%)
 rename {raspberrypi/recipes-core => recipes-core}/overlayfs/etc-overlay.bb (100%)
 rename {raspberrypi/recipes-core => recipes-core}/overlayfs/files/etc.mount (100%)
 rename {raspberrypi/recipes-core => recipes-core}/overlayfs/files/overlays-etc-dirs.service (100%)
diff mbox series

Patch

diff --git a/conf/layer.conf b/conf/layer.conf
index 5c95d9d..ac60647 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -3,7 +3,7 @@  BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
+	    ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "swupdate-boards"
 BBFILE_PATTERN_swupdate-boards = "^${LAYERDIR}/"
@@ -12,6 +12,3 @@  BBFILE_PRIORITY_swupdate-boards = "7"
 LAYERDEPENDS_swupdate-boards = "swupdate"
 
 LAYERSERIES_COMPAT_swupdate-boards = "warrior zeus dunfell"
-
-BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.%s' % (layer, ext) \
-               for layer in '${BBFILE_COLLECTIONS}'.split() for ext in ['bb', 'bbappend'])}"
diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in
similarity index 100%
rename from raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in
rename to recipes-bsp/rpi-uboot-scr/files/boot.cmd.in
diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend b/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend
similarity index 61%
rename from raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend
rename to recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend
index d3ad9bd..81fe7b7 100644
--- a/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend
+++ b/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend
@@ -1,3 +1 @@ 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-COMPATIBLE = "raspberrypi3"
diff --git a/raspberrypi/recipes-core/overlayfs/etc-overlay.bb b/recipes-core/overlayfs/etc-overlay.bb
similarity index 100%
rename from raspberrypi/recipes-core/overlayfs/etc-overlay.bb
rename to recipes-core/overlayfs/etc-overlay.bb
diff --git a/raspberrypi/recipes-core/overlayfs/files/etc.mount b/recipes-core/overlayfs/files/etc.mount
similarity index 100%
rename from raspberrypi/recipes-core/overlayfs/files/etc.mount
rename to recipes-core/overlayfs/files/etc.mount
diff --git a/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service b/recipes-core/overlayfs/files/overlays-etc-dirs.service
similarity index 100%
rename from raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service
rename to recipes-core/overlayfs/files/overlays-etc-dirs.service