image_types_ostree: drop manual usrmove implementation

OpenEmbedded's usrmerge implementation checks that nothing is
installing in /bin, /sbin or /lib. Hence those directories
are empty by default. There is no need for the manual usrmove
anymore.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

1 files changed, 0 insertions, 10 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 878587c..4095de0 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -41,16 +41,6 @@ IMAGE_CMD_ostree () {
     mkdir -p usr/rootdirs
 
     mv etc usr/
-    # Implement UsrMove
-    dirs="bin sbin lib"
-
-    for dir in ${dirs} ; do
-        if [ -d ${dir} ] && [ ! -L ${dir} ] ; then
-            mv ${dir} usr/rootdirs/
-            rm -rf ${dir}
-            ln -sf usr/rootdirs/${dir} ${dir}
-        fi
-    done
 
     if [ -n "${SYSTEMD_USED}" ]; then
         mkdir -p usr/etc/tmpfiles.d