summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2018-11-16 14:56:47 +0100
committerStefan Agner <stefan.agner@toradex.com>2018-11-28 16:30:23 +0100
commit2b5d6110db3960a5f37b8ab0836226d7753c74e0 (patch)
treed562ec4dcc21e6ddd82e8784ceb70634f63b6b05 /classes
parent9d6cf7300d6d7cc6f9447f5882bc3186b6c7e255 (diff)
downloadmeta-updater-2b5d6110db3960a5f37b8ab0836226d7753c74e0.tar.gz
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>
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ostree.bbclass10
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 () {
41 mkdir -p usr/rootdirs 41 mkdir -p usr/rootdirs
42 42
43 mv etc usr/ 43 mv etc usr/
44 # Implement UsrMove
45 dirs="bin sbin lib"
46
47 for dir in ${dirs} ; do
48 if [ -d ${dir} ] && [ ! -L ${dir} ] ; then
49 mv ${dir} usr/rootdirs/
50 rm -rf ${dir}
51 ln -sf usr/rootdirs/${dir} ${dir}
52 fi
53 done
54 44
55 if [ -n "${SYSTEMD_USED}" ]; then 45 if [ -n "${SYSTEMD_USED}" ]; then
56 mkdir -p usr/etc/tmpfiles.d 46 mkdir -p usr/etc/tmpfiles.d