Merge pull request #805 from lrusak/usr-split

merge /usr like it's 2012

config/functions

@@ -117,7 +117,7 @@ kernel_version() {
 
 # get kernel module dir
 get_module_dir() {
-  basename $(ls -d $(get_build_dir linux)/.install_pkg/lib/modules/*)
+  basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/modules/*)
 }
 
 # get package's build dir

packages/devel/arm-mem/package.mk

@@ -44,18 +44,18 @@ make_init() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib
+  mkdir -p $INSTALL/usr/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P libarmmem.so $INSTALL/usr/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/usr/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/lib
+  mkdir -p $INSTALL/usr/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P libarmmem.so $INSTALL/usr/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/usr/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
 }
 

packages/devel/glibc/package.mk

@@ -109,18 +109,18 @@ libc_cv_forced_unwind=yes
 libc_cv_c_cleanup=yes
 libc_cv_ssp=no
 libc_cv_ssp_strong=no
-libc_cv_slibdir=/lib
+libc_cv_slibdir=/usr/lib
 EOF
 
 echo "libdir=/usr/lib" >> configparms
-echo "slibdir=/lib" >> configparms
+echo "slibdir=/usr/lib" >> configparms
 echo "sbindir=/usr/bin" >> configparms
 echo "rootsbindir=/usr/bin" >> configparms
 }
 
 post_makeinstall_target() {
 # we are linking against ld.so, so symlink
-  ln -sf $(basename $INSTALL/lib/ld-*.so) $INSTALL/lib/ld.so
+  ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so
 
 # cleanup
   for i in $GLIBC_EXCLUDE_BIN; do
@@ -157,7 +157,7 @@ post_makeinstall_target() {
     cp $PKG_DIR/config/gai.conf $INSTALL/etc
 
   if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
-    ln -sf ld.so $INSTALL/lib/ld-linux.so.3
+    ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3
   fi
 }
 
@@ -171,14 +171,14 @@ make_init() {
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/lib
+  mkdir -p $INSTALL/usr/lib
-    cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/lib
+    cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/usr/lib
-    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/lib
+    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/usr/lib
-    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/lib
+    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/usr/lib
-    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/lib
+    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/usr/lib
-    cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/lib
+    cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/usr/lib
 
     if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
-      ln -sf ld.so $INSTALL/lib/ld-linux.so.3
+      ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3
     fi
 }

packages/lang/gcc/package.mk

@@ -158,6 +158,6 @@ make_init() {
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/lib
+  mkdir -p $INSTALL/usr/lib
-    cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/lib
+    cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
 }

packages/linux-drivers/RTL8188EU/package.mk

@@ -47,6 +47,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
 }

packages/linux-drivers/RTL8192CU/package.mk

@@ -45,6 +45,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
 }

packages/linux-drivers/RTL8192DU/package.mk

@@ -46,6 +46,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
 }

packages/linux-drivers/RTL8192EU/package.mk

@@ -47,6 +47,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
 }

packages/linux-drivers/RTL8812AU/package.mk

@@ -45,6 +45,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
 }

packages/linux-drivers/bcm_sta/package.mk

@@ -41,6 +41,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/bcm_sta
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcm_sta
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
 }

packages/linux-drivers/brcmap6xxx-aml/package.mk

@@ -41,8 +41,8 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/bcmdhd
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd
-  cp *.ko $INSTALL/lib/modules/$(get_module_dir)/bcmdhd
+  cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd
 
   mkdir -p $INSTALL/lib/firmware/brcm
   cp $PKG_DIR/config/config.txt $INSTALL/lib/firmware/brcm

packages/linux-drivers/dvbhdhomerun/package.mk

@@ -57,8 +57,8 @@ pre_configure_target() {
 
 makeinstall_target() {
   cd $ROOT/$PKG_BUILD
-    mkdir -p $INSTALL/lib/modules/$(get_module_dir)/hdhomerun
+    mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun
-      cp kernel/*.ko $INSTALL/lib/modules/$(get_module_dir)/hdhomerun/
+      cp kernel/*.ko $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun/
 
     mkdir -p $INSTALL/usr/bin
       cp -PR .$TARGET_NAME/userhdhomerun $INSTALL/usr/bin

packages/linux-drivers/gpu-aml/package.mk

@@ -39,6 +39,6 @@ make_target() {
 
 makeinstall_target() {
   LDFLAGS="" make -C $(kernel_path) M=$ROOT/$PKG_BUILD/mali \
-    INSTALL_MOD_PATH=$INSTALL INSTALL_MOD_STRIP=1 DEPMOD=: \
+    INSTALL_MOD_PATH=$INSTALL/usr INSTALL_MOD_STRIP=1 DEPMOD=: \
   modules_install
 }

packages/linux-drivers/tbs-linux-drivers/package.mk

@@ -45,8 +45,8 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/updates/tbs
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/updates/tbs
-  find $ROOT/$PKG_BUILD/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$(get_module_dir)/updates/tbs \;
+  find $ROOT/$PKG_BUILD/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$(get_module_dir)/updates/tbs \;
   mkdir -p $INSTALL/lib/firmware/
   cp $ROOT/$PKG_BUILD/*.fw $INSTALL/lib/firmware/
 }

packages/linux-drivers/vboxguest/package.mk

@@ -52,7 +52,7 @@ make_target() {
 
 makeinstall_target() {
   for module in vboxguest vboxsf vboxvideo; do
-    mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$module
+    mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$module
-      cp -P $ROOT/$PKG_BUILD/vbox-kmod/$module.ko $INSTALL/lib/modules/$(get_module_dir)/$module
+      cp -P $ROOT/$PKG_BUILD/vbox-kmod/$module.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$module
   done
 }

packages/linux-drivers/wetekdvb/package.mk

@@ -37,11 +37,11 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
   if [ $PROJECT = "WeTek_Play_2" ]; then
-    cp driver/wetekdvb_play2.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME/wetekdvb.ko
+    cp driver/wetekdvb_play2.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME/wetekdvb.ko
   else
-    cp driver/wetekdvb.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp driver/wetekdvb.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME
   fi
 
   mkdir -p $INSTALL/lib/firmware

packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk

@@ -36,7 +36,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  DESTDIR=$INSTALL ./install
+  DESTDIR=$INSTALL/usr ./install
 }
 
 post_install() {

packages/linux-firmware/dvb-firmware/package.mk

@@ -36,5 +36,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  DESTDIR=$INSTALL ./install
+  DESTDIR=$INSTALL/usr ./install
 }

packages/linux-firmware/firmware-imx/package.mk

@@ -36,7 +36,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/firmware/vpu
+  mkdir -p $INSTALL/usr/lib/firmware/vpu
-    cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/lib/firmware/vpu
+    cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/usr/lib/firmware/vpu
-    cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/lib/firmware/vpu
+    cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/usr/lib/firmware/vpu
 }

packages/linux-firmware/iwlwifi-firmware/package.mk

@@ -36,5 +36,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  DESTDIR=$INSTALL ./install
+  DESTDIR=$INSTALL/usr ./install
 }

packages/linux-firmware/misc-firmware/package.mk

@@ -36,5 +36,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  DESTDIR=$INSTALL ./install
+  DESTDIR=$INSTALL/usr ./install
 }

packages/linux-firmware/wlan-firmware-aml/package.mk

@@ -36,13 +36,13 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/firmware/brcm
+  mkdir -p $INSTALL/usr/lib/firmware/brcm
 
-  cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $INSTALL/lib/firmware/brcm
+  cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $INSTALL/usr/lib/firmware/brcm
-  cp -P bcm_ampak/config/AP6330/Wi-Fi/nvram_ap6330.txt $INSTALL/lib/firmware/brcm
+  cp -P bcm_ampak/config/AP6330/Wi-Fi/nvram_ap6330.txt $INSTALL/usr/lib/firmware/brcm
-  cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/lib/firmware/brcm
+  cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/usr/lib/firmware/brcm
 
-  cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $INSTALL/lib/firmware/brcm
+  cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $INSTALL/usr/lib/firmware/brcm
-  cp -P bcm_ampak/config/6335/nvram.txt $INSTALL/lib/firmware/brcm/nvram_ap6335.txt
+  cp -P bcm_ampak/config/6335/nvram.txt $INSTALL/usr/lib/firmware/brcm/nvram_ap6335.txt
-  cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/lib/firmware/brcm
+  cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/usr/lib/firmware/brcm
 }

packages/linux-firmware/wlan-firmware/package.mk

@@ -36,5 +36,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  DESTDIR=$INSTALL ./install
+  DESTDIR=$INSTALL/usr ./install
 }

packages/linux/package.mk

@@ -170,9 +170,9 @@ pre_make_target() {
 
 make_target() {
   LDFLAGS="" make modules
-  LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install
+  LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL/usr DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install
-  rm -f $INSTALL/lib/modules/*/build
+  rm -f $INSTALL/usr/lib/modules/*/build
-  rm -f $INSTALL/lib/modules/*/source
+  rm -f $INSTALL/usr/lib/modules/*/source
 
   ( cd $ROOT
     rm -rf $ROOT/$BUILD/initramfs
@@ -220,28 +220,28 @@ make_init() {
 makeinstall_init() {
   if [ -n "$INITRAMFS_MODULES" ]; then
     mkdir -p $INSTALL/etc
-    mkdir -p $INSTALL/lib/modules
+    mkdir -p $INSTALL/usr/lib/modules
 
     for i in $INITRAMFS_MODULES; do
-      module=`find .install_pkg/lib/modules/$(get_module_dir)/kernel -name $i.ko`
+      module=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name $i.ko`
       if [ -n "$module" ]; then
         echo $i >> $INSTALL/etc/modules
-        cp $module $INSTALL/lib/modules/`basename $module`
+        cp $module $INSTALL/usr/lib/modules/`basename $module`
       fi
     done
   fi
 
   if [ "$UVESAFB_SUPPORT" = yes ]; then
-    mkdir -p $INSTALL/lib/modules
+    mkdir -p $INSTALL/usr/lib/modules
-      uvesafb=`find .install_pkg/lib/modules/$(get_module_dir)/kernel -name uvesafb.ko`
+      uvesafb=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name uvesafb.ko`
-      cp $uvesafb $INSTALL/lib/modules/`basename $uvesafb`
+      cp $uvesafb $INSTALL/usr/lib/modules/`basename $uvesafb`
   fi
 }
 
 post_install() {
-  mkdir -p $INSTALL/lib/firmware/
+  mkdir -p $INSTALL/usr/lib/firmware/
-    ln -sf /storage/.config/firmware/ $INSTALL/lib/firmware/updates
+    ln -sf /storage/.config/firmware/ $INSTALL/usr/lib/firmware/updates
 
   # bluez looks in /etc/firmware/
-    ln -sf /lib/firmware/ $INSTALL/etc/firmware
+    ln -sf /usr/lib/firmware/ $INSTALL/etc/firmware
 }

packages/linux/udev.d/30-disable-wakeup.rules

@@ -18,6 +18,6 @@
 
 ACTION!="add|change", GOTO="end"
 
-DRIVER=="ehci-pci|xhci_hcd", RUN+="/bin/sh -c 'echo disabled > /sys/$devpath/power/wakeup'"
+DRIVER=="ehci-pci|xhci_hcd", RUN+="/usr/bin/sh -c 'echo disabled > /sys/$devpath/power/wakeup'"
 
 LABEL="end"

packages/linux/udev.d/40-modeswitch.rules

@@ -21,6 +21,6 @@ KERNEL!="sr[0-9]*", GOTO="end_modeswitch"
 SUBSYSTEM!="block", GOTO="end_modeswitch"
 
 # Atheros Wireless / Netgear WNDA3200
-ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/bin/eject '/dev/%k'"
+ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/usr/bin/eject '/dev/%k'"
 
 LABEL="end_modeswitch"

packages/sysutils/busybox/config/busybox-init.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.25.0
+# Busybox version: 1.25.1
-# Wed Jul 20 11:53:10 2016
+# Thu Nov 24 23:29:54 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -25,7 +25,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
 CONFIG_BUSYBOX=y
 # CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_NO_USR=y
 # CONFIG_LOCALE_SUPPORT is not set
 CONFIG_UNICODE_SUPPORT=y
 # CONFIG_UNICODE_USING_LOCALE is not set

packages/sysutils/busybox/config/busybox-target.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.25.0
+# Busybox version: 1.25.1
-# Wed Jul 20 11:54:40 2016
+# Thu Nov 24 23:26:05 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 

packages/sysutils/busybox/package.mk

@@ -97,7 +97,7 @@ configure_target() {
     cp $BUSYBOX_CFG_FILE_TARGET .config
 
     # set install dir
-    sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL\"|" .config
+    sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config
 
     if [ ! "$DEVTOOLS" = yes ]; then
       sed -i -e "s|^CONFIG_DEVMEM=.*$|# CONFIG_DEVMEM is not set|" .config
@@ -134,7 +134,7 @@ configure_init() {
     cp $BUSYBOX_CFG_FILE_INIT .config
 
     # set install dir
-    sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL\"|" .config
+    sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config
 
     # optimize for size
     CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
@@ -160,7 +160,6 @@ makeinstall_target() {
     cp $PKG_DIR/scripts/apt-get $INSTALL/usr/bin/
     cp $PKG_DIR/scripts/passwd $INSTALL/usr/bin/
     cp $PKG_DIR/scripts/sudo $INSTALL/usr/bin/
-    ln -sf /bin/busybox $INSTALL/usr/bin/env          #/usr/bin/env is needed for most python scripts
     cp $PKG_DIR/scripts/pastebinit $INSTALL/usr/bin/
     ln -sf pastebinit $INSTALL/usr/bin/paste
 
@@ -191,10 +190,6 @@ makeinstall_target() {
   # create /etc/hostname
     ln -sf /proc/sys/kernel/hostname $INSTALL/etc/hostname
 
-  # systemd wants /usr/bin/mkdir
-    mkdir -p $INSTALL/usr/bin
-      ln -sf /bin/busybox $INSTALL/usr/bin/mkdir
-
   # add webroot
     mkdir -p $INSTALL/usr/www
       echo "It works" > $INSTALL/usr/www/index.html
@@ -206,7 +201,7 @@ makeinstall_target() {
 post_install() {
   ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $ROOT_PASSWORD`"
 
-  echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT
+  echo "chmod 4755 $INSTALL/usr/bin/busybox" >> $FAKEROOT_SCRIPT
   echo "chmod 000 $INSTALL/etc/shadow" >> $FAKEROOT_SCRIPT
 
   add_user root "$ROOT_PWD" 0 0 "Root User" "/storage" "/bin/sh"
@@ -237,8 +232,8 @@ post_install() {
 
 makeinstall_init() {
   mkdir -p $INSTALL/bin
-    ln -sf busybox $INSTALL/bin/sh
+    ln -sf busybox $INSTALL/usr/bin/sh
-    chmod 4755 $INSTALL/bin/busybox
+    chmod 4755 $INSTALL/usr/bin/busybox
 
   mkdir -p $INSTALL/etc
     touch $INSTALL/etc/fstab

packages/sysutils/busybox/profile.d/98-busybox.conf

@@ -17,8 +17,8 @@
 ################################################################################
 
 export HOME="/storage"
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+export PATH="/usr/bin:/usr/sbin"
-export LD_LIBRARY_PATH="/usr/lib:/lib"
+export LD_LIBRARY_PATH="/usr/lib"
 export HOSTNAME=`cat /etc/hostname`
 export PS1="\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
 # k0p

packages/sysutils/busybox/scripts/init

@@ -21,24 +21,24 @@
 ################################################################################
 
   # create directories
-  /bin/busybox mkdir -p /dev
+  /usr/bin/busybox mkdir -p /dev
-  /bin/busybox mkdir -p /proc
+  /usr/bin/busybox mkdir -p /proc
-  /bin/busybox mkdir -p /sys
+  /usr/bin/busybox mkdir -p /sys
-  /bin/busybox mkdir -p /tmp
+  /usr/bin/busybox mkdir -p /tmp
-  /bin/busybox mkdir -p /flash
+  /usr/bin/busybox mkdir -p /flash
-  /bin/busybox mkdir -p /sysroot
+  /usr/bin/busybox mkdir -p /sysroot
-  /bin/busybox mkdir -p /storage
+  /usr/bin/busybox mkdir -p /storage
 
   # mount all needed special filesystems
-  /bin/busybox mount -t devtmpfs devtmpfs /dev
+  /usr/bin/busybox mount -t devtmpfs devtmpfs /dev
-  /bin/busybox mount -t proc proc /proc
+  /usr/bin/busybox mount -t proc proc /proc
-  /bin/busybox mount -t sysfs sysfs /sys
+  /usr/bin/busybox mount -t sysfs sysfs /sys
 
   # common functions
   . /functions
 
   # set needed variables
-  MODULE_DIR=/lib/modules
+  MODULE_DIR=/usr/lib/modules
 
   UPDATE_ROOT=/storage/.update
   UPDATE_DIR="$UPDATE_ROOT"
@@ -271,19 +271,19 @@
     ISCSI_DEV="${1##*,}"
     ISCSI_OPTIONS="${1%,*}"
 
-    if [ ! -f "/sbin/iscsistart" ]; then
+    if [ ! -f "/usr/sbin/iscsistart" ]; then
       error "iscsistart" "iSCSI support not available"
     fi
 
     if [ "$ISCSI_OPTIONS" = "auto" ]; then
       progress "Network configuration based on iBFT"
-      /sbin/iscsistart -N >&$SILENT_OUT 2>&1 || \
+      /usr/sbin/iscsistart -N >&$SILENT_OUT 2>&1 || \
         error "iscsistart" "Unable to configure network"
       progress "iSCSI auto connect based on iBFT"
-      /sbin/iscsistart -b >&$SILENT_OUT 2>&1 || \
+      /usr/sbin/iscsistart -b >&$SILENT_OUT 2>&1 || \
         error "iscsistart" "Unable to auto connect"
     else
-      /sbin/iscsistart $(get_iscsistart_options "$ISCSI_OPTIONS") >&$SILENT_OUT 2>&1 || \
+      /usr/sbin/iscsistart $(get_iscsistart_options "$ISCSI_OPTIONS") >&$SILENT_OUT 2>&1 || \
         error "iscsistart" "Unable to connect to ISCSI target"
     fi
 
@@ -554,16 +554,16 @@
     sync
 
     # unmount filesystems
-    if /bin/busybox mountpoint -q /flash ; then
+    if /usr/bin/busybox mountpoint -q /flash ; then
-      /bin/busybox umount /flash
+      /usr/bin/busybox umount /flash
     fi
 
-    if /bin/busybox mountpoint -q /storage ; then
+    if /usr/bin/busybox mountpoint -q /storage ; then
-      /bin/busybox umount /storage
+      /usr/bin/busybox umount /storage
     fi
 
     usleep 2000000
-    /bin/busybox reboot
+    /usr/bin/busybox reboot
   }
 
   force_fsck() {
@@ -577,7 +577,7 @@
     if [ "$?" -ne "0" -o "$?" -gt "128" ] ; then
       echo "Repairing filesystem..."
       echo ""
-      /sbin/fsck -T -M -y $RUN_FSCK_DISKS
+      /usr/sbin/fsck -T -M -y $RUN_FSCK_DISKS
       FSCK_RET="$?"
       if [ "$(( $FSCK_RET & 8 ))" = 8 ] ; then
         # fubar
@@ -601,7 +601,7 @@
   check_disks() {
     if [ "$RUN_FSCK" = "yes" -a -n "$RUN_FSCK_DISKS" ]; then
       progress "Checking disk(s): $RUN_FSCK_DISKS"
-      /sbin/fsck -T -M -p -a $RUN_FSCK_DISKS > /dev/null 2>&1
+      /usr/sbin/fsck -T -M -p -a $RUN_FSCK_DISKS > /dev/null 2>&1
       FSCK_RET="$?"
 
       # FSCK_RET is the bit-wise OR of the exit codes for each filesystem that is checked.
@@ -991,7 +991,7 @@
     mount --move /flash /sysroot/flash
     mount --move /storage /sysroot/storage
 
-    if [ ! -d "/sysroot/lib/modules/$(uname -r)/" -a -f "/sysroot/usr/lib/systemd/systemd" ]; then
+    if [ ! -d "/sysroot/usr/lib/modules/$(uname -r)/" -a -f "/sysroot/usr/lib/systemd/systemd" ]; then
       echo ""
       echo "NEVER TOUCH boot= in extlinux.conf / cmdline.txt!"
       echo "If you don't know what you are doing,"
@@ -1040,10 +1040,10 @@
     fi
   done
   # move some special filesystems
-  /bin/busybox mount --move /dev /sysroot/dev
+  /usr/bin/busybox mount --move /dev /sysroot/dev
-  /bin/busybox mount --move /proc /sysroot/proc
+  /usr/bin/busybox mount --move /proc /sysroot/proc
-  /bin/busybox mount --move /sys /sysroot/sys
+  /usr/bin/busybox mount --move /sys /sysroot/sys
-  /bin/busybox rm -fr /tmp
+  /usr/bin/busybox rm -fr /tmp
 
   # tell OE settings addon to disable updates
   if [ "$UPDATE_DISABLED" = "yes" ] ; then
@@ -1068,6 +1068,6 @@
   fi
 
   # switch to new sysroot and start real init
-  exec /bin/busybox switch_root /sysroot /usr/lib/systemd/systemd $INIT_ARGS $INIT_UNIT
+  exec /usr/bin/busybox switch_root /sysroot /usr/lib/systemd/systemd $INIT_ARGS $INIT_UNIT
 
   error "switch_root" "Error in initramfs. Could not switch to new root"

packages/sysutils/diskdev_cmds/package.mk

@@ -38,10 +38,10 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/sbin
+  mkdir -p $INSTALL/usr/sbin
-    cp fsck_hfs.tproj/fsck_hfs $INSTALL/sbin
+    cp fsck_hfs.tproj/fsck_hfs $INSTALL/usr/sbin
-      ln -sf fsck_hfs $INSTALL/sbin/fsck.hfs
+      ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfs
-      ln -sf fsck_hfs $INSTALL/sbin/fsck.hfsplus
+      ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfsplus
 }
 
 make_init() {

packages/sysutils/dosfstools/package.mk

@@ -50,10 +50,10 @@ make_host() {
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/sbin
+  mkdir -p $INSTALL/usr/sbin
-    cp fsck.fat $INSTALL/sbin
+    cp fsck.fat $INSTALL/usr/sbin
-    ln -sf fsck.fat $INSTALL/sbin/fsck.msdos
+    ln -sf fsck.fat $INSTALL/usr/sbin/fsck.msdos
-    ln -sf fsck.fat $INSTALL/sbin/fsck.vfat
+    ln -sf fsck.fat $INSTALL/usr/sbin/fsck.vfat
 }
 
 makeinstall_host() {

packages/sysutils/e2fsprogs/package.mk

@@ -41,9 +41,6 @@ PKG_CONFIGURE_OPTS_HOST="--prefix=/usr \
                          --sbindir=/sbin"
 
 PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
-                           --prefix=/usr \
-                           --bindir=/bin \
-                           --sbindir=/sbin \
                            --enable-verbose-makecmds \
                            --enable-symlink-install \
                            --enable-symlink-build \
@@ -76,32 +73,32 @@ pre_make_host() {
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/sbin/badblocks
+  rm -rf $INSTALL/usr/sbin/badblocks
-  rm -rf $INSTALL/sbin/blkid
+  rm -rf $INSTALL/usr/sbin/blkid
-  rm -rf $INSTALL/sbin/dumpe2fs
+  rm -rf $INSTALL/usr/sbin/dumpe2fs
-  rm -rf $INSTALL/sbin/e2freefrag
+  rm -rf $INSTALL/usr/sbin/e2freefrag
-  rm -rf $INSTALL/sbin/e2undo
+  rm -rf $INSTALL/usr/sbin/e2undo
-  rm -rf $INSTALL/sbin/e4defrag
+  rm -rf $INSTALL/usr/sbin/e4defrag
-  rm -rf $INSTALL/sbin/filefrag
+  rm -rf $INSTALL/usr/sbin/filefrag
-  rm -rf $INSTALL/sbin/fsck
+  rm -rf $INSTALL/usr/sbin/fsck
-  rm -rf $INSTALL/sbin/logsave
+  rm -rf $INSTALL/usr/sbin/logsave
-  rm -rf $INSTALL/sbin/mklost+found
+  rm -rf $INSTALL/usr/sbin/mklost+found
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/sbin
+  mkdir -p $INSTALL/usr/sbin
-    cp e2fsck/e2fsck $INSTALL/sbin
+    cp e2fsck/e2fsck $INSTALL/usr/sbin
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext2
+    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext2
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext3
+    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext3
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4
+    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
+    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4dev
 
   if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then
-    cp misc/mke2fs $INSTALL/sbin
+    cp misc/mke2fs $INSTALL/usr/sbin
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext2
+    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext2
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext3
+    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext3
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4
+    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev
+    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4dev
   fi
 }
 

packages/sysutils/fuse/package.mk

@@ -31,7 +31,8 @@ PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-lib \
+PKG_CONFIGURE_OPTS_TARGET="MOUNT_FUSE_PATH=/usr/sbin \
+                           --enable-lib \
                            --enable-util \
                            --disable-example \
                            --enable-mtab \

packages/sysutils/keyutils/package.mk

@@ -30,11 +30,11 @@ PKG_LONGDESC="Keyutils is a set of utilities for managing the key retention faci
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
-PKG_MAKE_OPTS_TARGET="NO_ARLIB=0 NO_SOLIB=1 LIBDIR=/lib USRLIBDIR=/usr/lib"
+PKG_MAKE_OPTS_TARGET="NO_ARLIB=0 NO_SOLIB=1 BINDIR=/usr/bin SBINDIR=/usr/sbin LIBDIR=/usr/lib USRLIBDIR=/usr/lib"
 PKG_MAKEINSTALL_OPTS_TARGET="$PKG_MAKE_OPTS_TARGET"
 
 post_makeinstall_target() {
-	rm -rf $INSTALL/usr
+	rm -rf $INSTALL/usr/share
 	rmdir $INSTALL/etc/request-key.d
 	ln -sf /storage/.config/request-key.d $INSTALL/etc/request-key.d
 }

packages/sysutils/kmod/package.mk

@@ -59,12 +59,12 @@ post_makeinstall_host() {
 
 post_makeinstall_target() {
 # make symlinks for compatibility
-  mkdir -p $INSTALL/sbin
+  mkdir -p $INSTALL/usr/sbin
-    ln -sf /usr/bin/kmod $INSTALL/sbin/lsmod
+    ln -sf /usr/bin/kmod $INSTALL/usr/sbin/lsmod
-    ln -sf /usr/bin/kmod $INSTALL/sbin/insmod
+    ln -sf /usr/bin/kmod $INSTALL/usr/sbin/insmod
-    ln -sf /usr/bin/kmod $INSTALL/sbin/rmmod
+    ln -sf /usr/bin/kmod $INSTALL/usr/sbin/rmmod
-    ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo
+    ln -sf /usr/bin/kmod $INSTALL/usr/sbin/modinfo
-    ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe
+    ln -sf /usr/bin/kmod $INSTALL/usr/sbin/modprobe
 
   mkdir -p $INSTALL/etc
     ln -sf /storage/.config/modprobe.d $INSTALL/etc/modprobe.d

packages/sysutils/ntfs-3g_ntfsprogs/package.mk

@@ -31,7 +31,8 @@ PKG_LONGDESC="The NTFS-3G_ntfsprogs driver is an open source, freely available N
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
+PKG_CONFIGURE_OPTS_TARGET="--exec-prefix=/usr/ \
+                           --disable-dependency-tracking \
                            --disable-library \
                            --enable-posix-acls \
                            --enable-mtab \
@@ -42,11 +43,18 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
 
 post_makeinstall_target() {
   # dont include ntfsprogs.
-  rm -rf $INSTALL/usr/sbin
+  for i in $INSTALL/usr/bin/*; do
-  rm -rf $INSTALL/usr/bin
+    if [ "$(basename $i)" != "ntfs-3g" ]; then
-  rm -rf $INSTALL/bin/lowntfs-3g
+      rm $i
-  rm -rf $INSTALL/sbin/mount.lowntfs-3g
+    fi
+  done
 
-  mkdir -p $INSTALL/sbin
+  rm -rf $INSTALL/sbin
-    ln -sf /bin/ntfs-3g $INSTALL/sbin/mount.ntfs
+  rm -rf $INSTALL/usr/sbin/ntfsclone
+  rm -rf $INSTALL/usr/sbin/ntfscp
+  rm -rf $INSTALL/usr/sbin/ntfsundelete
+
+  mkdir -p $INSTALL/usr/sbin
+    ln -sf /usr/bin/ntfs-3g $INSTALL/usr/sbin/mount.ntfs
+    ln -sf /usr/sbin/mkntfs $INSTALL/usr/sbin/mkfs.ntfs
 }

packages/sysutils/open-iscsi/package.mk

@@ -47,6 +47,6 @@ configure_init() {
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/sbin
+  mkdir -p $INSTALL/usr/sbin
-    cp -P $ROOT/$PKG_BUILD/usr/iscsistart $INSTALL/sbin
+    cp -P $ROOT/$PKG_BUILD/usr/iscsistart $INSTALL/usr/sbin
 }

packages/sysutils/systemd/package.mk

@@ -34,8 +34,8 @@ PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_have_decl_IFLA_BOND_AD_INFO=no \
                            ac_cv_have_decl_IFLA_BRPORT_UNICAST_FLOOD=no \
-                           ac_cv_path_MOUNT_PATH="/bin/mount"
+                           ac_cv_path_MOUNT_PATH="/usr/bin/mount"
-                           ac_cv_path_UMOUNT_PATH="/bin/umount"
+                           ac_cv_path_UMOUNT_PATH="/usr/bin/umount"
                            KMOD=/usr/bin/kmod \
                            --disable-nls \
                            --disable-dbus \
@@ -93,7 +93,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-manpages \
                            --disable-hibernate \
                            --disable-ldconfig \
-                           --enable-split-usr \
+                           --disable-split-usr \
                            --disable-tests \
                            --without-python \
                            --with-sysvinit-path= \

packages/sysutils/udevil/package.mk

@@ -32,9 +32,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-systemd \
-                           --with-mount-prog=/bin/mount \
+                           --with-mount-prog=/usr/bin/mount \
-                           --with-umount-prog=/bin/umount \
+                           --with-umount-prog=/usr/bin/umount \
-                           --with-losetup-prog=/sbin/losetup \
+                           --with-losetup-prog=/usr/sbin/losetup \
                            --with-setfacl-prog=/usr/bin/setfacl"
 
 makeinstall_target() {

packages/sysutils/util-linux/package.mk

@@ -82,13 +82,7 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static \
                          --enable-uuidgen \
                          --enable-libuuid"
 
-PKG_CONFIGURE_OPTS_INIT="--prefix=/ \
+PKG_CONFIGURE_OPTS_INIT="$UTILLINUX_CONFIG_DEFAULT \
-                         --bindir=/bin \
-                         --sbindir=/sbin \
-                         --sysconfdir=/etc \
-                         --libexecdir=/lib \
-                         --localstatedir=/var \
-                         $UTILLINUX_CONFIG_DEFAULT \
                          --enable-libblkid \
                          --enable-libmount \
                          --enable-fsck"

packages/sysutils/v86d/package.mk

@@ -38,3 +38,7 @@ pre_configure_init() {
   cd $ROOT/$PKG_BUILD
     rm -rf .$TARGET_NAME-init
 }
+
+makeinstall_init() {
+  DESTDIR=$INSTALL/usr make install
+}

packages/tools/hdparm/package.mk

@@ -31,4 +31,7 @@ PKG_LONGDESC="Shell utility to access/tune ioctl features of the Linux IDE drive
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_MAKE_OPTS_TARGET="binprefix=/usr sbindir=/usr/bin"
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/sbin
+    cp -a $ROOT/$PKG_BUILD/hdparm $INSTALL/usr/sbin
+}

packages/tools/plymouth-lite/package.mk

@@ -42,8 +42,8 @@ pre_configure_init() {
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/bin
+  mkdir -p $INSTALL/usr/bin
-    cp ply-image $INSTALL/bin
+    cp ply-image $INSTALL/usr/bin
 
   mkdir -p $INSTALL/splash
     if [ -f $PROJECT_DIR/$PROJECT/splash/splash.conf ]; then

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"

packages/x11/driver/xf86-video-nvidia-legacy/package.mk

@@ -67,8 +67,8 @@ makeinstall_target() {
   # rename to not conflicting with Mesa libGL.so
     cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia-legacy.so.1
 
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/nvidia
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia
-    ln -sf /var/lib/nvidia.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia/nvidia.ko
+    ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko
 
   mkdir -p $INSTALL/usr/lib/nvidia-legacy
     cp kernel/nvidia.ko $INSTALL/usr/lib/nvidia-legacy

packages/x11/driver/xf86-video-nvidia/package.mk

@@ -70,10 +70,10 @@ makeinstall_target() {
   # rename to not conflicting with Mesa libGL.so
     cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1
 
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/nvidia
+  mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia
-    ln -sf /var/lib/nvidia.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia/nvidia.ko
+    ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko
-    cp -P kernel/nvidia-uvm.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia
+    cp -P kernel/nvidia-uvm.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia
-    cp -P kernel/nvidia-modeset.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia
+    cp -P kernel/nvidia-modeset.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia
 
   mkdir -p $INSTALL/usr/lib/nvidia
     cp -P kernel/nvidia.ko $INSTALL/usr/lib/nvidia

scripts/build

@@ -121,6 +121,7 @@ if [ ! -f $STAMP ]; then
                            --bindir=/usr/bin \
                            --sbindir=/usr/sbin \
                            --sysconfdir=/etc \
+                           --libdir=/usr/lib \
                            --libexecdir=/usr/lib \
                            --localstatedir=/var \
                            --disable-static \

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 /usr/lib $INSTALL/lib64
-  ln -s lib $INSTALL/usr/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/*))
+MODVER=$(basename $(ls -d $INSTALL/usr/lib/modules/*))
-find $INSTALL/lib/modules/$MODVER/ -name *.ko | \
+find $INSTALL/usr/lib/modules/$MODVER/ -name *.ko | \
-  sed -e "s,$INSTALL/lib/modules/$MODVER/,," > $INSTALL/lib/modules/$MODVER/modules.order
+  sed -e "s,$INSTALL/usr/lib/modules/$MODVER/,," > $INSTALL/usr/lib/modules/$MODVER/modules.order
-$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL $MODVER 2> /dev/null
+$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
 

scripts/install

@@ -123,8 +123,8 @@ if [ "$TARGET" = target ] ; then
   fi
 
   if [ -d $PKG_DIR/modprobe.d ]; then
-    mkdir -p $INSTALL/lib/modprobe.d
+    mkdir -p $INSTALL/usr/lib/modprobe.d
-    cp $PKG_DIR/modprobe.d/*.conf $INSTALL/lib/modprobe.d
+    cp $PKG_DIR/modprobe.d/*.conf $INSTALL/usr/lib/modprobe.d
   fi
 fi