From 5e8c36febd5aedfe6e8282cd1e15420ced1ce246 Mon Sep 17 00:00:00 2001 From: Nik Mohamad Aizuddin Date: Tue, 23 May 2023 18:29:30 +0800 Subject: [PATCH] refactor(yocto/submodules): move all submodules in `project/yocto/*/layers/*` to `project/yocto/layers/*` BREAKING CHANGE: submodules for Yocto have been restructured --- .gitmodules | 78 +++---------------- .../{rpi3bp => layers}/meta-openembedded | 0 .../{rpi3bp => }/layers/meta-raspberrypi | 0 project/yocto/{rpi3bp => }/layers/meta-ros | 0 .../files/ros2-helloworld-cpp | 0 .../files/ros2_helloworld_python | 0 project/yocto/{rpi3bp => layers}/poky | 0 project/yocto/rpi4b/layers/meta-openembedded | 1 - project/yocto/rpi4b/layers/meta-raspberrypi | 1 - project/yocto/rpi4b/layers/meta-ros | 1 - .../files/ros2-helloworld-cpp | 1 - .../files/ros2_helloworld_python | 1 - project/yocto/rpi4b/layers/poky | 1 - .../yocto/rpizero-w/layers/meta-openembedded | 1 - .../yocto/rpizero-w/layers/meta-raspberrypi | 1 - project/yocto/rpizero-w/layers/meta-ros | 1 - .../files/ros2-helloworld-cpp | 1 - .../files/ros2_helloworld_python | 1 - project/yocto/rpizero-w/layers/poky | 1 - .../yocto/rpizero2-w/layers/meta-openembedded | 1 - .../yocto/rpizero2-w/layers/meta-raspberrypi | 1 - project/yocto/rpizero2-w/layers/meta-ros | 1 - .../files/ros2-helloworld-cpp | 1 - .../files/ros2_helloworld_python | 1 - project/yocto/rpizero2-w/layers/poky | 1 - 25 files changed, 12 insertions(+), 84 deletions(-) rename project/yocto/{rpi3bp => layers}/meta-openembedded (100%) rename project/yocto/{rpi3bp => }/layers/meta-raspberrypi (100%) rename project/yocto/{rpi3bp => }/layers/meta-ros (100%) rename project/yocto/{rpi3bp => }/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp (100%) rename project/yocto/{rpi3bp => }/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python (100%) rename project/yocto/{rpi3bp => layers}/poky (100%) delete mode 160000 project/yocto/rpi4b/layers/meta-openembedded delete mode 160000 project/yocto/rpi4b/layers/meta-raspberrypi delete mode 160000 project/yocto/rpi4b/layers/meta-ros delete mode 160000 project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp delete mode 160000 project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python delete mode 160000 project/yocto/rpi4b/layers/poky delete mode 160000 project/yocto/rpizero-w/layers/meta-openembedded delete mode 160000 project/yocto/rpizero-w/layers/meta-raspberrypi delete mode 160000 project/yocto/rpizero-w/layers/meta-ros delete mode 160000 project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp delete mode 160000 project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python delete mode 160000 project/yocto/rpizero-w/layers/poky delete mode 160000 project/yocto/rpizero2-w/layers/meta-openembedded delete mode 160000 project/yocto/rpizero2-w/layers/meta-raspberrypi delete mode 160000 project/yocto/rpizero2-w/layers/meta-ros delete mode 160000 project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp delete mode 160000 project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python delete mode 160000 project/yocto/rpizero2-w/layers/poky diff --git a/.gitmodules b/.gitmodules index ee653ff..eadf125 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,78 +7,24 @@ [submodule "project/third-party/digilent-vivado-library"] path = project/third-party/digilent-vivado-library url = https://github.com/extra2000/digilent-vivado-library.git -[submodule "project/yocto/rpizero-w/poky"] - path = project/yocto/rpizero-w/layers/poky +[submodule "project/yocto/layers/poky"] + path = project/yocto/layers/poky url = https://github.com/yoctoproject/poky.git -[submodule "project/yocto/rpizero-w/meta-openembedded"] - path = project/yocto/rpizero-w/layers/meta-openembedded +[submodule "project/yocto/layers/meta-openembedded"] + path = project/yocto/layers/meta-openembedded url = https://github.com/openembedded/meta-openembedded.git -[submodule "project/yocto/rpizero-w/meta-raspberrypi"] - path = project/yocto/rpizero-w/layers/meta-raspberrypi +[submodule "project/yocto/layers/meta-raspberrypi"] + path = project/yocto/layers/meta-raspberrypi url = https://git.yoctoproject.org/meta-raspberrypi -[submodule "project/yocto/rpizero-w/layers/meta-ros"] - path = project/yocto/rpizero-w/layers/meta-ros +[submodule "project/yocto/layers/meta-ros"] + path = project/yocto/layers/meta-ros url = https://github.com/ros/meta-ros.git -[submodule "project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp"] - path = project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp +[submodule "project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp"] + path = project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp url = https://github.com/extra2000/ros2-helloworld-cpp.git -[submodule "project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python"] - path = project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python +[submodule "project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python"] + path = project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python url = https://github.com/extra2000/ros2-helloworld-python.git -[submodule "project/yocto/rpi3bp/meta-openembedded"] - path = project/yocto/rpi3bp/meta-openembedded - url = https://github.com/openembedded/meta-openembedded.git -[submodule "project/yocto/rpi3bp/poky"] - path = project/yocto/rpi3bp/poky - url = https://github.com/yoctoproject/poky.git -[submodule "project/yocto/rpi3bp/layers/meta-raspberrypi"] - path = project/yocto/rpi3bp/layers/meta-raspberrypi - url = https://git.yoctoproject.org/meta-raspberrypi -[submodule "project/yocto/rpi3bp/layers/meta-ros"] - path = project/yocto/rpi3bp/layers/meta-ros - url = https://github.com/ros/meta-ros.git -[submodule "project/yocto/rpi4b/layers/poky"] - path = project/yocto/rpi4b/layers/poky - url = https://github.com/yoctoproject/poky.git -[submodule "project/yocto/rpi4b/layers/meta-openembedded"] - path = project/yocto/rpi4b/layers/meta-openembedded - url = https://github.com/openembedded/meta-openembedded.git -[submodule "project/yocto/rpi4b/layers/meta-raspberrypi"] - path = project/yocto/rpi4b/layers/meta-raspberrypi - url = https://git.yoctoproject.org/meta-raspberrypi -[submodule "project/yocto/rpi4b/layers/meta-ros"] - path = project/yocto/rpi4b/layers/meta-ros - url = https://github.com/ros/meta-ros.git -[submodule "project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp"] - path = project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp - url = https://github.com/extra2000/ros2-helloworld-cpp.git -[submodule "project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python"] - path = project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python - url = https://github.com/extra2000/ros2_helloworld_python.git -[submodule "project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp"] - path = project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp - url = https://github.com/extra2000/ros2-helloworld-cpp.git -[submodule "project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python"] - path = project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python - url = https://github.com/extra2000/ros2_helloworld_python.git -[submodule "project/yocto/rpizero2-w/layers/poky"] - path = project/yocto/rpizero2-w/layers/poky - url = https://github.com/yoctoproject/poky.git -[submodule "project/yocto/rpizero2-w/layers/meta-openembedded"] - path = project/yocto/rpizero2-w/layers/meta-openembedded - url = https://github.com/openembedded/meta-openembedded.git -[submodule "project/yocto/rpizero2-w/layers/meta-raspberrypi"] - path = project/yocto/rpizero2-w/layers/meta-raspberrypi - url = https://git.yoctoproject.org/meta-raspberrypi -[submodule "project/yocto/rpizero2-w/layers/meta-ros"] - path = project/yocto/rpizero2-w/layers/meta-ros - url = https://github.com/ros/meta-ros.git -[submodule "project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp"] - path = project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp - url = https://github.com/extra2000/ros2-helloworld-cpp.git -[submodule "project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python"] - path = project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python - url = https://github.com/extra2000/ros2_helloworld_python.git [submodule "project/petalinux/kr260/project-spec/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp"] path = project/petalinux/kr260/project-spec/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp url = https://github.com/extra2000/ros2-helloworld-cpp.git diff --git a/project/yocto/rpi3bp/meta-openembedded b/project/yocto/layers/meta-openembedded similarity index 100% rename from project/yocto/rpi3bp/meta-openembedded rename to project/yocto/layers/meta-openembedded diff --git a/project/yocto/rpi3bp/layers/meta-raspberrypi b/project/yocto/layers/meta-raspberrypi similarity index 100% rename from project/yocto/rpi3bp/layers/meta-raspberrypi rename to project/yocto/layers/meta-raspberrypi diff --git a/project/yocto/rpi3bp/layers/meta-ros b/project/yocto/layers/meta-ros similarity index 100% rename from project/yocto/rpi3bp/layers/meta-ros rename to project/yocto/layers/meta-ros diff --git a/project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp b/project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp similarity index 100% rename from project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp rename to project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp diff --git a/project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python b/project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python similarity index 100% rename from project/yocto/rpi3bp/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python rename to project/yocto/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python diff --git a/project/yocto/rpi3bp/poky b/project/yocto/layers/poky similarity index 100% rename from project/yocto/rpi3bp/poky rename to project/yocto/layers/poky diff --git a/project/yocto/rpi4b/layers/meta-openembedded b/project/yocto/rpi4b/layers/meta-openembedded deleted file mode 160000 index 0e6c34f..0000000 --- a/project/yocto/rpi4b/layers/meta-openembedded +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37 diff --git a/project/yocto/rpi4b/layers/meta-raspberrypi b/project/yocto/rpi4b/layers/meta-raspberrypi deleted file mode 160000 index 378d4b6..0000000 --- a/project/yocto/rpi4b/layers/meta-raspberrypi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 378d4b6e7ba64b6a9a701457cc3780fa896ba5dc diff --git a/project/yocto/rpi4b/layers/meta-ros b/project/yocto/rpi4b/layers/meta-ros deleted file mode 160000 index 6e55955..0000000 --- a/project/yocto/rpi4b/layers/meta-ros +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e559558c8c7ddf1b828a5f82d33eb0274bc2fc3 diff --git a/project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp b/project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp deleted file mode 160000 index 35eb305..0000000 --- a/project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35eb3050cb1aa1948bb22bbb1a035833efab8d4c diff --git a/project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python b/project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python deleted file mode 160000 index 663d299..0000000 --- a/project/yocto/rpi4b/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 663d299804da724affc3f1036a7f528893816d97 diff --git a/project/yocto/rpi4b/layers/poky b/project/yocto/rpi4b/layers/poky deleted file mode 160000 index fd00d74..0000000 --- a/project/yocto/rpi4b/layers/poky +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd00d74f47ceb57a619c4d0a0553ff0a30bbb7a4 diff --git a/project/yocto/rpizero-w/layers/meta-openembedded b/project/yocto/rpizero-w/layers/meta-openembedded deleted file mode 160000 index 0e6c34f..0000000 --- a/project/yocto/rpizero-w/layers/meta-openembedded +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37 diff --git a/project/yocto/rpizero-w/layers/meta-raspberrypi b/project/yocto/rpizero-w/layers/meta-raspberrypi deleted file mode 160000 index 378d4b6..0000000 --- a/project/yocto/rpizero-w/layers/meta-raspberrypi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 378d4b6e7ba64b6a9a701457cc3780fa896ba5dc diff --git a/project/yocto/rpizero-w/layers/meta-ros b/project/yocto/rpizero-w/layers/meta-ros deleted file mode 160000 index 6e55955..0000000 --- a/project/yocto/rpizero-w/layers/meta-ros +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e559558c8c7ddf1b828a5f82d33eb0274bc2fc3 diff --git a/project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp b/project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp deleted file mode 160000 index 35eb305..0000000 --- a/project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35eb3050cb1aa1948bb22bbb1a035833efab8d4c diff --git a/project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python b/project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python deleted file mode 160000 index 663d299..0000000 --- a/project/yocto/rpizero-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 663d299804da724affc3f1036a7f528893816d97 diff --git a/project/yocto/rpizero-w/layers/poky b/project/yocto/rpizero-w/layers/poky deleted file mode 160000 index fd00d74..0000000 --- a/project/yocto/rpizero-w/layers/poky +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd00d74f47ceb57a619c4d0a0553ff0a30bbb7a4 diff --git a/project/yocto/rpizero2-w/layers/meta-openembedded b/project/yocto/rpizero2-w/layers/meta-openembedded deleted file mode 160000 index 0e6c34f..0000000 --- a/project/yocto/rpizero2-w/layers/meta-openembedded +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37 diff --git a/project/yocto/rpizero2-w/layers/meta-raspberrypi b/project/yocto/rpizero2-w/layers/meta-raspberrypi deleted file mode 160000 index 378d4b6..0000000 --- a/project/yocto/rpizero2-w/layers/meta-raspberrypi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 378d4b6e7ba64b6a9a701457cc3780fa896ba5dc diff --git a/project/yocto/rpizero2-w/layers/meta-ros b/project/yocto/rpizero2-w/layers/meta-ros deleted file mode 160000 index 6e55955..0000000 --- a/project/yocto/rpizero2-w/layers/meta-ros +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e559558c8c7ddf1b828a5f82d33eb0274bc2fc3 diff --git a/project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp b/project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp deleted file mode 160000 index 35eb305..0000000 --- a/project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-cpp/files/ros2-helloworld-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35eb3050cb1aa1948bb22bbb1a035833efab8d4c diff --git a/project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python b/project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python deleted file mode 160000 index 663d299..0000000 --- a/project/yocto/rpizero2-w/layers/meta-user/recipes-apps/ros2-helloworld-python/files/ros2_helloworld_python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 663d299804da724affc3f1036a7f528893816d97 diff --git a/project/yocto/rpizero2-w/layers/poky b/project/yocto/rpizero2-w/layers/poky deleted file mode 160000 index fd00d74..0000000 --- a/project/yocto/rpizero2-w/layers/poky +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd00d74f47ceb57a619c4d0a0553ff0a30bbb7a4