From 7826ff9710b45f50566dbd2dce1ad641d4879b99 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Sun, 1 Nov 2015 21:45:59 +0300 Subject: [PATCH] Fix boards manager package size issue Because git ls-files was run in package directory, it didn't list tools directories, so these were not excluded from rsync, causing package to include local copy of tools. Fixed by changing into root directory before doing anything. --- package/build_boards_manager_package.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index ac6ccc215..e5fcc66c3 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -8,7 +8,7 @@ if [ -z "$REMOTE_URL" ]; then echo "REMOTE_URL not defined, using default" fi echo "Remote: $REMOTE_URL" - +pushd .. # Figure out how will the package be called ver=`git describe --tags --always` package_name=esp8266-$ver @@ -16,9 +16,9 @@ echo "Version: $ver" echo "Package name: $package_name" # Create directory for the package -outdir=versions/$ver/$package_name -srcdir=$PWD/.. -rm -rf versions/$ver +outdir=package/versions/$ver/$package_name +srcdir=$PWD +rm -rf package/versions/$ver mkdir -p $outdir # Some files should be excluded from the package @@ -58,7 +58,7 @@ $SED 's/tools.mkspiffs.path={runtime.platform.path}\/tools\/mkspiffs/tools.mkspi > $outdir/platform.txt # Zip the package -pushd versions/$ver +pushd package/versions/$ver echo "Making $package_name.zip" zip -qr $package_name.zip $package_name rm -rf $package_name @@ -80,3 +80,4 @@ jq ".packages[0].platforms[0].version = \"$ver\" | \ > package_esp8266com_index.json popd +popd