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 4dda66d42284a318b00712ed9c28c6a33b107cbe..7e72abafc3928e1e1120a51c6695e597ee7ba1e6 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