From 5f535e8c02c18893f0a24c93b5c53d23fe186a5d Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Wed, 30 Dec 2015 03:50:20 +0100
Subject: [PATCH 1/4] scripts/extract: fix zip extraction

should fix *.zip packages
before pr:
PKG_NAME-PKG_VERSION.zip

creates
build.OE.../PKG_NAME/PKG_NAME-PKG_VERSION/files

instead of
build.OE.../PKG_NAME-PKG_VERSION/files
---
 scripts/extract | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/extract b/scripts/extract
index ecd3ce3d5a..7f967babca 100755
--- a/scripts/extract
+++ b/scripts/extract
@@ -57,8 +57,7 @@ for i in $PKG_URL; do
         7z x -o$3/$1 $f
         ;;
       *.zip)
-        mkdir -p $3/$1
-        unzip -q $f -d $3/$1
+        unzip -q $f -d $3
         ;;
       *.diff | *.patch)
         cat $f | patch -d $3 -p1

From 9a41f63383dd67c07457ac6203d38fcac3d346ee Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Wed, 30 Dec 2015 03:51:02 +0100
Subject: [PATCH 2/4] imx6-mfgtool2-tbs-matrix: zip extract fix

---
 packages/tools/imx6-mfgtool2-tbs-matrix/package.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk b/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk
index 76bd52280e..31ad118be4 100644
--- a/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk
+++ b/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk
@@ -23,7 +23,6 @@ PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/matrixtv/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
-PKG_SOURCE_DIR="$PKG_NAME"
 PKG_DEPENDS_TARGET=""
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"

From 81c6e8af7e3bdf5587815074ec1ad0f44c79ecbf Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Wed, 30 Dec 2015 03:51:32 +0100
Subject: [PATCH 3/4] espeak: zip extract fix

---
 packages/audio/espeak/package.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/audio/espeak/package.mk b/packages/audio/espeak/package.mk
index a191b56cca..2fa6df02cb 100644
--- a/packages/audio/espeak/package.mk
+++ b/packages/audio/espeak/package.mk
@@ -23,7 +23,6 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://espeak.sourceforge.net/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
-PKG_SOURCE_DIR="$PKG_NAME/$PKG_NAME-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

From 7df343f885ba3f62465490310f68d0df457854f4 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Wed, 30 Dec 2015 16:55:01 +0100
Subject: [PATCH 4/4] scripts/image: remove imx6 hack for zip extraction

removed workaround which was necessary due the broken zip extrtaction
---
 scripts/image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/image b/scripts/image
index 97f1ffe43d..85b8e7031c 100755
--- a/scripts/image
+++ b/scripts/image
@@ -271,7 +271,7 @@ fi
           $SCRIPTS/unpack imx6-mfgtool2-tbs-matrix
 
           mkdir -p $RELEASE_DIR/MfgTool2-TBS-Matrix
-          cp -PR $BUILD/imx6-mfgtool2-tbs-matrix-*/imx6-mfgtool2-tbs-matrix-*/* $RELEASE_DIR/MfgTool2-TBS-Matrix
+          cp -PR $BUILD/imx6-mfgtool2-tbs-matrix-*/* $RELEASE_DIR/MfgTool2-TBS-Matrix
         fi
 
         cp $ROOT/README* $RELEASE_DIR