From 7f5c08052408668d45b3c85afc7cd578c8799143 Mon Sep 17 00:00:00 2001 From: alichinese Date: Mon, 21 Jul 2025 10:11:44 +0800 Subject: [PATCH] dynamic-layer: restructure the dynamic layers * dynamic layer directory name should be -layer format, and dynamic layer should be feature layer Signed-off-by: alichinese --- .../rockchip-librga/rockchip-librga.bbappend | 0 meta-openeuler/conf/layer.conf | 10 ++-------- .../recipes-devtools/python/pypi-src-openeuler.inc | 0 .../python/python3-argcomplete_%.bbappend | 0 .../python/python3-atomicwrites_%.bbappend | 0 .../recipes-devtools/python/python3-blinker_%.bbappend | 0 .../recipes-devtools/python/python3-blinker_1.6.2.bb | 0 .../recipes-devtools/python/python3-click_%.bbappend | 0 ...-remove-the-setup_requires-for-setuptools-scm.patch | 0 .../recipes-devtools/python/python3-cmd2_%.bbappend | 0 .../python/python3-coloredlogs_%.bbappend | 0 .../python/python3-dateutil_%.bbappend | 0 .../recipes-devtools/python/python3-docopt_%.bbappend | 0 .../python/python3-humanfriendly_%.bbappend | 0 .../recipes-devtools/python/python3-lxml_%.bbappend | 0 .../recipes-devtools/python/python3-mccabe_%.bbappend | 0 .../recipes-devtools/python/python3-mock_%.bbappend | 0 .../recipes-devtools/python/python3-netaddr_%.bbappend | 0 .../python/python3-netifaces_%.bbappend | 0 .../recipes-devtools/python/python3-pep8_%.bbappend | 0 ...-remove-the-setup_requires-for-setuptools-scm.patch | 0 .../python/python3-prettytable_%.bbappend | 0 .../python/python3-prettytable_3.9.0.bb | 0 .../recipes-devtools/python/python3-py_%.bbappend | 0 .../python/python3-pybind11_%.bbappend | 0 .../python/python3-pyflakes_%.bbappend | 0 .../python/python3-pyperclip_%.bbappend | 0 .../recipes-devtools/python/python3-pyproj_%.bbappend | 0 .../recipes-devtools/python/python3-pyproj_3.6.1.bb | 0 .../recipes-devtools/python/python3-wcwidth_%.bbappend | 0 30 files changed, 2 insertions(+), 8 deletions(-) rename {meta-openeuler/dynamic-layers/rockchip-layer => bsp/meta-openeuler-bsp/rockchip}/recipes-graphics/rockchip-librga/rockchip-librga.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/pypi-src-openeuler.inc (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-argcomplete_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-atomicwrites_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-blinker_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-blinker_1.6.2.bb (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-click_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-cmd2_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-coloredlogs_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-dateutil_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-docopt_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-humanfriendly_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-lxml_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-mccabe_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-mock_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-netaddr_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-netifaces_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-pep8_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-prettytable_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-prettytable_3.9.0.bb (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-py_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-pybind11_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-pyflakes_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-pyperclip_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-pyproj_%.bbappend (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-pyproj_3.6.1.bb (100%) rename meta-openeuler/dynamic-layers/{meta-python => python-layer}/recipes-devtools/python/python3-wcwidth_%.bbappend (100%) diff --git a/meta-openeuler/dynamic-layers/rockchip-layer/recipes-graphics/rockchip-librga/rockchip-librga.bbappend b/bsp/meta-openeuler-bsp/rockchip/recipes-graphics/rockchip-librga/rockchip-librga.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/rockchip-layer/recipes-graphics/rockchip-librga/rockchip-librga.bbappend rename to bsp/meta-openeuler-bsp/rockchip/recipes-graphics/rockchip-librga/rockchip-librga.bbappend diff --git a/meta-openeuler/conf/layer.conf b/meta-openeuler/conf/layer.conf index 4dda66d4228..7e72abafc39 100644 --- a/meta-openeuler/conf/layer.conf +++ b/meta-openeuler/conf/layer.conf @@ -29,8 +29,8 @@ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.b openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bbappend \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/recipes-*/*/*.bb \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/recipes-*/*/*.bbappend \ -meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ -meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \ +meta-python:${LAYERDIR}/dynamic-layers/python-layer/recipes-*/*/*.bb \ +meta-python:${LAYERDIR}/dynamic-layers/python-layer/recipes-*/*/*.bbappend \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bb \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bbappend \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/recipes-*/*/*.bb \ @@ -39,12 +39,6 @@ meta-arm:${LAYERDIR}/dynamic-layers/arm-layer/recipes-*/*/*.bb \ meta-arm:${LAYERDIR}/dynamic-layers/arm-layer/recipes-*/*/*.bbappend \ " -# enable .bb under rockchip-layer/ when exist rockchip -BBFILES_DYNAMIC += " \ -rockchip:${LAYERDIR}/dynamic-layers/rockchip-layer/recipes-*/*/*.bb \ -rockchip:${LAYERDIR}/dynamic-layers/rockchip-layer/recipes-*/*/*.bbappend \ -" - # enable .bb under clang-layer/ when exist meta-clang BBFILES_DYNAMIC += " \ clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes-*/*/*.bb \ diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/pypi-src-openeuler.inc b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/pypi-src-openeuler.inc similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/pypi-src-openeuler.inc rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/pypi-src-openeuler.inc diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-argcomplete_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-argcomplete_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-argcomplete_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-argcomplete_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-atomicwrites_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-atomicwrites_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-atomicwrites_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-atomicwrites_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-blinker_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-blinker_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-blinker_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-blinker_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-blinker_1.6.2.bb b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-blinker_1.6.2.bb similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-blinker_1.6.2.bb rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-blinker_1.6.2.bb diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-click_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-click_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-click_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-click_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-cmd2_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-cmd2_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-coloredlogs_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-coloredlogs_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-coloredlogs_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-coloredlogs_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-dateutil_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-dateutil_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-dateutil_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-dateutil_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-docopt_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-docopt_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-docopt_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-docopt_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-humanfriendly_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-humanfriendly_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-humanfriendly_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-humanfriendly_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-lxml_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-lxml_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mccabe_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-mccabe_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mccabe_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-mccabe_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mock_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-mock_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mock_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-mock_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-netaddr_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-netaddr_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-netaddr_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-netaddr_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-netifaces_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-netifaces_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-netifaces_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-netifaces_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pep8_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pep8_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pep8_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pep8_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-prettytable_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-prettytable_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-prettytable_3.9.0.bb similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-prettytable_3.9.0.bb diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-py_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-py_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-py_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-py_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pybind11_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pybind11_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pybind11_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pybind11_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyflakes_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyflakes_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyflakes_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyflakes_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyperclip_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyperclip_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyperclip_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyperclip_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyproj_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyproj_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyproj_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyproj_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyproj_3.6.1.bb similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-pyproj_3.6.1.bb diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-wcwidth_%.bbappend b/meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-wcwidth_%.bbappend similarity index 100% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-wcwidth_%.bbappend rename to meta-openeuler/dynamic-layers/python-layer/recipes-devtools/python/python3-wcwidth_%.bbappend -- Gitee