Merge pull request #4543 from CvH/patch-1

zip packages extraction fix
This commit is contained in:
Stephan Raue 2016-02-07 15:58:53 +01:00
commit 44da7861bc
4 changed files with 2 additions and 5 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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