| Message ID | 20201129202750.23505-1-pierre-jean.texier@lafon.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-swupdate-boards,1/2] layer: Implement BBFILES_DYNAMIC to handle dynamic-layers | expand |
On 29.11.20 21:27, Pierre-Jean Texier wrote: > Since we have BBFILES_DYNAMIC to activate content only > when some other layers are present, see: > good idea, it was also on my TODO list - thanks for this ! You did just for Raspi - are there follow up patches ? > - https://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html#var-BBFILES_DYNAMIC > > BBFILES_DYNAMIC can be used to handle meta-swupdate-boards's dynamic-layers (instead of BBFILES). > > Signed-off-by: Pierre-Jean Texier <pierre-jean.texier@lafon.fr> > --- > conf/layer.conf | 6 ++++-- > .../recipes-bsp/rpi-uboot-scr/files/boot.cmd.in | 0 > .../recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend | 0 > .../raspberrypi}/recipes-core/overlayfs/etc-overlay.bb | 0 > .../raspberrypi}/recipes-core/overlayfs/files/etc.mount | 0 > .../recipes-core/overlayfs/files/overlays-etc-dirs.service | 0 > 6 files changed, 4 insertions(+), 2 deletions(-) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/etc-overlay.bb (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/files/etc.mount (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/files/overlays-etc-dirs.service (100%) > > diff --git a/conf/layer.conf b/conf/layer.conf > index 5e17659..cdc28eb 100644 > --- a/conf/layer.conf > +++ b/conf/layer.conf > @@ -13,5 +13,7 @@ LAYERDEPENDS_swupdate-boards = "swupdate" > > LAYERSERIES_COMPAT_swupdate-boards = "dunfell gatesgarth hardknott" > > -BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.%s' % (layer, ext) \ > - for layer in '${BBFILE_COLLECTIONS}'.split() for ext in ['bb', 'bbappend'])}" > +BBFILES_DYNAMIC += " \ > + raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bb \ > + raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \ > +" > diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/dynamic-layers/raspberrypi/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 dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in > diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend b/dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend > similarity index 100% > rename from raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend > rename to dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend > diff --git a/raspberrypi/recipes-core/overlayfs/etc-overlay.bb b/dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb > similarity index 100% > rename from raspberrypi/recipes-core/overlayfs/etc-overlay.bb > rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb > diff --git a/raspberrypi/recipes-core/overlayfs/files/etc.mount b/dynamic-layers/raspberrypi/recipes-core/overlayfs/files/etc.mount > similarity index 100% > rename from raspberrypi/recipes-core/overlayfs/files/etc.mount > rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/files/etc.mount > diff --git a/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service b/dynamic-layers/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service > similarity index 100% > rename from raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service > rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service > Best regards, Stefano Babic
Hi Stefano, Le 01/12/2020 à 10:45, Stefano Babic a écrit : > On 29.11.20 21:27, Pierre-Jean Texier wrote: >> Since we have BBFILES_DYNAMIC to activate content only >> when some other layers are present, see: >> > > > good idea, it was also on my TODO list - thanks for this ! You're welcome :) > > You did just for Raspi - are there follow up patches ? Indeed, just for Raspi since it was the only setting that was machine specific (as described in [1]): ├── conf ... ├── raspberrypi ├── README.md ├── recipes-bsp ├── recipes-core ... └── wic The second patch is about the addition of the "sama5d27-som1-ek-sd", see [2]. Let me know. [1] - https://github.com/sbabic/meta-swupdate-boards/commit/03a90dd472bd2da042e9a459458953f1583e319f#diff-94d9ba988fa2aea8339142716dd809220358a74f393855f09aab268a4f673c6e [2] - http://patchwork.ozlabs.org/project/swupdate/patch/20201129202750.23505-2-pierre-jean.texier@lafon.fr/ Regards,
On 29.11.20 21:27, Pierre-Jean Texier wrote: > Since we have BBFILES_DYNAMIC to activate content only > when some other layers are present, see: > > - https://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html#var-BBFILES_DYNAMIC > > BBFILES_DYNAMIC can be used to handle meta-swupdate-boards's dynamic-layers (instead of BBFILES). > > Signed-off-by: Pierre-Jean Texier <pierre-jean.texier@lafon.fr> > --- Applied to -master, thanks ! Best regards, Stefano Babic > conf/layer.conf | 6 ++++-- > .../recipes-bsp/rpi-uboot-scr/files/boot.cmd.in | 0 > .../recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend | 0 > .../raspberrypi}/recipes-core/overlayfs/etc-overlay.bb | 0 > .../raspberrypi}/recipes-core/overlayfs/files/etc.mount | 0 > .../recipes-core/overlayfs/files/overlays-etc-dirs.service | 0 > 6 files changed, 4 insertions(+), 2 deletions(-) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/etc-overlay.bb (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/files/etc.mount (100%) > rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/files/overlays-etc-dirs.service (100%) > > diff --git a/conf/layer.conf b/conf/layer.conf > index 5e17659..cdc28eb 100644 > --- a/conf/layer.conf > +++ b/conf/layer.conf > @@ -13,5 +13,7 @@ LAYERDEPENDS_swupdate-boards = "swupdate" > > LAYERSERIES_COMPAT_swupdate-boards = "dunfell gatesgarth hardknott" > > -BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.%s' % (layer, ext) \ > - for layer in '${BBFILE_COLLECTIONS}'.split() for ext in ['bb', 'bbappend'])}" > +BBFILES_DYNAMIC += " \ > + raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bb \ > + raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \ > +" > diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/dynamic-layers/raspberrypi/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 dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in > diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend b/dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend > similarity index 100% > rename from raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend > rename to dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend > diff --git a/raspberrypi/recipes-core/overlayfs/etc-overlay.bb b/dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb > similarity index 100% > rename from raspberrypi/recipes-core/overlayfs/etc-overlay.bb > rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb > diff --git a/raspberrypi/recipes-core/overlayfs/files/etc.mount b/dynamic-layers/raspberrypi/recipes-core/overlayfs/files/etc.mount > similarity index 100% > rename from raspberrypi/recipes-core/overlayfs/files/etc.mount > rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/files/etc.mount > diff --git a/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service b/dynamic-layers/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service > similarity index 100% > rename from raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service > rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service >
diff --git a/conf/layer.conf b/conf/layer.conf index 5e17659..cdc28eb 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -13,5 +13,7 @@ LAYERDEPENDS_swupdate-boards = "swupdate" LAYERSERIES_COMPAT_swupdate-boards = "dunfell gatesgarth hardknott" -BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.%s' % (layer, ext) \ - for layer in '${BBFILE_COLLECTIONS}'.split() for ext in ['bb', 'bbappend'])}" +BBFILES_DYNAMIC += " \ + raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bb \ + raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \ +" diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/dynamic-layers/raspberrypi/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 dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend b/dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend similarity index 100% rename from raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend rename to dynamic-layers/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend diff --git a/raspberrypi/recipes-core/overlayfs/etc-overlay.bb b/dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb similarity index 100% rename from raspberrypi/recipes-core/overlayfs/etc-overlay.bb rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb diff --git a/raspberrypi/recipes-core/overlayfs/files/etc.mount b/dynamic-layers/raspberrypi/recipes-core/overlayfs/files/etc.mount similarity index 100% rename from raspberrypi/recipes-core/overlayfs/files/etc.mount rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/files/etc.mount diff --git a/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service b/dynamic-layers/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service similarity index 100% rename from raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service rename to dynamic-layers/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service
Since we have BBFILES_DYNAMIC to activate content only when some other layers are present, see: - https://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html#var-BBFILES_DYNAMIC BBFILES_DYNAMIC can be used to handle meta-swupdate-boards's dynamic-layers (instead of BBFILES). Signed-off-by: Pierre-Jean Texier <pierre-jean.texier@lafon.fr> --- conf/layer.conf | 6 ++++-- .../recipes-bsp/rpi-uboot-scr/files/boot.cmd.in | 0 .../recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend | 0 .../raspberrypi}/recipes-core/overlayfs/etc-overlay.bb | 0 .../raspberrypi}/recipes-core/overlayfs/files/etc.mount | 0 .../recipes-core/overlayfs/files/overlays-etc-dirs.service | 0 6 files changed, 4 insertions(+), 2 deletions(-) rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in (100%) rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend (100%) rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/etc-overlay.bb (100%) rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/files/etc.mount (100%) rename {raspberrypi => dynamic-layers/raspberrypi}/recipes-core/overlayfs/files/overlays-etc-dirs.service (100%)