initramfs: update meta file

Signed-off-by: Stephan Raue <[email protected]>
gcc-final: use $INSTALL_ROOT and $INSTALL_SYSTEM to seperate initramfs from system
2026-11-07 10:36:03 -10:00 · 2012-02-19 14:27:31 +01:00 · 2012-02-19 14:27:08 +01:00 · 2012-02-19 14:26:53 +01:00 · 2012-02-19 14:26:27 +01:00 · 2012-02-19 14:26:10 +01:00
286 changed files with 1770 additions and 3439 deletions
@@ -90,28 +90,28 @@ xorg_drv_configure_prepend() {

 add_user() {
  # Usage: add_user "username" "password" "userid" "groupid" "description" "home" "shell"
-  mkdir -p ${INSTALL}/etc
-  touch ${INSTALL}/etc/passwd
-  if [ -z "`grep "$1:" ${INSTALL}/etc/passwd`" ]; then
-    echo "$1:x:$3:$4:$5:$6:$7" >> ${INSTALL}/etc/passwd
+  mkdir -p ${INSTALL_SYSTEM}/etc
+  touch ${INSTALL_SYSTEM}/etc/passwd
+  if [ -z "`grep "$1:" ${INSTALL_SYSTEM}/etc/passwd`" ]; then
+    echo "$1:x:$3:$4:$5:$6:$7" >> ${INSTALL_SYSTEM}/etc/passwd
  fi

-  touch ${INSTALL}/etc/shadow
+  touch ${INSTALL_SYSTEM}/etc/shadow
  PASSWORD="$2"
  if [ "$PASSWORD" = "x" ]; then
    PASSWORD="*"
  fi
-  if [ -z "`grep "$1:" ${INSTALL}/etc/shadow`" ]; then
-    echo "$1:$PASSWORD:::::::" >> ${INSTALL}/etc/shadow
+  if [ -z "`grep "$1:" ${INSTALL_SYSTEM}/etc/shadow`" ]; then
+    echo "$1:$PASSWORD:::::::" >> ${INSTALL_SYSTEM}/etc/shadow
  fi
 }

 add_group() {
  # Usage: add_group "groupname" "groupid" ("members")
-  mkdir -p ${INSTALL}/etc
-  touch ${INSTALL}/etc/group
-  if [ -z "`grep "$1:" ${INSTALL}/etc/group`" ]; then
-    echo "$1:x:$2:$3" >> ${INSTALL}/etc/group
+  mkdir -p ${INSTALL_SYSTEM}/etc
+  touch ${INSTALL_SYSTEM}/etc/group
+  if [ -z "`grep "$1:" ${INSTALL_SYSTEM}/etc/group`" ]; then
+    echo "$1:x:$2:$3" >> ${INSTALL_SYSTEM}/etc/group
  fi
 }

@@ -32,6 +32,9 @@ TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-

 FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH

+INSTALL_ROOT=$BUILD/image/initramfs
+INSTALL_SYSTEM=$BUILD/image/system
+
 . config/sources

 if [ "$OPENELEC_VERSION" = devel ]; then
@@ -66,12 +69,9 @@ SED="sed -i"
  [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
  [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`

-XORG_PATH_DRI=/usr/lib/dri
-XORG_PATH_XKB=/usr/share/X11/xkb
-XORG_PATH_XKB_OUTPUT=/var/lib/xkb
-XORG_PATH_RGB=/usr/lib/X11/rgb
-XORG_PATH_MODULES=/usr/lib/xorg/modules
-XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
+XORG_PATH_DRI=/lib/dri
+XORG_PATH_XKB=/share/X11/xkb
+XORG_PATH_MODULES=/lib/xorg/modules

 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib/vdr
-  cp $PKG_BUILD/libvdr-dynamite.so.* $INSTALL/usr/lib/vdr
+mkdir -p $INSTALL_SYSTEM/lib/vdr
+  cp $PKG_BUILD/libvdr-dynamite.so.* $INSTALL_SYSTEM/lib/vdr
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib/vdr
-  cp $BUILD/iptv-*/libvdr-iptv.so.* $INSTALL/usr/lib/vdr
+mkdir -p $INSTALL_SYSTEM/lib/vdr
+  cp $BUILD/iptv-*/libvdr-iptv.so.* $INSTALL_SYSTEM/lib/vdr
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib/vdr
-  cp $PKG_BUILD/libvdr-dvbapi.so.* $INSTALL/usr/lib/vdr
+mkdir -p $INSTALL_SYSTEM/lib/vdr
+  cp $PKG_BUILD/libvdr-dvbapi.so.* $INSTALL_SYSTEM/lib/vdr
@@ -22,8 +22,8 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib/vdr
-  cp $PKG_BUILD/libvdr-xvdr.so.* $INSTALL/usr/lib/vdr
+mkdir -p $INSTALL_SYSTEM/lib/vdr
+  cp $PKG_BUILD/libvdr-xvdr.so.* $INSTALL_SYSTEM/lib/vdr

-mkdir -p $INSTALL/usr/config/vdr/plugins/xvdr
-  cp $PKG_DIR/config/allowed_hosts.conf $INSTALL/usr/config/vdr/plugins/xvdr/
+mkdir -p $INSTALL_SYSTEM/config/vdr/plugins/xvdr
+  cp $PKG_DIR/config/allowed_hosts.conf $INSTALL_SYSTEM/config/vdr/plugins/xvdr/
@@ -24,8 +24,8 @@

 ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2"

-mkdir -p $INSTALL/usr/lib/vdr
-  cp $PKG_BUILD/libvdr-sc.so.* $INSTALL/usr/lib/vdr
+mkdir -p $INSTALL_SYSTEM/lib/vdr
+  cp $PKG_BUILD/libvdr-sc.so.* $INSTALL_SYSTEM/lib/vdr
  for plugin in $ENABLED_PLUGINS; do
-    cp $PKG_BUILD/systems/$plugin/libsc-*.so.* $INSTALL/usr/lib/vdr
+    cp $PKG_BUILD/systems/$plugin/libsc-*.so.* $INSTALL_SYSTEM/lib/vdr
  done
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib/vdr
-  cp $BUILD/wirbelscan-*/libvdr-wirbelscan.so.* $INSTALL/usr/lib/vdr
+mkdir -p $INSTALL_SYSTEM/lib/vdr
+  cp $BUILD/wirbelscan-*/libvdr-wirbelscan.so.* $INSTALL_SYSTEM/lib/vdr
@@ -23,16 +23,16 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/vdr $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp -P $PKG_BUILD/vdr $INSTALL_SYSTEM/bin

-mkdir -p $INSTALL/usr/lib/vdr
+mkdir -p $INSTALL_SYSTEM/lib/vdr

-mkdir -p $INSTALL/usr/config/vdr
-  cp $PKG_BUILD/channels.conf* $INSTALL/usr/config/vdr
-  cp $PKG_BUILD/diseqc.conf $INSTALL/usr/config/vdr
-  cp $PKG_BUILD/keymacros.conf $INSTALL/usr/config/vdr
-  cp $PKG_BUILD/scr.conf $INSTALL/usr/config/vdr
-  cp $PKG_BUILD/sources.conf $INSTALL/usr/config/vdr
-  cp $PKG_BUILD/svdrhosts.conf $INSTALL/usr/config/vdr
-  echo '0.0.0.0/0' >> $INSTALL/usr/config/vdr/svdrphosts.conf
+mkdir -p $INSTALL_SYSTEM/config/vdr
+  cp $PKG_BUILD/channels.conf* $INSTALL_SYSTEM/config/vdr
+  cp $PKG_BUILD/diseqc.conf $INSTALL_SYSTEM/config/vdr
+  cp $PKG_BUILD/keymacros.conf $INSTALL_SYSTEM/config/vdr
+  cp $PKG_BUILD/scr.conf $INSTALL_SYSTEM/config/vdr
+  cp $PKG_BUILD/sources.conf $INSTALL_SYSTEM/config/vdr
+  cp $PKG_BUILD/svdrhosts.conf $INSTALL_SYSTEM/config/vdr
+  echo '0.0.0.0/0' >> $INSTALL_SYSTEM/config/vdr/svdrphosts.conf
@@ -22,6 +22,6 @@

 . config/options

-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/w_scan $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp -P $PKG_BUILD/w_scan $INSTALL_SYSTEM/bin

@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/$1/.libs/libatk*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/$1/.libs/libatk*.so* $INSTALL_SYSTEM/lib
@@ -24,18 +24,18 @@

 add_group audio 63

-mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/src/.libs/libasound.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -PR $PKG_BUILD/src/.libs/libasound.so* $INSTALL_SYSTEM/lib

-mkdir -p $INSTALL/usr/lib/alsa
-  cp -PR $PKG_BUILD/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa
+mkdir -p $INSTALL_SYSTEM/lib/alsa
+  cp -PR $PKG_BUILD/modules/mixer/simple/.libs/*.so $INSTALL_SYSTEM/lib/alsa

-mkdir -p $INSTALL/usr/share/alsa
+mkdir -p $INSTALL_SYSTEM/share/alsa
  sed 's%~/\.asoundrc%/storage/\.config/asound.conf%' \
-    $PKG_BUILD/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf
-  cp -P $PKG_BUILD/src/conf/smixer.conf $INSTALL/usr/share/alsa
-  cp -P $PKG_BUILD/src/conf/*.alisp $INSTALL/usr/share/alsa
-  cp -PR $PKG_BUILD/src/conf/cards $INSTALL/usr/share/alsa/
-  cp -PR $PKG_BUILD/src/conf/pcm $INSTALL/usr/share/alsa/
-  rm -f $INSTALL/usr/share/alsa/cards/Makefile*
-  rm -f $INSTALL/usr/share/alsa/pcm/Makefile*
+    $PKG_BUILD/src/conf/alsa.conf > $INSTALL_SYSTEM/share/alsa/alsa.conf
+  cp -P $PKG_BUILD/src/conf/smixer.conf $INSTALL_SYSTEM/share/alsa
+  cp -P $PKG_BUILD/src/conf/*.alisp $INSTALL_SYSTEM/share/alsa
+  cp -PR $PKG_BUILD/src/conf/cards $INSTALL_SYSTEM/share/alsa/
+  cp -PR $PKG_BUILD/src/conf/pcm $INSTALL_SYSTEM/share/alsa/
+  rm -f $INSTALL_SYSTEM/share/alsa/cards/Makefile*
+  rm -f $INSTALL_SYSTEM/share/alsa/pcm/Makefile*
@@ -22,12 +22,12 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib/alsa
-  cp -P $PKG_BUILD/*/.libs/*.so $INSTALL/usr/lib/alsa
-  if [ -f $INSTALL/usr/lib/alsa/libasound_module_rate_speexrate.so ]; then
-    ln -sf libasound_module_rate_speexrate.so $INSTALL/usr/lib/alsa/libasound_module_rate_speexrate_best.so
-    ln -sf libasound_module_rate_speexrate.so $INSTALL/usr/lib/alsa/libasound_module_rate_speexrate_medium.so
+mkdir -p $INSTALL_SYSTEM/lib/alsa
+  cp -P $PKG_BUILD/*/.libs/*.so $INSTALL_SYSTEM/lib/alsa
+  if [ -f $INSTALL_SYSTEM/lib/alsa/libasound_module_rate_speexrate.so ]; then
+    ln -sf libasound_module_rate_speexrate.so $INSTALL_SYSTEM/lib/alsa/libasound_module_rate_speexrate_best.so
+    ln -sf libasound_module_rate_speexrate.so $INSTALL_SYSTEM/lib/alsa/libasound_module_rate_speexrate_medium.so
  fi

-mkdir -p $INSTALL/usr/share/alsa/pcm
-  cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm
+mkdir -p $INSTALL_SYSTEM/share/alsa/pcm
+  cp -R $PKG_DIR/config/*.conf $INSTALL_SYSTEM/share/alsa/pcm
@@ -22,17 +22,17 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/amixer/amixer $INSTALL/usr/bin
-  cp $PKG_BUILD/aplay/aplay $INSTALL/usr/bin
-  cp $PKG_BUILD/speaker-test/speaker-test $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/amixer/amixer $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/aplay/aplay $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/speaker-test/speaker-test $INSTALL_SYSTEM/bin

-mkdir -p $INSTALL/lib/udev
-  cp $PKG_DIR/scripts/soundconfig $INSTALL/lib/udev
+mkdir -p $INSTALL_SYSTEM/lib/udev
+  cp $PKG_DIR/scripts/soundconfig $INSTALL_SYSTEM/lib/udev

-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/alsactl/alsactl $INSTALL/usr/sbin
+mkdir -p $INSTALL_SYSTEM/sbin
+  cp $PKG_BUILD/alsactl/alsactl $INSTALL_SYSTEM/sbin

-mkdir -p $INSTALL/usr/share/alsa/init
-  cp $PKG_BUILD/alsactl/init/* $INSTALL/usr/share/alsa/init
-  rm -rf $INSTALL/usr/share/alsa/init/Makefile*
+mkdir -p $INSTALL_SYSTEM/share/alsa/init
+  cp $PKG_BUILD/alsactl/init/* $INSTALL_SYSTEM/share/alsa/init
+  rm -rf $INSTALL_SYSTEM/share/alsa/init/Makefile*
@@ -22,8 +22,8 @@

 . config/options $1

-mkdir -p $INSTALL/etc/modprobe.d
-  cp -P $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d
+mkdir -p $INSTALL_SYSTEM/etc/modprobe.d
+  cp -P $PKG_DIR/config/alsa-base.conf $INSTALL_SYSTEM/etc/modprobe.d

-mkdir -p $INSTALL/usr/config
-  cp -R $PKG_DIR/config/*.sample $INSTALL/usr/config
+mkdir -p $INSTALL_SYSTEM/config
+  cp -R $PKG_DIR/config/*.sample $INSTALL_SYSTEM/config
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libfaad/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libfaad/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
- cp -P $PKG_BUILD/src/libFLAC/.libs/libFLAC.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+ cp -P $PKG_BUILD/src/libFLAC/.libs/libFLAC.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libmp3lame/.libs/libmp3lame.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libmp3lame/.libs/libmp3lame.so* $INSTALL_SYSTEM/lib
@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/*/.libs/*.so $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/lib/*/.libs/*.so $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
- cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+ cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libogg*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/src/.libs/libogg*.so* $INSTALL_SYSTEM/lib
@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL_SYSTEM/lib

@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/.libs/libvorbis*.so*[.0-9] $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/lib/.libs/libvorbis*.so*[.0-9] $INSTALL_SYSTEM/lib
@@ -6,58 +6,58 @@
 # add_group pulse 498
 # add_group pulse-access 497

-mkdir -p $INSTALL/etc/dbus-1/system.d
-  cp $PKG_BUILD/src/daemon/pulseaudio-system.conf $INSTALL/etc/dbus-1/system.d
-  sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf
+mkdir -p $INSTALL_SYSTEM/etc/dbus-1/system.d
+  cp $PKG_BUILD/src/daemon/pulseaudio-system.conf $INSTALL_SYSTEM/etc/dbus-1/system.d
+  sed -e 's%user="pulse"%user="root"%g' -i $INSTALL_SYSTEM/etc/dbus-1/system.d/pulseaudio-system.conf

-mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/asound.conf $INSTALL/etc
+mkdir -p $INSTALL_SYSTEM/etc
+  cp $PKG_DIR/config/asound.conf $INSTALL_SYSTEM/etc

-mkdir -p $INSTALL/etc/alsa
-  cp $PKG_DIR/config/pulse-default.conf $INSTALL/etc/alsa
+mkdir -p $INSTALL_SYSTEM/etc/alsa
+  cp $PKG_DIR/config/pulse-default.conf $INSTALL_SYSTEM/etc/alsa

-mkdir -p $INSTALL/etc/pulse
-  cp $PKG_BUILD/src/client.conf $INSTALL/etc/pulse
-  cp $PKG_BUILD/src/daemon.conf $INSTALL/etc/pulse
-#  cp $PKG_BUILD/src/default.pa $INSTALL/etc/pulse
-#  cp $PKG_DIR/config/default.pa $INSTALL/etc/pulse
-  cp $PKG_BUILD/src/system.pa $INSTALL/etc/pulse
+mkdir -p $INSTALL_SYSTEM/etc/pulse
+  cp $PKG_BUILD/src/client.conf $INSTALL_SYSTEM/etc/pulse
+  cp $PKG_BUILD/src/daemon.conf $INSTALL_SYSTEM/etc/pulse
+#  cp $PKG_BUILD/src/default.pa $INSTALL_SYSTEM/etc/pulse
+#  cp $PKG_DIR/config/default.pa $INSTALL_SYSTEM/etc/pulse
+  cp $PKG_BUILD/src/system.pa $INSTALL_SYSTEM/etc/pulse

-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules $INSTALL/lib/udev/rules.d
+mkdir -p $INSTALL_SYSTEM/lib/udev/rules.d
+  cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules $INSTALL_SYSTEM/lib/udev/rules.d

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/src/.libs/pacat $INSTALL/usr/bin
-  cp $PKG_BUILD/src/.libs/pacmd $INSTALL/usr/bin
-  cp $PKG_BUILD/src/.libs/pactl $INSTALL/usr/bin
-  ln -sf pactl $INSTALL/usr/bin/pamon
-  ln -sf pactl $INSTALL/usr/bin/paplay
-  ln -sf pactl $INSTALL/usr/bin/parec
-  ln -sf pactl $INSTALL/usr/bin/parecord
-  cp $PKG_BUILD/src/.libs/pasuspender $INSTALL/usr/bin
-#  cp $PKG_BUILD/src/.libs/pax11publish $INSTALL/usr/bin
-  cp $PKG_BUILD/src/.libs/pulseaudio $INSTALL/usr/bin
-#  cp $PKG_BUILD/src/start-pulseaudio-x11 $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/src/.libs/pacat $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/src/.libs/pacmd $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/src/.libs/pactl $INSTALL_SYSTEM/bin
+  ln -sf pactl $INSTALL_SYSTEM/bin/pamon
+  ln -sf pactl $INSTALL_SYSTEM/bin/paplay
+  ln -sf pactl $INSTALL_SYSTEM/bin/parec
+  ln -sf pactl $INSTALL_SYSTEM/bin/parecord
+  cp $PKG_BUILD/src/.libs/pasuspender $INSTALL_SYSTEM/bin
+#  cp $PKG_BUILD/src/.libs/pax11publish $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/src/.libs/pulseaudio $INSTALL_SYSTEM/bin
+#  cp $PKG_BUILD/src/start-pulseaudio-x11 $INSTALL_SYSTEM/bin

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libpulse*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libpulse*.so*T
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/src/.libs/libpulse*.so* $INSTALL_SYSTEM/lib
+  rm -rf $INSTALL_SYSTEM/lib/libpulse*.so*T

-mkdir -p $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libalsa-util.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libavahi-wrap.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libcli.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libprotocol-cli.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libprotocol-esound.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libprotocol-http.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libprotocol-native.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libprotocol-simple.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libraop.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/librtp.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/module-*.so $INSTALL/usr/lib/pulse
+mkdir -p $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libalsa-util.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libavahi-wrap.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libcli.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libprotocol-cli.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libprotocol-esound.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libprotocol-http.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libprotocol-native.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libprotocol-simple.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/libraop.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/librtp.so $INSTALL_SYSTEM/lib/pulse
+  cp -P $PKG_BUILD/src/.libs/module-*.so $INSTALL_SYSTEM/lib/pulse

-mkdir -p $INSTALL/usr/share/pulseaudio/alsa-mixer/paths
-  cp $PKG_BUILD/src/modules/alsa/mixer/paths/* $INSTALL/usr/share/pulseaudio/alsa-mixer/paths
+mkdir -p $INSTALL_SYSTEM/share/pulseaudio/alsa-mixer/paths
+  cp $PKG_BUILD/src/modules/alsa/mixer/paths/* $INSTALL_SYSTEM/share/pulseaudio/alsa-mixer/paths

-mkdir -p $INSTALL/usr/share/pulseaudio/alsa-mixer/profile-sets
-  cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/*.conf $INSTALL/usr/share/pulseaudio/alsa-mixer/profile-sets
+mkdir -p $INSTALL_SYSTEM/share/pulseaudio/alsa-mixer/profile-sets
+  cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/*.conf $INSTALL_SYSTEM/share/pulseaudio/alsa-mixer/profile-sets
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libspeex/.libs/libspeexdsp.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libspeex/.libs/libspeexdsp.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/*.so* $INSTALL_SYSTEM/lib
@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/.build-target/src/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -PR $PKG_BUILD/.build-target/src/.libs/*.so* $INSTALL_SYSTEM/lib

@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $BUILD/$1/unrar $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $BUILD/$1/unrar $INSTALL_SYSTEM/bin

@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $BUILD/$1*/unzip $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $BUILD/$1*/unzip $INSTALL_SYSTEM/bin

@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_ROOT/lib
+  cp -R $PKG_BUILD/*.so* $INSTALL_ROOT/lib
@@ -22,8 +22,8 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL_SYSTEM/lib

-mkdir -p $INSTALL/usr/share/mysql/charsets
-  cp -R $PKG_BUILD/sql/share/charsets/*.xml $INSTALL/usr/share/mysql/charsets
+mkdir -p $INSTALL_SYSTEM/share/mysql/charsets
+  cp -R $PKG_BUILD/sql/share/charsets/*.xml $INSTALL_SYSTEM/share/mysql/charsets
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,7 +22,7 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/objdir/$1/$1 $INSTALL/usr/bin
-  cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL/usr/bin
-  cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/objdir/$1/$1 $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL_SYSTEM/bin
@@ -22,7 +22,7 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/src/xdemos/glxdemo $INSTALL/usr/bin
-  cp $PKG_BUILD/src/xdemos/glxgears $INSTALL/usr/bin
-  cp $PKG_BUILD/src/xdemos/glxinfo $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/src/xdemos/glxdemo $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/src/xdemos/glxgears $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/src/xdemos/glxinfo $INSTALL_SYSTEM/bin
@@ -22,7 +22,7 @@

 . config/options

-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_DIR/scripts/$1-session $INSTALL/usr/bin
-  cp -P $PKG_BUILD/src/$1 $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp -P $PKG_DIR/scripts/$1-session $INSTALL_SYSTEM/bin
+  cp -P $PKG_BUILD/src/$1 $INSTALL_SYSTEM/bin

@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/strace $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/strace $INSTALL_SYSTEM/bin
@@ -22,7 +22,7 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/tvdump $INSTALL/usr/bin
-  cp $PKG_BUILD/tvdump2code.py $INSTALL/usr/bin/tvdump2code
-    chmod +x $INSTALL/usr/bin/tvdump2code
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/tvdump $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/tvdump2code.py $INSTALL_SYSTEM/bin/tvdump2code
+    chmod +x $INSTALL_SYSTEM/bin/tvdump2code
@@ -23,6 +23,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libattr/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libattr/.libs/*.so* $INSTALL_SYSTEM/lib

@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/bin.v2/libs/*/build/*/release/*/*.so.* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/bin.v2/libs/*/build/*/release/*/*.so.* $INSTALL_SYSTEM/lib

@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/dbus/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.build-target/dbus/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/src/eggdbus/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.build-target/src/eggdbus/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,11 +22,11 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/.build-target/src/.libs/file $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/.build-target/src/.libs/file $INSTALL_SYSTEM/bin

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/src/.libs/libmagic.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.build-target/src/.libs/libmagic.so* $INSTALL_SYSTEM/lib

-mkdir -p $INSTALL/usr/share/misc
-  cp $PKG_BUILD/.build-target/magic/magic.mgc $INSTALL/usr/share/misc
+mkdir -p $INSTALL_SYSTEM/share/misc
+  cp $PKG_BUILD/.build-target/magic/magic.mgc $INSTALL_SYSTEM/share/misc
@@ -22,19 +22,19 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/glib/.libs/libglib*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libglib*.so*T
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.build-target/glib/.libs/libglib*.so* $INSTALL_SYSTEM/lib
+  rm -rf $INSTALL_SYSTEM/lib/libglib*.so*T

-  cp -P $PKG_BUILD/.build-target/gmodule/.libs/libgmodule*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libgmodule*.so*T
+  cp -P $PKG_BUILD/.build-target/gmodule/.libs/libgmodule*.so* $INSTALL_SYSTEM/lib
+  rm -rf $INSTALL_SYSTEM/lib/libgmodule*.so*T

-  cp -P $PKG_BUILD/.build-target/gobject/.libs/libgobject*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libgobject*.so*T
+  cp -P $PKG_BUILD/.build-target/gobject/.libs/libgobject*.so* $INSTALL_SYSTEM/lib
+  rm -rf $INSTALL_SYSTEM/lib/libgobject*.so*T

-  cp -P $PKG_BUILD/.build-target/gthread/.libs/libgthread*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libgthread*.so*T
+  cp -P $PKG_BUILD/.build-target/gthread/.libs/libgthread*.so* $INSTALL_SYSTEM/lib
+  rm -rf $INSTALL_SYSTEM/lib/libgthread*.so*T

-  cp -P $PKG_BUILD/.build-target/gio/.libs/libgio*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libgio*.so*T
+  cp -P $PKG_BUILD/.build-target/gio/.libs/libgio*.so* $INSTALL_SYSTEM/lib
+  rm -rf $INSTALL_SYSTEM/lib/libgio*.so*T

@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.objdir-target/.libs/libgmp.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.objdir-target/.libs/libgmp.so* $INSTALL_SYSTEM/lib
@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libjson*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.libs/libjson*.so* $INSTALL_SYSTEM/lib

@@ -23,5 +23,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libcap/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libcap/*.so* $INSTALL_SYSTEM/lib
@@ -22,10 +22,10 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL_SYSTEM/lib

 if [ "$DEVTOOLS" = yes ]; then
-  mkdir -p $INSTALL/usr/bin
-    cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL/usr/bin
+  mkdir -p $INSTALL_SYSTEM/bin
+    cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL_SYSTEM/bin
 fi
@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libevent*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.libs/libevent*.so* $INSTALL_SYSTEM/lib

@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.build-target/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,7 +22,7 @@

 . config/options

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libcharset/lib/.libs/*.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/charset.alias $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libcharset/lib/.libs/*.so* $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/lib/charset.alias $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/build/src/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/build/src/*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.objdir-target/libltdl/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.objdir-target/libltdl/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/Release/lib/libLLVM-*.so $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.build-target/Release/lib/libLLVM-*.so $INSTALL_SYSTEM/lib

@@ -22,28 +22,28 @@

 . config/options $1

-  mkdir -p $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/lib/libncurses.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/lib/libtinfo.so* $INSTALL/usr/lib
+  mkdir -p $INSTALL_SYSTEM/lib
+    cp -PR $PKG_BUILD/lib/libncurses.so* $INSTALL_SYSTEM/lib
+    cp -PR $PKG_BUILD/lib/libtinfo.so* $INSTALL_SYSTEM/lib

  if [ "$DEVTOOLS" = yes ]; then
-    cp -PR $PKG_BUILD/lib/libpanel.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/lib/libform.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/lib/libmenu.so* $INSTALL/usr/lib
+    cp -PR $PKG_BUILD/lib/libpanel.so* $INSTALL_SYSTEM/lib
+    cp -PR $PKG_BUILD/lib/libform.so* $INSTALL_SYSTEM/lib
+    cp -PR $PKG_BUILD/lib/libmenu.so* $INSTALL_SYSTEM/lib
  fi

-  mkdir -p $INSTALL/usr/share/terminfo/l
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe linux \
+  mkdir -p $INSTALL_SYSTEM/share/terminfo/l
+    TERMINFO=$INSTALL_SYSTEM/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe linux \
      $PKG_BUILD/misc/terminfo.src

-  mkdir -p $INSTALL/usr/share/terminfo/v
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \
+  mkdir -p $INSTALL_SYSTEM/share/terminfo/v
+    TERMINFO=$INSTALL_SYSTEM/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \
      $PKG_BUILD/misc/terminfo.src

-  mkdir -p $INSTALL/usr/share/terminfo/x
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm \
+  mkdir -p $INSTALL_SYSTEM/share/terminfo/x
+    TERMINFO=$INSTALL_SYSTEM/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm \
      $PKG_BUILD/misc/terminfo.src
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm-color \
+    TERMINFO=$INSTALL_SYSTEM/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm-color \
      $PKG_BUILD/misc/terminfo.src
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \
+    TERMINFO=$INSTALL_SYSTEM/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \
      $PKG_BUILD/misc/terminfo.src
@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libpcre*.so*[.0-9] $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.libs/libpcre*.so*[.0-9] $INSTALL_SYSTEM/lib

@@ -22,6 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/build/yajl-*/lib/libyajl.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/build/yajl-*/lib/libyajl.so* $INSTALL_SYSTEM/lib

@@ -22,23 +22,23 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
-    ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
-    ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
-  cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL_SYSTEM/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
+    ln -sf libGL.so.1 $INSTALL_SYSTEM/lib/libGL.so
+    ln -sf /var/lib/libGL.so $INSTALL_SYSTEM/lib/libGL.so.1
+  cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL_SYSTEM/lib

-mkdir -p $INSTALL/usr/lib/dri
-  cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib/dri
-  cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib/dri
-  cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
-  cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true
+mkdir -p $INSTALL_SYSTEM/lib/dri
+  cp -P $PKG_BUILD/lib/libdricore.so $INSTALL_SYSTEM/lib/dri
+  cp -P $PKG_BUILD/lib/libglsl.so $INSTALL_SYSTEM/lib/dri
+  cp -P $PKG_BUILD/lib/*_dri.so $INSTALL_SYSTEM/lib/dri || true
+  cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL_SYSTEM/lib/dri || true

-mkdir -p $INSTALL/usr/lib/xorg/modules/drivers
-  cp -P $PKG_BUILD/lib/gallium/*_drv.so $INSTALL/usr/lib/xorg/modules/drivers || true
+mkdir -p $INSTALL_SYSTEM/lib/xorg/modules/drivers
+  cp -P $PKG_BUILD/lib/gallium/*_drv.so $INSTALL_SYSTEM/lib/xorg/modules/drivers || true

 if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then
-  mkdir -p $INSTALL/usr/lib/vdpau
-    cp -P $PKG_BUILD/lib/gallium/libvdpau_*.so* $INSTALL/usr/lib/vdpau
+  mkdir -p $INSTALL_SYSTEM/lib/vdpau
+    cp -P $PKG_BUILD/lib/gallium/libvdpau_*.so* $INSTALL_SYSTEM/lib/vdpau
 fi
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libcairo.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/src/.libs/libcairo.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/lib/lib*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -PR $PKG_BUILD/lib/lib*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/libjasper/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/src/libjasper/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.libs/*.so* $INSTALL_SYSTEM/lib
@@ -24,9 +24,9 @@

 get_graphicdrivers

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libdrm.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libkms/.libs/libkms.so* $INSTALL/usr/lib || true
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/.libs/libdrm.so* $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libkms/.libs/libkms.so* $INSTALL_SYSTEM/lib || true

-  cp -P $PKG_BUILD/*/.libs/libdrm_*.so $INSTALL/usr/lib || true
-  cp -P $PKG_BUILD/*/.libs/libdrm_*.so*[0-9] $INSTALL/usr/lib || true
+  cp -P $PKG_BUILD/*/.libs/libdrm_*.so $INSTALL_SYSTEM/lib || true
+  cp -P $PKG_BUILD/*/.libs/libdrm_*.so*[0-9] $INSTALL_SYSTEM/lib || true
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_ROOT/lib
+  cp -P $PKG_BUILD/.libs/*.so* $INSTALL_ROOT/lib
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libpng*.so* $INSTALL/usr/lib
+mkdir -p $INSTALL_ROOT/lib
+  cp -P $PKG_BUILD/.libs/libpng*.so* $INSTALL_ROOT/lib
@@ -22,7 +22,7 @@

 . config/options $1

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libtiff/.libs/libtiff.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libtiff/.libs/libtiffxx.so* $INSTALL/usr/lib
-    rm -rf $INSTALL/usr/lib/libtiffxx.so*T
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libtiff/.libs/libtiff.so* $INSTALL_SYSTEM/lib
+  cp -P $PKG_BUILD/libtiff/.libs/libtiffxx.so* $INSTALL_SYSTEM/lib
+    rm -rf $INSTALL_SYSTEM/lib/libtiffxx.so*T
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-ZLIB_DIR="$BUILD/zlib-*"
-
-mkdir -p $INSTALL/lib
-  cp -R $ZLIB_DIR/*.so* $INSTALL/lib
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="zlib-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.zlib.net"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain zlib"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/compress"
-PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
-PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-EGLIBC_DIR="$BUILD/eglibc-*"
-
-mkdir -p $INSTALL/lib
-  cp $EGLIBC_DIR/objdir-eglibc/elf/ld*.so.* $INSTALL/lib
-  cp $EGLIBC_DIR/objdir-eglibc/libc.so.6 $INSTALL/lib
-  cp $EGLIBC_DIR/objdir-eglibc/math/libm.so.6 $INSTALL/lib
-  cp $EGLIBC_DIR/objdir-eglibc/nptl/libpthread.so.0 $INSTALL/lib
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="eglibc-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.eglibc.org/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="eglibc"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/devel"
-PKG_SHORTDESC="eglibc: The Embedded GNU C library"
-PKG_LONGDESC="The Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) that is designed to work well on embedded systems. EGLIBC strives to be source and binary compatible with GLIBC. EGLIBC's goals include reduced footprint, configurable components, better support for cross-compilation and cross-testing. In contrast to what Ulrich Drepper makes out of GLIBC, in EGLIBC all patches assigned to the FSF will be considered regardless of individual or company affiliation and cooperation is encouraged, as well as communication, civility, and respect among developers."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-LIBPNG_DIR="$BUILD/libpng-*"
-
-mkdir -p $INSTALL/lib
-  cp -P $LIBPNG_DIR/.libs/libpng*.so* $INSTALL/lib
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libpng-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.libpng.org/"
-PKG_URL=""
-PKG_DEPENDS="zlib-initramfs"
-PKG_BUILD_DEPENDS="toolchain libpng"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/graphics"
-PKG_SHORTDESC="libpng: Portable Network Graphics (PNG) Reference Library"
-PKG_LONGDESC="PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-GCC_DIR="$BUILD/gcc-*"
-
-mkdir -p $INSTALL/lib
-  cp -P $GCC_DIR/objdir-gcc-final/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/lib
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="gcc-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://gcc.gnu.org/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="gcc-final"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/lang"
-PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
-PKG_LONGDESC="This package contains the GNU Compiler Collection. It includes compilers for the languages C, C++, Objective C, Fortran 95, Java and others ... This GCC contains the Stack-Smashing Protector Patch which can be enabled with the -fstack-protector command-line option. More information about it ca be found at http://www.research.ibm.com/trl/projects/security/ssp/."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite diskdev_cmds-initramfs"
-PKG_BUILD_DEPENDS="toolchain eglibc-initramfs busybox-initramfs"
+PKG_DEPENDS="eglibc gcc-final busybox libpng freetype libjpeg-turbo diskdev_cmds"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="initramfs"
 PKG_SHORTDESC="initramfs: Metapackage for installing initramfs"
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-$SCRIPTS/unpack busybox
-
-if [ -f $PROJECT_DIR/$PROJECT/busybox/$1.conf ]; then
-  BUSYBOX_CFG_FILE=$PROJECT_DIR/$PROJECT/busybox/$1.conf
-else
-  BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
-fi
-
-# busybox fails building with LTO support on gcc-4.6
-  strip_lto
-
-# optimize for size
-  CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
-  CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`
-
-LDFLAGS="$LDFLAGS -fwhole-program"
-
-cd $BUILD/busybox*
-
-# Build Busybox for initramfs
-  make distclean
-  cp $BUSYBOX_CFG_FILE .config
-  make oldconfig
-
-  make ARCH=$TARGET_ARCH \
-       HOSTCC=$HOST_CC \
-       CROSS_COMPILE=$TARGET_PREFIX \
-       KBUILD_VERBOSE="1" \
-       install
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/bin
-  cp -PR $BUILD/busybox*/_install-initramfs/bin/busybox $INSTALL/bin
-  ln -sf busybox $INSTALL/bin/sh
-  chmod 4755 $INSTALL/bin/busybox
-
-mkdir -p $INSTALL/etc
-  touch $INSTALL/etc/fstab
-  ln -sf /proc/self/mounts $INSTALL/etc/mtab
-
-mkdir -p $INSTALL/splash
-  if [ -f $PROJECT_DIR/$PROJECT/splash/splash.ppm ]; then
-    cp $PROJECT_DIR/$PROJECT/splash/splash.ppm $INSTALL/splash
-  else
-    cp $PKG_DIR/splash/splash.ppm $INSTALL/splash
-  fi
-
-mkdir -p $INSTALL/dev
-mkdir -p $INSTALL/proc
-mkdir -p $INSTALL/sys
-mkdir -p $INSTALL/flash
-mkdir -p $INSTALL/sysroot
-mkdir -p $INSTALL/storage
-
-  cp $PKG_DIR/scripts/init $INSTALL
-  chmod 755 $INSTALL/init
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="busybox-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.busybox.net"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="required"
-PKG_SECTION="system"
-PKG_SHORTDESC="BusyBox: The Swiss Army Knife of Embedded Linux"
-PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides replacements for most of the utilities you usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox generally have fewer options than their full-featured GNU cousins; however, the options that are included provide the expected functionality and behave very much like their GNU counterparts. BusyBox provides a fairly complete environment for any small or embedded system."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
@@ -1,261 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#      Copyright (C) 2010-2011 Roman Weber ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-UPDATE_DIR=/storage/.update
-
-IMAGE_SYSTEM="SYSTEM"
-IMAGE_KERNEL="KERNEL"
-REBOOT="0"
-
-# defaults for booting from an nbd root
-NBD_ROOT_SERVER="192.168.1.1"
-NBD_ROOT_PORT="2000"
-NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
-
-# mount all needed special filesystems
-  /bin/busybox mount -t devtmpfs none /dev
-  /bin/busybox mount -t proc none /proc
-  /bin/busybox mount -t sysfs none /sys
-
-# hide kernel log messages on console
-  echo '1 4 1 7' > /proc/sys/kernel/printk
-
-# parse command line arguments
-  for arg in $(cat /proc/cmdline); do
-    case $arg in
-      debugging)
-        DEBUG=yes
-        ;;
-      nosplash)
-        SPLASH=no
-        ;;
-      bootchart)
-        BOOTCHART=yes
-        ;;
-      ssh)
-        SSH=yes
-        ;;
-      progress)
-        PROGRESS=yes
-        ;;
-      fastboot)
-        FASTBOOT=yes
-        ;;
-      netboot)
-        NETBOOT=yes
-        ;;
-      nbdroot=*)
-        nbdroot="${arg#nbdroot=}"
-        NBD_ROOT_SERVER=$( echo "${nbdroot}" | /bin/busybox sed 's/:.*//')
-        NBD_ROOT_PORT=$( echo "${nbdroot}" | /bin/busybox sed 's/.*://')
-        ;;
-      nbdserver=*)
-        NBD_ROOT_SERVER="${arg#nbdserver=}"
-        ;;
-      nbdport=*)
-        NBD_ROOT_PORT="${arg#nbdport=}"
-        ;;
-      nfsoverlay=*)
-        NFS_OVERLAY="${arg#nfsoverlay=}"
-        ;;
-    esac
-  done
-
-  if test "$FASTBOOT" = "yes"; then
-    IONICE="/bin/busybox ionice -c 1 -n 0"
-  fi
-
-  progress() {
-    if test "$PROGRESS" = "yes"; then
-      echo "### $1 ###"
-    fi
-  }
-
-  show_splash() {
-    if [ ! -e /dev/fb0 ]; then
-      SPLASH=no
-    fi
-
-    if [ -f /flash/oemsplash.ppm ]; then
-      SPLASHIMAGE="/flash/oemsplash.ppm"
-    elif [ -f /splash/splash.ppm ]; then
-      SPLASHIMAGE="/splash/splash.ppm"
-    else
-      SPLASH=no
-    fi
-
-    if [ "$SPLASH" = "no" ]; then
-      break
-    else
-      /bin/busybox fbsplash -c -s "$SPLASHIMAGE" -d /dev/fb0
-    fi
-  }
-
-  error() {
-    echo "Error Code: $1 that means: $2"
-  }
-
-  debug_shell() {
-    echo "### Starting debugging shell... type  exit  to quit ###"
-    /bin/busybox sh </dev/tty1 >/dev/tty1 2>&1
-  }
-
-  mount_part() {
-#    progress "check filesystem $1 ..."
-#      /sbin/fsck -M -T -a $1 > /dev/null 2>&1
-
-      for i in 1 2 3 4 5 6 7 8 9 10; do
-        ERR_ENV=1
-        MOUNT_OPTIONS="-o $3 $1 $2"
-
-        if [ -n "$4" ]; then
-          MOUNT_OPTIONS="-t $4 $MOUNT_OPTIONS"
-        fi
-
-        progress "mount filesystem $1 ..."
-          $IONICE /bin/busybox mount $MOUNT_OPTIONS > /dev/null 2>&1
-          [ "$?" -eq "0" ] && ERR_ENV=0 && break
-
-        /bin/busybox usleep 1000000
-      done
-      [ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
-  }
-
-  update() {
-    if [ -f "$UPDATE_DIR/$2" ]; then
-      echo "updating $1..."
-        $IONICE /bin/busybox mount -o remount,rw /flash
-        $IONICE /bin/busybox mv $UPDATE_DIR/$2 $3
-        $IONICE /bin/busybox mount -o remount,ro /flash
-        $IONICE /bin/busybox sync
-        [ "$2" = "$IMAGE_KERNEL" ] && REBOOT="1"
-    fi
-  }
-
-  hfsdiskprep() {
-    for DEVICE in /dev/sd*; do
-      for device in $(/bin/busybox blkid $DEVICE); do
-        case $device in
-          TYPE=*)
-            FS_TYPE=${device#TYPE=}
-            ;;
-        esac
-      done
-
-      if [ "$FS_TYPE" = "\"hfs\"" -o "$FS_TYPE" = "\"hfsplus\"" ]; then
-        progress "check filesystem $DEVICE [$FS_TYPE]..."
-        /bin/fsck_hfs -r -y $DEVICE > /dev/null 2>&1
-      fi
-    done
-  }
-
-  mount_nbd() {
-    retry_nr=0
-    retry_delay=20
-    OVERLAY_DIR=`cat /sys/class/net/eth0/address | /bin/busybox tr -d :`
-
-    while [ ${retry_nr} -lt ${retry_delay} ] && [ ! -e /sysroot/sbin/init ]; do
-      [ ${retry_nr} -gt 0 ] && \
-      $IONICE /bin/busybox nbd-client $NBD_ROOT_SERVER $NBD_ROOT_PORT /dev/nbd0 && \
-      mount_part "/dev/nbd0" "/sysroot" "ro" "squashfs"
-
-      retry_nr=$(( ${retry_nr} + 1 ))
-
-      [ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000
-
-      [ ${retry_nr} -gt 0 ]
-    done
-
-    if [ ! -e /sysroot/sbin/init ]; then
-      error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT"
-      debug_shell
-    fi
-
-    mount_part "$NFS_OVERLAY" "/sysroot/storage" "rw,nolock,retrans=10" "nfs"
-
-    if [ ! -d /sysroot/storage/$OVERLAY_DIR ]; then
-      mkdir /sysroot/storage/$OVERLAY_DIR
-    fi
-
-    /bin/busybox umount /sysroot/storage
-    mount_part "$NFS_OVERLAY/$OVERLAY_DIR" "/sysroot/storage" "rw,nolock" "nfs"
-  }
-
-  mount_disk() {
-
-  # deal with hfs partitions
-    if [ -x /sbin/fsck_hfs ]; then
-      hfsdiskprep
-    fi
-
-    mount_part "$boot" "/flash" "ro,noatime"
-    show_splash
-
-    if [ -n "$disk" ]; then
-      mount_part "$disk" "/storage" "rw,noatime"
-
-      if [ -f "/flash/MACH_KERNEL" ]; then
-        IMAGE_KERNEL="MACH_KERNEL"
-      fi
-
-      update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
-      update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
-
-      if test "$REBOOT" -eq "1"; then
-        echo "System reboots now..." && \
-        /bin/busybox reboot
-      fi
-    fi
-
-    if [ -f "/flash/$IMAGE_SYSTEM" ]; then
-      mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
-      [ "$ERR_ENV" -ne "0" ] && debug_shell
-    else
-      error "INIT_2" "Could not find system."
-      debug_shell
-    fi
-
-    # move /flash and /storage to /sysroot
-    /bin/busybox mount --move /flash /sysroot/flash
-
-    if [ -n "$disk" ]; then
-      /bin/busybox mount --move /storage /sysroot/storage
-    fi
-  }
-
-  if [ -z "$NETBOOT" ]; then
-    mount_disk
-  else
-    mount_nbd
-  fi
-
-# move some special filesystems
-  /bin/busybox mount --move /dev /sysroot/dev
-  /bin/busybox mount --move /proc /sysroot/proc
-  /bin/busybox mount --move /sys /sysroot/sys
-
-# switch to new sysroot and start real init
-  exec /bin/busybox switch_root /sysroot /sbin/init
-
-  error "INIT_3" "Error in initramfs. Could not switch to new root"
-  debug_shell
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-DISKDEV_CMDS_DIR="$BUILD/diskdev_cmds-*"
-
-mkdir -p $INSTALL/bin
-  cp $DISKDEV_CMDS_DIR/fsck_hfs.tproj/fsck_hfs $INSTALL/bin
-  ln -sf fsck_hfs $INSTALL/bin/fsck.hfs
-  ln -sf fsck_hfs $INSTALL/bin/fsck.hfsplus
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="diskdev_cmds-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="APSL"
-PKG_SITE="http://src.gnu-darwin.org/DarwinSourceArchive/expanded/diskdev_cmds/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain diskdev_cmds"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/system"
-PKG_SHORTDESC="diskdev_cmds: hfs filesystem utilities"
-PKG_LONGDESC="The fsck and mkfs utliities for hfs and hfsplus filesystems."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-E2FSPROGS_DIR="$BUILD/e2fsprogs-*"
-
-mkdir -p $INSTALL/etc
-  cp $E2FSPROGS_DIR/misc/mke2fs.conf $INSTALL/etc
-
-mkdir -p $INSTALL/bin
-  cp $E2FSPROGS_DIR/e2fsck/e2fsck $INSTALL/bin
-    ln -sf e2fsck $INSTALL/bin/fsck.ext2
-    ln -sf e2fsck $INSTALL/bin/fsck.ext3
-    ln -sf e2fsck $INSTALL/bin/fsck.ext4
-    ln -sf e2fsck $INSTALL/bin/fsck.ext4dev
-
-mkdir -p $INSTALL/lib
-  cp -P $E2FSPROGS_DIR/lib/e2p/libe2p.so.* $INSTALL/lib
-  cp -P $E2FSPROGS_DIR/lib/libe2p.so.[0-9] $INSTALL/lib
-  cp -P $E2FSPROGS_DIR/lib/et/libcom_err.so.* $INSTALL/lib
-  cp -P $E2FSPROGS_DIR/lib/libcom_err.so.[0-9] $INSTALL/lib
-  cp -P $E2FSPROGS_DIR/lib/ext2fs/libext2fs.so.* $INSTALL/lib
-  cp -P $E2FSPROGS_DIR/lib/libext2fs.so.[0-9] $INSTALL/lib
@@ -1,40 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="e2fsprogs-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://e2fsprogs.sourceforge.net/"
-PKG_URL=""
-PKG_DEPENDS="util-linux-initramfs"
-PKG_BUILD_DEPENDS="toolchain e2fsprogs"
-PKG_PRIORITY="optional"
-PKG_SECTION="tools"
-PKG_SHORTDESC="e2fsprogs: Utilities for use with the ext2 filesystem"
-PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
-
-if [ "$HFSTOOLS" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs"
-fi
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-UTIL_LINUX_DIR="$BUILD/util-linux-*"
-
-mkdir -p $INSTALL/sbin
-  cp -P $UTIL_LINUX_DIR/misc-utils/.libs/blkid $INSTALL/sbin
-  cp -P $UTIL_LINUX_DIR/fsck/.libs/fsck $INSTALL/sbin
-
-mkdir -p $INSTALL/lib
-  cp -P $UTIL_LINUX_DIR/libblkid/src/.libs/libblkid.so* $INSTALL/lib
-  cp -P $UTIL_LINUX_DIR/libuuid/src/.libs/libuuid.so* $INSTALL/lib
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="util-linux-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="APSL"
-PKG_SITE="http://userweb.kernel.org/~kzak/util-linux-ng/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain util-linux"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/system"
-PKG_SHORTDESC="util-linux: Miscellaneous system utilities for Linux"
-PKG_LONGDESC="The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among many features, Util-linux contains the fdisk configuration tool and the login program."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
@@ -23,7 +23,7 @@
 . config/options $1

 PYTHON_VERSION=2.7
-PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION
+PYTHON_LIB_DIR=$INSTALL_SYSTEM/lib/python$PYTHON_VERSION

 EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib wsgiref"
 INCLUDE_DIRS="compiler ctypes ctypes/macholib distutils distutils/command email"
@@ -31,12 +31,12 @@ INCLUDE_DIRS="$INCLUDE_DIRS email/mime encodings hotshot importlib json logging"
 INCLUDE_DIRS="$INCLUDE_DIRS multiprocessing sqlite3 xml xml/dom xml/etree"
 INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax"

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/.objdir-target/python $INSTALL/usr/bin/
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/.objdir-target/python $INSTALL_SYSTEM/bin/

-mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/.objdir-target/libpython2.7.so.1.0 $INSTALL/usr/lib/
-  ln -sf libpython2.7.so.1.0 $INSTALL/usr/lib/libpython2.7.so
+mkdir -p $INSTALL_SYSTEM/lib
+  cp -PR $PKG_BUILD/.objdir-target/libpython2.7.so.1.0 $INSTALL_SYSTEM/lib/
+  ln -sf libpython2.7.so.1.0 $INSTALL_SYSTEM/lib/libpython2.7.so

 mkdir -p $PYTHON_LIB_DIR/config
  cp $PKG_BUILD/.objdir-target/Makefile $PYTHON_LIB_DIR/config
@@ -22,16 +22,16 @@

 . config/options $1

-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/sapi/cgi/php-cgi $INSTALL/usr/bin
+mkdir -p $INSTALL_SYSTEM/bin
+  cp $PKG_BUILD/sapi/cgi/php-cgi $INSTALL_SYSTEM/bin

-mkdir -p $INSTALL/etc
-  cp $PKG_BUILD/php.ini-production $INSTALL/etc/php.ini
+mkdir -p $INSTALL_SYSTEM/etc
+  cp $PKG_BUILD/php.ini-production $INSTALL_SYSTEM/etc/php.ini
  sed -e "s|^doc_root[[:space:]]*=.*$|doc_root = /usr/www|" \
      -e "s|^.cgi.force_redirect[[:space:]]*=.*$|cgi.force_redirect = 0|" \
-      -i $INSTALL/etc/php.ini
+      -i $INSTALL_SYSTEM/etc/php.ini

-mkdir -p $INSTALL/usr/www
-  echo "<?php" > $INSTALL/usr/www/test.php
-  echo "phpinfo();" >> $INSTALL/usr/www/test.php
-  echo "?>" >> $INSTALL/usr/www/test.php
+mkdir -p $INSTALL_SYSTEM/www
+  echo "<?php" > $INSTALL_SYSTEM/www/test.php
+  echo "phpinfo();" >> $INSTALL_SYSTEM/www/test.php
+  echo "?>" >> $INSTALL_SYSTEM/www/test.php
@@ -24,5 +24,5 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/A867
-  cp $PKG_BUILD/dvb-usb-a867.ko $INSTALL/lib/modules/$VER/A867/
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/A867
+  cp $PKG_BUILD/dvb-usb-a867.ko $INSTALL_SYSTEM/lib/modules/$VER/A867/
@@ -24,12 +24,12 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/AF9035
-  cp $PKG_BUILD/af9033.ko $INSTALL/lib/modules/$VER/AF9035
-  cp $PKG_BUILD/dvb-usb-af9035.ko $INSTALL/lib/modules/$VER/AF9035
-  cp $PKG_BUILD/mxl5007t.ko $INSTALL/lib/modules/$VER/AF9035
-  cp $PKG_BUILD/tua9001.ko $INSTALL/lib/modules/$VER/AF9035
-  cp $PKG_BUILD/tuner_tda18218.ko $INSTALL/lib/modules/$VER/AF9035
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/AF9035
+  cp $PKG_BUILD/af9033.ko $INSTALL_SYSTEM/lib/modules/$VER/AF9035
+  cp $PKG_BUILD/dvb-usb-af9035.ko $INSTALL_SYSTEM/lib/modules/$VER/AF9035
+  cp $PKG_BUILD/mxl5007t.ko $INSTALL_SYSTEM/lib/modules/$VER/AF9035
+  cp $PKG_BUILD/tua9001.ko $INSTALL_SYSTEM/lib/modules/$VER/AF9035
+  cp $PKG_BUILD/tuner_tda18218.ko $INSTALL_SYSTEM/lib/modules/$VER/AF9035

-mkdir -p $INSTALL/lib/firmware
-  cp $PKG_DIR/firmware/*.fw $INSTALL/lib/firmware
+mkdir -p $INSTALL_SYSTEM/lib/firmware
+  cp $PKG_DIR/firmware/*.fw $INSTALL_SYSTEM/lib/firmware
@@ -24,5 +24,5 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/RTL2832U
-  cp $PKG_BUILD/*.ko $INSTALL/lib/modules/$VER/RTL2832U
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/RTL2832U
+  cp $PKG_BUILD/*.ko $INSTALL_SYSTEM/lib/modules/$VER/RTL2832U
@@ -24,5 +24,5 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/a867
-cp $PKG_BUILD/a867.ko $INSTALL/lib/modules/$VER/a867/
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/a867
+cp $PKG_BUILD/a867.ko $INSTALL_SYSTEM/lib/modules/$VER/a867/
@@ -24,5 +24,5 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/asix-ax887xx
-  cp $PKG_BUILD/asix.ko $INSTALL/lib/modules/$VER/asix-ax887xx
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/asix-ax887xx
+  cp $PKG_BUILD/asix.ko $INSTALL_SYSTEM/lib/modules/$VER/asix-ax887xx
@@ -24,5 +24,5 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/aver_h826d
-  cp $PKG_BUILD/installer/src/*.ko $INSTALL/lib/modules/$VER/aver_h826d
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/aver_h826d
+  cp $PKG_BUILD/installer/src/*.ko $INSTALL_SYSTEM/lib/modules/$VER/aver_h826d
@@ -24,10 +24,10 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/bcm_sta
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/bcm_sta
  if [ "$TARGET_ARCH" = "i386" ]; then
-    cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
+    cp $PKG_BUILD/x86-32/wl.ko $INSTALL_SYSTEM/lib/modules/$VER/bcm_sta
  fi
  if [ "$TARGET_ARCH" = "x86_64" ]; then
-    cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
+    cp $PKG_BUILD/x86-64/wl.ko $INSTALL_SYSTEM/lib/modules/$VER/bcm_sta
  fi
@@ -24,5 +24,5 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/hdhomerun
-  cp $BUILD/dvbhdhomerun-*/kernel/*.ko $INSTALL/lib/modules/$VER/hdhomerun/
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/hdhomerun
+  cp $BUILD/dvbhdhomerun-*/kernel/*.ko $INSTALL_SYSTEM/lib/modules/$VER/hdhomerun/
@@ -24,8 +24,8 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/tbs
-find $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$VER/tbs \;
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/tbs
+find $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL_SYSTEM/lib/modules/$VER/tbs \;

-mkdir -p $INSTALL/lib/firmware/
-cp $BUILD/${PKG_NAME}-${PKG_VERSION}/*.fw $INSTALL/lib/firmware/
+mkdir -p $INSTALL_SYSTEM/lib/firmware/
+cp $BUILD/${PKG_NAME}-${PKG_VERSION}/*.fw $INSTALL_SYSTEM/lib/firmware/
@@ -24,5 +24,5 @@

 VER=`ls $BUILD/linux*/modules/lib/modules`

-mkdir -p $INSTALL/lib/modules/$VER/vtuner/
-  cp $PKG_BUILD/*.ko $INSTALL/lib/modules/$VER/vtuner/
+mkdir -p $INSTALL_SYSTEM/lib/modules/$VER/vtuner/
+  cp $PKG_BUILD/*.ko $INSTALL_SYSTEM/lib/modules/$VER/vtuner/
@@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/.install/* $INSTALL
+mkdir -p $INSTALL_SYSTEM
+  cp -PR $PKG_BUILD/.install/* $INSTALL_SYSTEM