diff --git a/scripts/unpack b/scripts/unpack
index 088f728eee..3967cc5384 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -36,8 +36,6 @@ STAMP=$PKG_BUILD/.libreelec-unpack
 
 mkdir -p $BUILD
 
-[ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
-
 STAMP_DEPENDS="$PKG_DIR $PKG_NEED_UNPACK $PROJECT_DIR/$PROJECT/patches/$PKG_NAME"
 [ -n "$DEVICE" ] && STAMP_DEPENDS="$STAMP_DEPENDS $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME"
 
@@ -60,145 +58,151 @@ fi
 
 [ -f "$STAMP" ] && exit 0
 
-printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
-export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
+if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
+  printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
+  export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
-# unset functions
-unset -f pre_unpack
-unset -f unpack
-unset -f post_unpack
-unset -f pre_patch
-unset -f post_patch
+  # unset functions
+  unset -f pre_unpack
+  unset -f unpack
+  unset -f post_unpack
+  unset -f pre_patch
+  unset -f post_patch
 
-. $PKG_DIR/package.mk
+  . $PKG_DIR/package.mk
 
-if [ "$(type -t pre_unpack)" = "function" ]; then
-  pre_unpack
-fi
-
-if [ "$(type -t unpack)" = "function" ]; then
-  unpack
-else
-  if [ -n "$PKG_URL" ]; then
-    $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
-    $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
-    $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
-    $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
-    $SCRIPTS/extract $1 "$1*.txz"     $BUILD
-    $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
-    $SCRIPTS/extract $1 "$1*.7z"      $BUILD
-    $SCRIPTS/extract $1 "$1*.zip"     $BUILD
+  if [ "$(type -t pre_unpack)" = "function" ]; then
+    pre_unpack
   fi
-fi
 
-if [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
-  if [ -n "$PKG_SOURCE_DIR" ]; then
-    mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
-  elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* ]; then
-    mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION
+  if [ "$(type -t unpack)" = "function" ]; then
+    unpack
+  else
+    if [ -n "$PKG_URL" ]; then
+      $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
+      $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
+      $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
+      $SCRIPTS/extract $1 "$1*.txz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.7z"      $BUILD
+      $SCRIPTS/extract $1 "$1*.zip"     $BUILD
+    fi
   fi
-fi
 
-if [ -d "$PKG_DIR/sources" ]; then
-  [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
-  cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
-fi
+  if [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
+    if [ -n "$PKG_SOURCE_DIR" ]; then
+      mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+    elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* ]; then
+      mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION
+    fi
+  fi
 
-if [ -z "$PKG_URL" ]; then
-  mkdir -p "${BUILD}/${PKG_NAME}-${PKG_VERSION}"
-fi
+  if [ -d "$PKG_DIR/sources" ]; then
+    [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+    cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
+  fi
 
-if [ "$(type -t post_unpack)" = "function" ]; then
-  post_unpack
-fi
+  if [ -z "$PKG_URL" ]; then
+    mkdir -p "${BUILD}/${PKG_NAME}-${PKG_VERSION}"
+  fi
 
-if [ "$(type -t pre_patch)" = "function" ]; then
-  pre_patch
-fi
+  if [ "$(type -t post_unpack)" = "function" ]; then
+    post_unpack
+  fi
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PATCH_ARCH="x86"
-else
-  PATCH_ARCH="$TARGET_ARCH"
-fi
+  if [ "$(type -t pre_patch)" = "function" ]; then
+    pre_patch
+  fi
 
-PATCH_DIRS_PKG=""
-PATCH_DIRS_PRJ=""
-if [ -n "$PKG_PATCH_DIRS" ]; then
-  for patch_dir in $PKG_PATCH_DIRS; do
-    [ -d $PKG_DIR/patches/$patch_dir ] && PATCH_DIRS_PKG="$PATCH_DIRS_PKG $PKG_DIR/patches/$patch_dir/*.patch"
-    [ -d $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir/*.patch"
+  if [ "$TARGET_ARCH" = "x86_64" ]; then
+    PATCH_ARCH="x86"
+  else
+    PATCH_ARCH="$TARGET_ARCH"
+  fi
+
+  PATCH_DIRS_PKG=""
+  PATCH_DIRS_PRJ=""
+  if [ -n "$PKG_PATCH_DIRS" ]; then
+    for patch_dir in $PKG_PATCH_DIRS; do
+      [ -d $PKG_DIR/patches/$patch_dir ] && PATCH_DIRS_PKG="$PATCH_DIRS_PKG $PKG_DIR/patches/$patch_dir/*.patch"
+      [ -d $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir/*.patch"
+    done
+  fi
+
+  for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
+           $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \
+           $PATCH_DIRS_PKG \
+           $PKG_DIR/patches/$PKG_VERSION/*.patch \
+           $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \
+           $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch \
+           $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH/*.patch \
+           $PATCH_DIRS_PRJ \
+           $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch \
+           $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch; do
+
+    thisdir="$(dirname "$i")"
+
+    if [ "$thisdir" = "$PKG_DIR/patches" ]; then
+      PATCH_DESC="(common)"
+    elif [ "$thisdir" = "$PKG_DIR/patches/$PATCH_ARCH" ]; then
+      PATCH_DESC="(common - $PATCH_ARCH)"
+    elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION" ]; then
+      PATCH_DESC="(common - $PKG_VERSION)"
+    elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH" ]; then
+      PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then
+      PATCH_DESC="(project)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH" ]; then
+      PATCH_DESC="(project - $PATCH_ARCH)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION" ]; then
+      PATCH_DESC="(project - $PKG_VERSION)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" ]; then
+      PATCH_DESC="(device)"
+    else
+      if [[ "$thisdir" =~ ^$PKG_DIR/.* ]]; then
+        PATCH_DESC="(common - $(basename "$thisdir"))"
+      elif [[ "$thisdir" =~ ^$PROJECT_DIR/.* ]]; then
+        PATCH_DESC="(project - $(basename "$thisdir"))"
+      else
+        PATCH_DESC="(unknown - $(basename "$thisdir"))"
+      fi
+    fi
+
+    if [ -f "$i" ]; then
+      printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}${PATCH_DESC}${endcolor}   ${i#$ROOT/}\n" ' '>&$SILENT_OUT
+      if [ -n "$(grep -E '^GIT binary patch$' $i)" ]; then
+        cat $i | git apply --directory=`echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 --verbose --whitespace=nowarn --unsafe-paths >&$VERBOSE_OUT
+      else
+        cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
+      fi
+    fi
+  done
+
+  if [ "$(type -t post_patch)" = "function" ]; then
+    post_patch
+  fi
+
+  for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
+    if [ ! "$PKG_NAME" == "configtools" ] ; then
+      printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor}   $config\n" ' '
+
+      [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \
+        cp -f $TOOLCHAIN/configtools/config.guess $config
+      [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \
+        cp -f $TOOLCHAIN/configtools/config.sub $config
+    fi
   done
 fi
 
-for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
-         $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \
-         $PATCH_DIRS_PKG \
-         $PKG_DIR/patches/$PKG_VERSION/*.patch \
-         $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \
-         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch \
-         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH/*.patch \
-         $PATCH_DIRS_PRJ \
-         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch \
-         $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch; do
+if [ "$PKG_SECTION" != "virtual" ]; then
+  mkdir -p $PKG_BUILD
 
-  thisdir="$(dirname "$i")"
+  rm -f $STAMPS/$1/build_*
 
-  if [ "$thisdir" = "$PKG_DIR/patches" ]; then
-    PATCH_DESC="(common)"
-  elif [ "$thisdir" = "$PKG_DIR/patches/$PATCH_ARCH" ]; then
-    PATCH_DESC="(common - $PATCH_ARCH)"
-  elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION" ]; then
-    PATCH_DESC="(common - $PKG_VERSION)"
-  elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH" ]; then
-    PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then
-    PATCH_DESC="(project)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH" ]; then
-    PATCH_DESC="(project - $PATCH_ARCH)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION" ]; then
-    PATCH_DESC="(project - $PKG_VERSION)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" ]; then
-    PATCH_DESC="(device)"
-  else
-    if [[ "$thisdir" =~ ^$PKG_DIR/.* ]]; then
-      PATCH_DESC="(common - $(basename "$thisdir"))"
-    elif [[ "$thisdir" =~ ^$PROJECT_DIR/.* ]]; then
-      PATCH_DESC="(project - $(basename "$thisdir"))"
-    else
-      PATCH_DESC="(unknown - $(basename "$thisdir"))"
-    fi
-  fi
-
-  if [ -f "$i" ]; then
-    printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}${PATCH_DESC}${endcolor}   ${i#$ROOT/}\n" ' '>&$SILENT_OUT
-    if [ -n "$(grep -E '^GIT binary patch$' $i)" ]; then
-      cat $i | git apply --directory=`echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 --verbose --whitespace=nowarn --unsafe-paths >&$VERBOSE_OUT
-    else
-      cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
-    fi
-  fi
-done
-
-if [ "$(type -t post_patch)" = "function" ]; then
-  post_patch
+  PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
+  for i in PKG_NAME PKG_DEEPMD5; do
+    eval val=\$$i
+    echo "STAMP_$i=\"$val\"" >> $STAMP
+  done
 fi
-
-for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
-  if [ ! "$PKG_NAME" == "configtools" ] ; then
-    printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor}   $config\n" ' '
-
-    [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \
-      cp -f $TOOLCHAIN/configtools/config.guess $config
-    [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \
-      cp -f $TOOLCHAIN/configtools/config.sub $config
-  fi
-done
-
-rm -f $STAMPS/$1/build_*
-
-PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
-for i in PKG_NAME PKG_DEEPMD5; do
-  eval val=\$$i
-  echo "STAMP_$i=\"$val\"" >> $STAMP
-done