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

---
 packages/virtual/initramfs/package.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk
index 3ef9addd7e..d47a132106 100644
--- a/packages/virtual/initramfs/package.mk
+++ b/packages/virtual/initramfs/package.mk
@@ -44,8 +44,13 @@ fi
 post_install() {
   ( cd $ROOT/$BUILD/initramfs
     if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then
-      ln -s /lib $ROOT/$BUILD/initramfs/lib64
+      ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib64
     fi
+
+    ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib
+    ln -sf /usr/bin $ROOT/$BUILD/initramfs/bin
+    ln -sf /usr/sbin $ROOT/$BUILD/initramfs/sbin
+
     mkdir -p $ROOT/$BUILD/image/
     fakeroot -- sh -c \
       "mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > $ROOT/$BUILD/image/initramfs.cpio"