Merge remote-tracking branch 'upstream/master' into openelec-systemd

This commit is contained in:
Stefan Saraev
2013-08-31 14:11:28 +03:00
24 changed files with 53 additions and 31 deletions

View File

@@ -285,7 +285,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
cp $ROOT/README* $RELEASE_DIR
cp $ROOT/CHANGELOG $RELEASE_DIR/release_notes.txt
cp -R $CONFIG/release/openelec.ico $RELEASE_DIR
sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
@@ -328,12 +327,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
mkdir -p $RELEASE_DIR/Storage
# remove an previous created release tarball
rm -rf $RELEASE_DIR/System.tar.gz
rm -rf $RELEASE_DIR/Storage.tar.gz
rm -rf $RELEASE_DIR/System.tar.xz
rm -rf $RELEASE_DIR/Storage.tar.xz
# create filesystem tarballs
tar czf $RELEASE_DIR/System.tar.gz -C $RELEASE_DIR/System/ .
tar czf $RELEASE_DIR/Storage.tar.gz -C $RELEASE_DIR/Storage/ .
tar cJf $RELEASE_DIR/System.tar.xz -C $RELEASE_DIR/System/ .
tar cJf $RELEASE_DIR/Storage.tar.xz -C $RELEASE_DIR/Storage/ .
# remove an filesystem dirs
rm -rf $RELEASE_DIR/System
@@ -348,4 +347,3 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
# cleanup release dir
rm -rf $RELEASE_DIR
fi