[meta-selinux,1/2] python: move appends to a dynamic-layer

Submitted by Jeremy Puhlman on Jan. 30, 2020, 11:28 p.m. | Patch ID: 169606

Details

Message ID 20200130232841.6706-1-jpuhlman@mvista.com
State New
Headers show

Commit Message

Jeremy Puhlman Jan. 30, 2020, 11:28 p.m.
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
 conf/layer.conf                                                 | 2 ++
 .../recipes-devtools}/python/files/sitecustomize.py             | 0
 .../python2-layer/recipes-devtools}/python/python_%.bbappend    | 0
 .../python2-layer/recipes-devtools}/python/python_selinux.inc   | 0
 4 files changed, 2 insertions(+)
 rename {recipes-devtools => dynamic-layers/python2-layer/recipes-devtools}/python/files/sitecustomize.py (100%)
 rename {recipes-devtools => dynamic-layers/python2-layer/recipes-devtools}/python/python_%.bbappend (100%)
 rename {recipes-devtools => dynamic-layers/python2-layer/recipes-devtools}/python/python_selinux.inc (100%)

Patch hide | download patch | download mbox

diff --git a/conf/layer.conf b/conf/layer.conf
index 226a75a..cdee27a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,6 +11,8 @@  BBFILES_DYNAMIC += "openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-l
                     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
                     virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \
                     virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \
+                    meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bb \
+                    meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bbappend \
                    "
 
 BBFILE_COLLECTIONS += "selinux"
diff --git a/recipes-devtools/python/files/sitecustomize.py b/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py
similarity index 100%
rename from recipes-devtools/python/files/sitecustomize.py
rename to dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py
diff --git a/recipes-devtools/python/python_%.bbappend b/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend
similarity index 100%
rename from recipes-devtools/python/python_%.bbappend
rename to dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend
diff --git a/recipes-devtools/python/python_selinux.inc b/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc
similarity index 100%
rename from recipes-devtools/python/python_selinux.inc
rename to dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc

Comments

Joe MacDonald Jan. 31, 2020, 2:49 a.m.
Thanks for these, Jeremy, I'd just been prepping the same patches today,
but since yours are on-list, I'm merging them.

-J.

[[yocto] [meta-selinux][PATCH 1/2] python: move appends to a dynamic-layer] On 20.01.30 (Thu 15:28) Jeremy Puhlman wrote:

> Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
> ---
>  conf/layer.conf                                                 | 2 ++
>  .../recipes-devtools}/python/files/sitecustomize.py             | 0
>  .../python2-layer/recipes-devtools}/python/python_%.bbappend    | 0
>  .../python2-layer/recipes-devtools}/python/python_selinux.inc   | 0
>  4 files changed, 2 insertions(+)
>  rename {recipes-devtools => dynamic-layers/python2-layer/recipes-devtools}/python/files/sitecustomize.py (100%)
>  rename {recipes-devtools => dynamic-layers/python2-layer/recipes-devtools}/python/python_%.bbappend (100%)
>  rename {recipes-devtools => dynamic-layers/python2-layer/recipes-devtools}/python/python_selinux.inc (100%)
> 
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 226a75a..cdee27a 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -11,6 +11,8 @@ BBFILES_DYNAMIC += "openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-l
>                      networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
>                      virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \
>                      virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \
> +                    meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bb \
> +                    meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bbappend \
>                     "
>  
>  BBFILE_COLLECTIONS += "selinux"
> diff --git a/recipes-devtools/python/files/sitecustomize.py b/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py
> similarity index 100%
> rename from recipes-devtools/python/files/sitecustomize.py
> rename to dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py
> diff --git a/recipes-devtools/python/python_%.bbappend b/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend
> similarity index 100%
> rename from recipes-devtools/python/python_%.bbappend
> rename to dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend
> diff --git a/recipes-devtools/python/python_selinux.inc b/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc
> similarity index 100%
> rename from recipes-devtools/python/python_selinux.inc
> rename to dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc
> -- 
> 2.20.1
> 

>