From 2f9e111b3c65579f1670c163a2da4db3e7298c40 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Sun, 4 Dec 2016 13:23:41 -0800
Subject: [PATCH] scripts/image: use unified /usr

---
 scripts/image | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/scripts/image b/scripts/image
index 3d01eed380..a75a5d970e 100755
--- a/scripts/image
+++ b/scripts/image
@@ -106,10 +106,7 @@ rm -rf $STAMPS_INSTALL
 mkdir -p $INSTALL
 
 # create baselayout
-mkdir -p $INSTALL/bin
 mkdir -p $INSTALL/etc
-mkdir -p $INSTALL/lib
-mkdir -p $INSTALL/sbin
 mkdir -p $INSTALL/dev
 mkdir -p $INSTALL/proc
 mkdir -p $INSTALL/run
@@ -120,10 +117,12 @@ mkdir -p $INSTALL/var
 mkdir -p $INSTALL/flash
 mkdir -p $INSTALL/storage
 ln -sf /var/media $INSTALL/media
+ln -sf /usr/lib $INSTALL/lib
+ln -sf /usr/bin $INSTALL/bin
+ln -sf /usr/sbin $INSTALL/sbin
 
 if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then
-  ln -s /lib $INSTALL/lib64
-  ln -s lib $INSTALL/usr/lib64
+  ln -s /usr/lib $INSTALL/lib64
 fi
 
 echo "$TARGET_VERSION" > $INSTALL/etc/release
@@ -225,13 +224,13 @@ if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem" ]; th
 fi
 
 # run depmod
-MODVER=$(basename $(ls -d $INSTALL/lib/modules/*))
-find $INSTALL/lib/modules/$MODVER/ -name *.ko | \
-  sed -e "s,$INSTALL/lib/modules/$MODVER/,," > $INSTALL/lib/modules/$MODVER/modules.order
-$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL $MODVER 2> /dev/null
+MODVER=$(basename $(ls -d $INSTALL/usr/lib/modules/*))
+find $INSTALL/usr/lib/modules/$MODVER/ -name *.ko | \
+  sed -e "s,$INSTALL/usr/lib/modules/$MODVER/,," > $INSTALL/usr/lib/modules/$MODVER/modules.order
+$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL/usr $MODVER 2> /dev/null
 
 # strip kernel modules
-for MOD in `find $INSTALL/lib/modules/ -type f -name *.ko`; do
+for MOD in `find $INSTALL/usr/lib/modules/ -type f -name *.ko`; do
   $STRIP --strip-debug $MOD
 done